diff --git a/.dockerignore b/.dockerignore
index 79a794a0401f78..d06d9902403393 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -34,3 +34,7 @@
 !share/GeoLite2-City.mmdb
 !hogvm/python
 !unit.json
+!plugin-transpiler/src
+!plugin-transpiler/*.*
+!test-runner-jest.config.js
+!test-runner-jest-environment.js
diff --git a/.eslintrc.js b/.eslintrc.js
index 9d54f523057d07..d6285afeb1b8f3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -82,11 +82,15 @@ module.exports = {
                         name: 'dayjs',
                         message: 'Do not directly import dayjs. Only import the dayjs exported from lib/dayjs.',
                     },
+                    {
+                        name: '@ant-design/icons',
+                        message: 'Please use icons from the @posthog/icons package instead',
+                    },
                 ],
             },
         ],
         'react/forbid-dom-props': [
-            1,
+            'warn',
             {
                 forbid: [
                     {
@@ -98,7 +102,7 @@ module.exports = {
             },
         ],
         'posthog/warn-elements': [
-            1,
+            'warn',
             {
                 forbid: [
                     {
@@ -142,11 +146,15 @@ module.exports = {
                         element: 'LemonButtonWithDropdown',
                         message: 'use <LemonMenu> with a <LemonButton> child instead',
                     },
+                    {
+                        element: 'Tag',
+                        message: 'use <LemonTag> instead',
+                    },
                 ],
             },
         ],
         'react/forbid-elements': [
-            2,
+            'error',
             {
                 forbid: [
                     {
@@ -200,9 +208,10 @@ module.exports = {
                 ],
             },
         ],
-        'no-constant-condition': 0,
-        'no-prototype-builtins': 0,
-        'no-irregular-whitespace': 0,
+        'no-constant-binary-expression': 'error',
+        'no-constant-condition': 'off',
+        'no-prototype-builtins': 'off',
+        'no-irregular-whitespace': 'off',
     },
     overrides: [
         {
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4dd278f24632e4..606ff5826450ed 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,8 +19,8 @@ labels: bug
 
 ## Environment
 
-- [ ] PostHog Cloud US, project ID: [please provide from https://app.posthog.com/project/settings#project-id]
-- [ ] PostHog Cloud EU, project ID: [please provide from https://eu.posthog.com/project/settings#project-id]
+- [ ] PostHog Cloud US, project ID: [please provide from https://app.posthog.com/settings/project-details#variables]
+- [ ] PostHog Cloud EU, project ID: [please provide from https://eu.posthog.com/settings/project-details#variables]
 - [ ] PostHog Hobby self-hosted with `docker compose`, version/commit: [please provide]
 - [ ] PostHog self-hosted with Kubernetes (deprecated, see ["Sunsetting Kubernetes support"](https://posthog.com/blog/sunsetting-helm-support-posthog)), version/commit: [please provide]
 
diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
index 45e189e23b1b6c..edd36992a66149 100644
--- a/.github/actions/run-backend-tests/action.yml
+++ b/.github/actions/run-backend-tests/action.yml
@@ -53,14 +53,33 @@ runs:
           shell: bash
           id: hogql-parser-diff
           run: |
-              changed=$(git diff --quiet HEAD master -- hogql_parser/ && echo "false" || echo "true")
-              echo "::set-output name=changed::$changed"
+              git fetch --no-tags --prune --depth=1 origin
+              changed=$(git diff --quiet HEAD origin/master -- hogql_parser/ && echo "false" || echo "true")
+              echo "changed=$changed" >> $GITHUB_OUTPUT
 
         - name: Install SAML (python3-saml) dependencies
           shell: bash
           run: |
               sudo apt-get update && sudo apt-get install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
 
+        - name: Install pnpm
+          uses: pnpm/action-setup@v2
+          with:
+              version: 8.x.x
+
+        - name: Set up Node.js
+          uses: actions/setup-node@v3
+          with:
+              node-version: 18
+              cache: pnpm
+
+        - name: Install plugin-transpiler
+          shell: bash
+          run: |
+              cd plugin-transpiler
+              pnpm install
+              pnpm run build
+
         - uses: syphar/restore-virtualenv@v1
           id: cache-backend-tests
           with:
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 191b481a045d2d..caf194fc9c1b86 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -18,7 +18,7 @@ jobs:
         environment: clickhouse-benchmarks
 
         # Benchmarks are expensive to run so we only run them (periodically) against master branch and for PRs labeled `performance`
-        if: ${{ github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'performance')  }}
+        if: ${{ github.repository == 'PostHog/posthog' && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'performance'))  }}
 
         env:
             DATABASE_URL: 'postgres://posthog:posthog@localhost:5432/posthog'
diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index 845c4a60a46977..f80300fca0a56b 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -68,6 +68,7 @@ jobs:
                         - mypy.ini
                         - pytest.ini
                         - frontend/src/queries/schema.json # Used for generating schema.py
+                        - plugin-transpiler/src # Used for transpiling plugins
                         # Make sure we run if someone is explicitly change the workflow
                         - .github/workflows/ci-backend.yml
                         - .github/actions/run-backend-tests/action.yml
diff --git a/.github/workflows/container-images-cd.yml b/.github/workflows/container-images-cd.yml
index 5345308504bb3d..a433c23be2317b 100644
--- a/.github/workflows/container-images-cd.yml
+++ b/.github/workflows/container-images-cd.yml
@@ -80,7 +80,7 @@ jobs:
                   push: true
                   file: production-unit.Dockerfile
                   tags: ${{ steps.aws-ecr.outputs.registry }}/posthog-cloud:unit
-                  platforms: linux/amd64
+                  platforms: linux/arm64,linux/amd64
                   build-args: COMMIT_HASH=${{ github.sha }}
 
             - name: get deployer token
diff --git a/.github/workflows/storybook-chromatic.yml b/.github/workflows/storybook-chromatic.yml
index ace0ae3e79349f..02397ca2586db1 100644
--- a/.github/workflows/storybook-chromatic.yml
+++ b/.github/workflows/storybook-chromatic.yml
@@ -64,7 +64,6 @@ jobs:
             SHARD_COUNT: '2'
             CYPRESS_INSTALL_BINARY: '0'
             NODE_OPTIONS: --max-old-space-size=6144
-            JEST_IMAGE_SNAPSHOT_TRACK_OBSOLETE: '1' # Remove obsolete snapshots
             OPT_OUT_CAPTURE: 1
         outputs:
             # The below have to be manually listed unfortunately, as GitHub Actions doesn't allow matrix-dependent outputs
@@ -132,7 +131,7 @@ jobs:
                   retries=3
                   while [ $retries -gt 0 ]; do
                       pnpm exec http-server storybook-static --port 6006 --silent &
-                      if pnpm wait-on http://127.0.0.1:6006 --timeout 60; then
+                      if pnpm wait-on http://127.0.0.1:6006 --timeout 15; then
                           break
                       fi
                       retries=$((retries-1))
@@ -146,14 +145,7 @@ jobs:
                   # Update snapshots for PRs on the main repo, verify on forks, which don't have access to PostHog Bot
                   VARIANT: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'update' || 'verify' }}
               run: |
-                  retries=3
-                  while [ $retries -gt 0 ]; do
-                      if pnpm test:visual-regression:stories:ci:$VARIANT --browsers ${{ matrix.browser }} --shard ${{ matrix.shard }}/$SHARD_COUNT; then
-                          break
-                      fi
-                      retries=$((retries-1))
-                      echo "Failed @storybook/test-runner, retrying... ($retries retries left)"
-                  done
+                  pnpm test:visual-regression:stories:ci:$VARIANT --browsers ${{ matrix.browser }} --shard ${{ matrix.shard }}/$SHARD_COUNT
 
             - name: Run @playwright/test (legacy, Chromium-only)
               if: matrix.browser == 'chromium' && matrix.shard == 1
@@ -163,6 +155,13 @@ jobs:
               run: |
                   pnpm test:visual-regression:legacy:ci:$VARIANT
 
+            - name: Archive failure screenshots
+              if: ${{ failure() }}
+              uses: actions/upload-artifact@v3
+              with:
+                  name: failure-screenshots-${{ matrix.browser }}
+                  path: frontend/__snapshots__/__failures__/
+
             - name: Count and optimize updated snapshots
               id: diff
               # Skip on forks
diff --git a/.gitignore b/.gitignore
index 8f32f6b56d3a74..95a429f2d24e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ frontend/.cache/
 frontend/dist/
 frontend/types/
 frontend/__snapshots__/__diff_output__/
+frontend/__snapshots__/__failures__/
 *Type.ts
 frontend/pnpm-error.log
 frontend/tmp
@@ -55,3 +56,4 @@ gen/
 upgrade/
 hogvm/typescript/dist
 .wokeignore
+plugin-transpiler/dist
diff --git a/.storybook/test-runner.ts b/.storybook/test-runner.ts
index fbb572e5382377..cf02d028151b9f 100644
--- a/.storybook/test-runner.ts
+++ b/.storybook/test-runner.ts
@@ -48,36 +48,35 @@ declare module '@storybook/types' {
     }
 }
 
-const RETRY_TIMES = 5
+const RETRY_TIMES = 3
 const LOADER_SELECTORS = [
     '.ant-skeleton',
     '.Spinner',
     '.LemonSkeleton',
     '.LemonTableLoader',
+    '.Toastify__toast-container',
     '[aria-busy="true"]',
-    '[aria-label="Content is loading..."]',
     '.SessionRecordingPlayer--buffering',
     '.Lettermark--unknown',
 ]
 
 const customSnapshotsDir = `${process.cwd()}/frontend/__snapshots__`
 
-const TEST_TIMEOUT_MS = 10000
-const BROWSER_DEFAULT_TIMEOUT_MS = 9000 // Reduce the default timeout down from 30s, to pre-empt Jest timeouts
-const SCREENSHOT_TIMEOUT_MS = 9000
+const JEST_TIMEOUT_MS = 15000
+const PLAYWRIGHT_TIMEOUT_MS = 10000 // Must be shorter than JEST_TIMEOUT_MS
 
 module.exports = {
     setup() {
         expect.extend({ toMatchImageSnapshot })
         jest.retryTimes(RETRY_TIMES, { logErrorsBeforeRetry: true })
-        jest.setTimeout(TEST_TIMEOUT_MS)
+        jest.setTimeout(JEST_TIMEOUT_MS)
     },
     async postRender(page, context) {
         const browserContext = page.context()
         const storyContext = (await getStoryContext(page, context)) as StoryContext
         const { skip = false, snapshotBrowsers = ['chromium'] } = storyContext.parameters?.testOptions ?? {}
 
-        browserContext.setDefaultTimeout(BROWSER_DEFAULT_TIMEOUT_MS)
+        browserContext.setDefaultTimeout(PLAYWRIGHT_TIMEOUT_MS)
         if (!skip) {
             const currentBrowser = browserContext.browser()!.browserType().name() as SupportedBrowserName
             if (snapshotBrowsers.includes(currentBrowser)) {
@@ -202,7 +201,7 @@ async function expectLocatorToMatchStorySnapshot(
     browser: SupportedBrowserName,
     options?: LocatorScreenshotOptions
 ): Promise<void> {
-    const image = await locator.screenshot({ timeout: SCREENSHOT_TIMEOUT_MS, ...options })
+    const image = await locator.screenshot({ ...options })
     let customSnapshotIdentifier = context.id
     if (browser !== 'chromium') {
         customSnapshotIdentifier += `--${browser}`
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 497b5f7fca0bfc..22bf39b7180194 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -70,7 +70,8 @@
                 "DATABASE_URL": "postgres://posthog:posthog@localhost:5432/posthog",
                 "SKIP_SERVICE_VERSION_REQUIREMENTS": "1",
                 "PRINT_SQL": "1",
-                "REPLAY_EVENTS_NEW_CONSUMER_RATIO": "1.0"
+                "REPLAY_EVENTS_NEW_CONSUMER_RATIO": "1.0",
+                "BILLING_SERVICE_URL": "https://billing.dev.posthog.dev"
             },
             "console": "integratedTerminal",
             "python": "${workspaceFolder}/env/bin/python",
diff --git a/Dockerfile.playwright b/Dockerfile.playwright
index 303b3ad7ab2260..7591a53141b182 100644
--- a/Dockerfile.playwright
+++ b/Dockerfile.playwright
@@ -15,6 +15,6 @@ ENV CYPRESS_INSTALL_BINARY=0
 
 RUN pnpm install --frozen-lockfile
 
-COPY playwright.config.ts webpack.config.js babel.config.js tsconfig.json ./
+COPY playwright.config.ts webpack.config.js babel.config.js tsconfig.json test-runner-jest.config.js test-runner-jest-environment.js ./
 
 COPY .storybook/ .storybook/
diff --git a/bin/docker-server-unit b/bin/docker-server-unit
index 1eda8374759a58..f1caab6a711745 100755
--- a/bin/docker-server-unit
+++ b/bin/docker-server-unit
@@ -10,4 +10,6 @@ trap 'rm -rf "$PROMETHEUS_MULTIPROC_DIR"' EXIT
 export PROMETHEUS_METRICS_EXPORT_PORT=8001
 export STATSD_PORT=${STATSD_PORT:-8125}
 
-exec /usr/local/bin/docker-entrypoint.sh unitd --no-daemon
+# We need to run as --user root so that nginx unit can proxy the control socket for stats
+# However each application is run as "nobody"
+exec /usr/local/bin/docker-entrypoint.sh unitd --no-daemon --user root
diff --git a/bin/temporal-django-worker b/bin/temporal-django-worker
index 4f7462879e285e..ab10a959a87090 100755
--- a/bin/temporal-django-worker
+++ b/bin/temporal-django-worker
@@ -4,6 +4,6 @@ set -e
 
 trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
 
-python3 manage.py start_temporal_worker
+python3 manage.py start_temporal_worker "$@"
 
 wait
diff --git a/bin/unit_metrics.py b/bin/unit_metrics.py
new file mode 100644
index 00000000000000..227139cf10b09a
--- /dev/null
+++ b/bin/unit_metrics.py
@@ -0,0 +1,78 @@
+import http.client
+import json
+from prometheus_client import CollectorRegistry, Gauge, multiprocess, generate_latest
+
+UNIT_CONNECTIONS_ACCEPTED_TOTAL = Gauge(
+    "unit_connections_accepted_total",
+    "",
+    multiprocess_mode="livesum",
+)
+UNIT_CONNECTIONS_ACTIVE = Gauge(
+    "unit_connections_active",
+    "",
+    multiprocess_mode="livesum",
+)
+UNIT_CONNECTIONS_CLOSED = Gauge(
+    "unit_connections_closed",
+    "",
+    multiprocess_mode="livesum",
+)
+UNIT_CONNECTIONS_IDLE = Gauge(
+    "unit_connections_idle",
+    "",
+    multiprocess_mode="livesum",
+)
+UNIT_CONNECTIONS_TOTAL = Gauge(
+    "unit_requests_total",
+    "",
+    multiprocess_mode="livesum",
+)
+UNIT_PROCESSES_RUNNING_GAUGE = Gauge(
+    "unit_application_processes_running", "", multiprocess_mode="livesum", labelnames=["application"]
+)
+UNIT_PROCESSES_STARTING_GAUGE = Gauge(
+    "unit_application_processes_starting", "", multiprocess_mode="livesum", labelnames=["application"]
+)
+UNIT_PROCESSES_IDLE_GAUGE = Gauge(
+    "unit_application_processes_idle", "", multiprocess_mode="livesum", labelnames=["application"]
+)
+UNIT_REQUESTS_ACTIVE_GAUGE = Gauge(
+    "unit_application_requests_active", "", multiprocess_mode="livesum", labelnames=["application"]
+)
+
+
+def application(environ, start_response):
+    connection = http.client.HTTPConnection("localhost:8081")
+    connection.request("GET", "/status")
+    response = connection.getresponse()
+
+    statj = json.loads(response.read())
+    connection.close()
+
+    UNIT_CONNECTIONS_ACCEPTED_TOTAL.set(statj["connections"]["accepted"])
+    UNIT_CONNECTIONS_ACTIVE.set(statj["connections"]["active"])
+    UNIT_CONNECTIONS_IDLE.set(statj["connections"]["idle"])
+    UNIT_CONNECTIONS_CLOSED.set(statj["connections"]["closed"])
+    UNIT_CONNECTIONS_TOTAL.set(statj["requests"]["total"])
+
+    for application in statj["applications"].keys():
+        UNIT_PROCESSES_RUNNING_GAUGE.labels(application=application).set(
+            statj["applications"][application]["processes"]["running"]
+        )
+        UNIT_PROCESSES_STARTING_GAUGE.labels(application=application).set(
+            statj["applications"][application]["processes"]["starting"]
+        )
+        UNIT_PROCESSES_IDLE_GAUGE.labels(application=application).set(
+            statj["applications"][application]["processes"]["idle"]
+        )
+        UNIT_REQUESTS_ACTIVE_GAUGE.labels(application=application).set(
+            statj["applications"][application]["requests"]["active"]
+        )
+
+    start_response("200 OK", [("Content-Type", "text/plain")])
+    # Create the prometheus multi-process metric registry here
+    # This will aggregate metrics we send from the Django app
+    # We prepend our unit metrics here.
+    registry = CollectorRegistry()
+    multiprocess.MultiProcessCollector(registry)
+    yield generate_latest(registry)
diff --git a/cypress/e2e/a11y.cy.ts b/cypress/e2e/a11y.cy.ts
index 3ee87daf2a107f..1d91fe803446eb 100644
--- a/cypress/e2e/a11y.cy.ts
+++ b/cypress/e2e/a11y.cy.ts
@@ -16,12 +16,10 @@ describe('a11y', () => {
         'experiments',
         'events',
         'datamanagement',
-        'persons',
-        'cohorts',
-        'annotations',
+        'personsmanagement',
         'apps',
         'toolbarlaunch',
-        'projectsettings',
+        'settings',
     ]
 
     sidebarItems.forEach((sideBarItem) => {
diff --git a/cypress/e2e/annotations.cy.ts b/cypress/e2e/annotations.cy.ts
index 5300b376a65597..90db0533267703 100644
--- a/cypress/e2e/annotations.cy.ts
+++ b/cypress/e2e/annotations.cy.ts
@@ -1,10 +1,10 @@
 describe('Annotations', () => {
     beforeEach(() => {
-        cy.clickNavMenu('annotations')
+        cy.clickNavMenu('datamanagement')
+        cy.get('[data-attr=data-management-annotations-tab]').click()
     })
 
     it('Annotations loaded', () => {
-        cy.get('h1').should('contain', 'Annotations')
         cy.get('h2').should('contain', 'Create your first annotation')
         cy.get('[data-attr="product-introduction-docs-link"]').should('contain', 'Learn more about Annotations')
     })
diff --git a/cypress/e2e/billingv2.cy.ts b/cypress/e2e/billingv2.cy.ts
index 5c25ddeee4a535..3c01f489e1f787 100644
--- a/cypress/e2e/billingv2.cy.ts
+++ b/cypress/e2e/billingv2.cy.ts
@@ -5,10 +5,10 @@ describe('Billing', () => {
         cy.visit('/organization/billing')
     })
 
-    it('Show unsubscribe survey', () => {
+    it('Show and submit unsubscribe survey', () => {
         cy.intercept('/api/billing-v2/deactivate?products=product_analytics', {
             fixture: 'api/billing-v2/billing-v2-unsubscribed-product-analytics.json',
-        })
+        }).as('unsubscribeProductAnalytics')
         cy.get('[data-attr=more-button]').first().click()
         cy.contains('.LemonButton', 'Unsubscribe').click()
         cy.get('.LemonModal__content h3').should(
@@ -17,7 +17,8 @@ describe('Billing', () => {
         )
         cy.contains('.LemonModal .LemonButton', 'Unsubscribe').click()
 
-        cy.get('[data-attr=upgrade-card-product_analytics]').should('be.visible')
+        cy.get('.LemonModal').should('not.exist')
+        cy.wait(['@unsubscribeProductAnalytics'])
     })
 
     it('Unsubscribe survey text area maintains unique state between product types', () => {
diff --git a/cypress/e2e/cohorts.cy.ts b/cypress/e2e/cohorts.cy.ts
index 267b579e79021c..1c7e3be39865d8 100644
--- a/cypress/e2e/cohorts.cy.ts
+++ b/cypress/e2e/cohorts.cy.ts
@@ -1,17 +1,22 @@
 describe('Cohorts', () => {
+    const goToCohorts = (): void => {
+        cy.clickNavMenu('personsmanagement')
+        cy.get('[data-attr=persons-management-cohorts-tab]').click()
+    }
+
     beforeEach(() => {
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
     })
 
     it('Cohorts new and list', () => {
         // load an empty page
-        cy.get('h1').should('contain', 'Cohorts')
-        cy.title().should('equal', 'Cohorts • PostHog')
+        cy.get('h1').should('contain', 'People')
+        cy.title().should('equal', 'Cohorts • People • PostHog')
         cy.get('h2').should('contain', 'Create your first cohort')
         cy.get('[data-attr="product-introduction-docs-link"]').should('contain', 'Learn more about Cohorts')
 
         // go to create a new cohort
-        cy.get('[data-attr="create-cohort"]').click()
+        cy.get('[data-attr="new-cohort"]').click()
 
         // select "add filter" and "property"
         cy.get('[data-attr="cohort-selector-field-value"]').click()
@@ -34,7 +39,7 @@ describe('Cohorts', () => {
         cy.get('[data-attr=success-toast]').contains('Cohort saved').should('exist')
 
         // back to cohorts
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
         cy.get('tbody').contains('Test Cohort')
         cy.get('h2').should('not.have.text', 'Create your first cohort')
 
@@ -69,7 +74,7 @@ describe('Cohorts', () => {
         // delete cohort
         cy.get('[data-attr="more-button"]').click()
         cy.get('.Popover__content').contains('Delete cohort').click()
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
         cy.get('tbody').should('not.have.text', 'Test Cohort (dynamic copy) (static copy)')
     })
 })
diff --git a/cypress/e2e/insights-unsaved-confirmation.cy.ts b/cypress/e2e/insights-unsaved-confirmation.cy.ts
index 6257fc264e20f7..9d64c3d93df412 100644
--- a/cypress/e2e/insights-unsaved-confirmation.cy.ts
+++ b/cypress/e2e/insights-unsaved-confirmation.cy.ts
@@ -38,11 +38,9 @@ describe('Insights', () => {
             const insightName = randomString('to save and then navigate away from')
             insight.create(insightName)
 
-            cy.get('[data-attr="menu-item-annotations"]').click()
+            cy.get('[data-attr="menu-item-dashboards"]').click()
 
-            // the annotations API call is made before the annotations page loads, so we can't wait for it
-            cy.get('[data-attr="annotations-content"]').should('exist')
-            cy.url().should('include', '/annotations')
+            cy.url().should('include', '/dashboard')
         })
 
         it('Can keep editing changed new insight after navigating away with confirm() rejection (case 1)', () => {
diff --git a/cypress/e2e/invites.cy.ts b/cypress/e2e/invites.cy.ts
index c05c404ea9420a..6a1c9b9552dafc 100644
--- a/cypress/e2e/invites.cy.ts
+++ b/cypress/e2e/invites.cy.ts
@@ -8,8 +8,9 @@ describe('Invite Signup', () => {
         cy.get('[data-attr=top-menu-toggle]').click()
         cy.get('[data-attr=top-menu-item-org-settings]').click()
 
-        cy.location('pathname').should('eq', '/organization/settings')
-        cy.get('[id="invites"]').contains('Pending Invites').should('exist')
+        cy.location('pathname').should('eq', '/settings/organization')
+        cy.get('[id="invites"]').should('exist')
+        cy.get('h2').contains('Pending Invites').should('exist')
 
         // Test invite creation flow
         cy.get('[data-attr=invite-teammate-button]').click()
@@ -66,7 +67,7 @@ describe('Invite Signup', () => {
 
         cy.get('[data-attr=top-menu-toggle]').click()
         cy.get('[data-attr=top-menu-item-org-settings]').click()
-        cy.location('pathname').should('include', '/organization/settings')
+        cy.location('pathname').should('include', '/settings/organization')
 
         // Click "Invite team member"
         cy.get('[data-attr=invite-teammate-button]').first().click()
@@ -97,8 +98,7 @@ describe('Invite Signup', () => {
         // Go to organization settings
         cy.get('[data-attr=top-menu-toggle]').click()
         cy.get('[data-attr=top-menu-item-org-settings]').click()
-        cy.location('pathname').should('include', '/organization/settings')
-        cy.get('.page-title').should('contain', 'Organization')
+        cy.location('pathname').should('include', '/settings/organization')
 
         // Change membership level
         cy.contains('[data-attr=org-members-table] tr', user).within(() => {
diff --git a/cypress/e2e/organizationSettings.cy.ts b/cypress/e2e/organizationSettings.cy.ts
index ea4264c58988b4..38f27a7df95773 100644
--- a/cypress/e2e/organizationSettings.cy.ts
+++ b/cypress/e2e/organizationSettings.cy.ts
@@ -3,7 +3,6 @@ describe('Organization settings', () => {
     it('can navigate to organization settings', () => {
         cy.get('[data-attr=top-menu-toggle]').click()
         cy.get('[data-attr=top-menu-item-org-settings]').click()
-        cy.location('pathname').should('include', '/organization/settings')
-        cy.get('.page-title').should('contain', 'Organization')
+        cy.location('pathname').should('include', '/settings/organization')
     })
 })
diff --git a/cypress/e2e/person.cy.ts b/cypress/e2e/person.cy.ts
index a4af1f83e9f40a..5a5b1d2856e32b 100644
--- a/cypress/e2e/person.cy.ts
+++ b/cypress/e2e/person.cy.ts
@@ -1,8 +1,8 @@
 describe('Person Visualization Check', () => {
     beforeEach(() => {
-        cy.clickNavMenu('persons')
+        cy.clickNavMenu('personsmanagement')
         cy.location('pathname').should('eq', '/persons')
-        cy.get('.ant-spin-spinning').should('not.exist') // Wait until initial table load to be able to use the search
+        cy.wait(1000)
         cy.get('[data-attr=persons-search]').type('deb').should('have.value', 'deb')
         cy.contains('deborah.fernandez@gmail.com').should('not.exist')
         cy.contains('deborah.fernandez@gmail.com').click()
diff --git a/cypress/e2e/persons.cy.ts b/cypress/e2e/persons.cy.ts
index 79765fcf8c8756..1492c6077465a9 100644
--- a/cypress/e2e/persons.cy.ts
+++ b/cypress/e2e/persons.cy.ts
@@ -1,10 +1,10 @@
 describe('Persons', () => {
     beforeEach(() => {
-        cy.clickNavMenu('persons')
+        cy.clickNavMenu('personsmanagement')
     })
 
     it('All tabs work', () => {
-        cy.get('h1').should('contain', 'Persons')
+        cy.get('h1').should('contain', 'People')
         cy.get('[data-attr=persons-search]').type('marisol').type('{enter}').should('have.value', 'marisol')
         cy.wait(200)
         cy.get('[data-row-key]').its('length').should('be.gte', 0)
diff --git a/cypress/e2e/trends.cy.ts b/cypress/e2e/trends.cy.ts
index de16e4a00021d0..f04a247597cc23 100644
--- a/cypress/e2e/trends.cy.ts
+++ b/cypress/e2e/trends.cy.ts
@@ -140,7 +140,7 @@ describe('Trends', () => {
     it('Apply date filter', () => {
         cy.get('[data-attr=date-filter]').click()
         cy.get('div').contains('Yesterday').should('exist').click()
-        cy.get('.trends-insights-container .insight-empty-state').should('exist')
+        cy.get('[data-attr=trend-line-graph]').should('exist')
     })
 
     it('Apply property breakdown', () => {
diff --git a/ee/clickhouse/models/test/test_filters.py b/ee/clickhouse/models/test/test_filters.py
index 26ff79c565c4e2..def3ca4493fe1b 100644
--- a/ee/clickhouse/models/test/test_filters.py
+++ b/ee/clickhouse/models/test/test_filters.py
@@ -610,6 +610,42 @@ def test_numerical(self):
         events = _filter_events(filter, self.team)
         self.assertEqual(events[0]["id"], event1_uuid)
 
+    def test_numerical_person_properties(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"$a_number": 4})
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"$a_number": 5})
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"$a_number": 6})
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": 4,
+                        "operator": "gt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(_filter_persons(filter, self.team)), 2)
+
+        filter = Filter(data={"properties": [{"type": "person", "key": "$a_number", "value": 5}]})
+        self.assertEqual(len(_filter_persons(filter, self.team)), 1)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": 6,
+                        "operator": "lt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(_filter_persons(filter, self.team)), 2)
+
     def test_contains(self):
         _create_event(team=self.team, distinct_id="test", event="$pageview")
         event2_uuid = _create_event(
diff --git a/ee/clickhouse/queries/test/__snapshots__/test_retention.ambr b/ee/clickhouse/queries/test/__snapshots__/test_retention.ambr
index 6a1c2323a37651..10cc23278229d4 100644
--- a/ee/clickhouse/queries/test/__snapshots__/test_retention.ambr
+++ b/ee/clickhouse/queries/test/__snapshots__/test_retention.ambr
@@ -5,7 +5,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -17,13 +17,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -70,7 +70,7 @@
           [0] as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -82,13 +82,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -128,7 +128,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_1" as target
         FROM events e
         WHERE team_id = 2
@@ -140,13 +140,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_1" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -190,7 +190,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -202,13 +202,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -255,7 +255,7 @@
           [0] as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -267,13 +267,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -313,7 +313,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_1" as target
         FROM events e
         WHERE team_id = 2
@@ -325,13 +325,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_1" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -375,7 +375,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e.person_id as target
         FROM events e
         LEFT JOIN
@@ -394,13 +394,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e.person_id as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -451,7 +451,7 @@
           NULL as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e.person_id as target
         FROM events e
         LEFT JOIN
@@ -470,13 +470,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e.person_id as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -632,7 +632,7 @@
           [0] as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -644,13 +644,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
@@ -693,7 +693,7 @@
           [0] as breakdown_values_filter,
           NULL as selected_interval,
           returning_event_query as
-       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                e."$group_0" as target
         FROM events e
         WHERE team_id = 2
@@ -705,13 +705,13 @@
         GROUP BY target,
                  event_date),
           target_event_query as
-       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC')) AS event_date,
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
                         e."$group_0" as target,
                         [
                           dateDiff(
                               'Week',
-                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC')),
-                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'))
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
                           )
                       ] as breakdown_values
         FROM events e
diff --git a/frontend/__snapshots__/components-cards-insight-card--insight-card.png b/frontend/__snapshots__/components-cards-insight-card--insight-card.png
index e76dec328d63d3..3c8919af6eeb8a 100644
Binary files a/frontend/__snapshots__/components-cards-insight-card--insight-card.png and b/frontend/__snapshots__/components-cards-insight-card--insight-card.png differ
diff --git a/frontend/__snapshots__/components-integrations-slack--slack-integration-added.png b/frontend/__snapshots__/components-integrations-slack--slack-integration-added.png
index 6639b1ef129e2f..7b19245e899f82 100644
Binary files a/frontend/__snapshots__/components-integrations-slack--slack-integration-added.png and b/frontend/__snapshots__/components-integrations-slack--slack-integration-added.png differ
diff --git a/frontend/__snapshots__/components-integrations-slack--slack-integration-instance-not-configured.png b/frontend/__snapshots__/components-integrations-slack--slack-integration-instance-not-configured.png
index 1223f1d621a44f..fb29b0c8a8867e 100644
Binary files a/frontend/__snapshots__/components-integrations-slack--slack-integration-instance-not-configured.png and b/frontend/__snapshots__/components-integrations-slack--slack-integration-instance-not-configured.png differ
diff --git a/frontend/__snapshots__/components-integrations-slack--slack-integration.png b/frontend/__snapshots__/components-integrations-slack--slack-integration.png
index 1223f1d621a44f..fb29b0c8a8867e 100644
Binary files a/frontend/__snapshots__/components-integrations-slack--slack-integration.png and b/frontend/__snapshots__/components-integrations-slack--slack-integration.png differ
diff --git a/frontend/__snapshots__/exporter-exporter--trends-line-multi-insight.png b/frontend/__snapshots__/exporter-exporter--trends-line-multi-insight.png
new file mode 100644
index 00000000000000..75529341446f0b
Binary files /dev/null and b/frontend/__snapshots__/exporter-exporter--trends-line-multi-insight.png differ
diff --git a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button.png b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button.png
index 363659a9b58665..d6139bbdf96274 100644
Binary files a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button.png and b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button.png differ
diff --git a/frontend/__snapshots__/filters-taxonomic-filter--events-free.png b/frontend/__snapshots__/filters-taxonomic-filter--events-free.png
index c1dd6086c97490..0566c099ba51fd 100644
Binary files a/frontend/__snapshots__/filters-taxonomic-filter--events-free.png and b/frontend/__snapshots__/filters-taxonomic-filter--events-free.png differ
diff --git a/frontend/__snapshots__/filters-taxonomic-filter--events-premium.png b/frontend/__snapshots__/filters-taxonomic-filter--events-premium.png
index 417734adb38075..b5826f59f74aed 100644
Binary files a/frontend/__snapshots__/filters-taxonomic-filter--events-premium.png and b/frontend/__snapshots__/filters-taxonomic-filter--events-premium.png differ
diff --git a/frontend/__snapshots__/filters-taxonomic-filter--properties.png b/frontend/__snapshots__/filters-taxonomic-filter--properties.png
index 6166356899a257..9db36eef29cb1d 100644
Binary files a/frontend/__snapshots__/filters-taxonomic-filter--properties.png and b/frontend/__snapshots__/filters-taxonomic-filter--properties.png differ
diff --git a/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png b/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png
index 29f658fac2fb86..b49b6fc4bd3418 100644
Binary files a/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png and b/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-progress-circle--basic.png b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--basic.png
new file mode 100644
index 00000000000000..cd99f4c3e0536a
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--basic.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-progress-circle--overview.png b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--overview.png
new file mode 100644
index 00000000000000..1662d1716dd2f5
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--overview.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-progress-circle--template.png b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--template.png
new file mode 100644
index 00000000000000..cd99f4c3e0536a
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-lemon-progress-circle--template.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png
index 80acd540123ceb..11b06e1c7556d5 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png
index dfa4e5819c3c24..678543a30f547c 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png
index 4164e2d6ec68f6..5eb005ec637e55 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png
index b2697e16b93fa5..f37ec4794401f9 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png differ
diff --git a/frontend/__snapshots__/scenes-app-annotations--annotations.png b/frontend/__snapshots__/scenes-app-annotations--annotations.png
index b04aef3ec2f311..1d0a33cc15c084 100644
Binary files a/frontend/__snapshots__/scenes-app-annotations--annotations.png and b/frontend/__snapshots__/scenes-app-annotations--annotations.png differ
diff --git a/frontend/__snapshots__/scenes-app-apps--installed.png b/frontend/__snapshots__/scenes-app-apps--installed.png
index 34ae3b5167bb3e..ca7fff9f98e957 100644
Binary files a/frontend/__snapshots__/scenes-app-apps--installed.png and b/frontend/__snapshots__/scenes-app-apps--installed.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--create-export.png b/frontend/__snapshots__/scenes-app-batchexports--create-export.png
index aaa0d622855be5..5812443d7cc012 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--create-export.png and b/frontend/__snapshots__/scenes-app-batchexports--create-export.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--exports.png b/frontend/__snapshots__/scenes-app-batchexports--exports.png
index 105535afdb5cce..673b04e0d721e0 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--exports.png and b/frontend/__snapshots__/scenes-app-batchexports--exports.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--view-export.png b/frontend/__snapshots__/scenes-app-batchexports--view-export.png
index d46d231d06a04f..f6551bc248623d 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--view-export.png and b/frontend/__snapshots__/scenes-app-batchexports--view-export.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--list.png b/frontend/__snapshots__/scenes-app-dashboards--list.png
index f7ed888ae6bf39..527d891a4f1824 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--list.png and b/frontend/__snapshots__/scenes-app-dashboards--list.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png
index 4e53d35d1dffa0..c4d3fc8fb4f30a 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png and b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new.png b/frontend/__snapshots__/scenes-app-dashboards--new.png
index 66b685f868517a..58ca8d61687d2c 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new.png and b/frontend/__snapshots__/scenes-app-dashboards--new.png differ
diff --git a/frontend/__snapshots__/scenes-app-data-management--database.png b/frontend/__snapshots__/scenes-app-data-management--database.png
index ff22ffdb8d4673..deb21151803413 100644
Binary files a/frontend/__snapshots__/scenes-app-data-management--database.png and b/frontend/__snapshots__/scenes-app-data-management--database.png differ
diff --git a/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png b/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png
index 52b29a9abf121e..03287eac29f238 100644
Binary files a/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png and b/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png differ
diff --git a/frontend/__snapshots__/scenes-app-events--event-explorer.png b/frontend/__snapshots__/scenes-app-events--event-explorer.png
index a41b3e31d7ca81..4ed82b3bdbbdd5 100644
Binary files a/frontend/__snapshots__/scenes-app-events--event-explorer.png and b/frontend/__snapshots__/scenes-app-events--event-explorer.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png b/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png
index 87cad0d1f6db76..8feeeb95edc07c 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png and b/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png
index 3332b4e9b583fc..422655b2bf3607 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png and b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png b/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png
index 36ad5c81084e2f..fd9d704276d4c4 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png and b/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiments-list.png b/frontend/__snapshots__/scenes-app-experiments--experiments-list.png
index 35578f8df9b479..f6760a46e6b697 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiments-list.png and b/frontend/__snapshots__/scenes-app-experiments--experiments-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--running-trend-experiment.png b/frontend/__snapshots__/scenes-app-experiments--running-trend-experiment.png
index c0d2a2179228eb..aab6a5a84f625e 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--running-trend-experiment.png and b/frontend/__snapshots__/scenes-app-experiments--running-trend-experiment.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png b/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png
index dbfa94be817be4..e4572b8da84096 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png and b/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png
index 3848b31fa78a83..143d99730cbf95 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png
index 6231ed9ab28e70..eaaba388c9c594 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--features-list.png b/frontend/__snapshots__/scenes-app-features--features-list.png
index b18cd979d9480d..0cfa6720e18591 100644
Binary files a/frontend/__snapshots__/scenes-app-features--features-list.png and b/frontend/__snapshots__/scenes-app-features--features-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--new-feature-flag.png b/frontend/__snapshots__/scenes-app-features--new-feature-flag.png
index 1e8c4ac19a5b5e..9ad9250549df8d 100644
Binary files a/frontend/__snapshots__/scenes-app-features--new-feature-flag.png and b/frontend/__snapshots__/scenes-app-features--new-feature-flag.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--not-found-early-access.png b/frontend/__snapshots__/scenes-app-features--not-found-early-access.png
index 9cb4f72d11d6ec..b25a28b0fd025c 100644
Binary files a/frontend/__snapshots__/scenes-app-features--not-found-early-access.png and b/frontend/__snapshots__/scenes-app-features--not-found-early-access.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png
index 60774c6d193440..5d9b07803bd264 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit--webkit.png
index 9c54670e67a941..6d0fd5b2d7cb78 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit.png
index 1b7538c0769755..489d1255fad031 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png
index e7ae0a9602d9c4..53cb826a62a1ce 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit--webkit.png
index 6db5ed04bf68a3..14095aac431c65 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit.png
index 1f0c46fe5c31e4..093643b9deefa5 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-breakdown-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit--webkit.png
index 8d7d747f8990a9..b486123a26dc72 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit.png
index a70e35a6c7f2c3..2ffaf24c766406 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-left-to-right-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png
index ad0d74d3d35ac8..226edac304a581 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit--webkit.png
index 20983c9ce3d2c4..b41b5c6455c6db 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit.png
index 945122d0b64fad..b2330f1d377800 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png
index d3c5a1c7e9457f..3e3b254a5e43ab 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--webkit.png
index 192aee1058894f..db220a7c3905ee 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit.png
index 0aead0fac3794e..500762ca60561d 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown.png
index 772ae64573f6af..77cc5d1496a9cd 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--webkit.png
index 1158f400a0d85d..c61377d5ee00c1 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit.png
index 12e54f3f008bda..8958fe5dc51ba1 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png b/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png
index e73a067a7514f9..ee1307cd8d1ba5 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png and b/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--lifecycle-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--lifecycle-edit--webkit.png
index dd0aec35f1f094..373e3e0e19c986 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--lifecycle-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--lifecycle-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--lifecycle.png b/frontend/__snapshots__/scenes-app-insights--lifecycle.png
index 738d5ec8994c5c..8fda2317ec4d01 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--lifecycle.png and b/frontend/__snapshots__/scenes-app-insights--lifecycle.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--retention-breakdown--webkit.png b/frontend/__snapshots__/scenes-app-insights--retention-breakdown--webkit.png
index 5d4b625ed232ff..fd40f5ea3d0164 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--retention-breakdown--webkit.png and b/frontend/__snapshots__/scenes-app-insights--retention-breakdown--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png b/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png
index 8c33b18f5d8940..bcf04c038e70b6 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png and b/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png
index 62e04313ddc652..509a482b5eeda3 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness.png b/frontend/__snapshots__/scenes-app-insights--stickiness.png
index 8a6be5ba22fdce..de3afbf8cc7afd 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--stickiness.png and b/frontend/__snapshots__/scenes-app-insights--stickiness.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-line--webkit.png
index f225aae3dea2ea..8aed583ad40641 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-line--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-line--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-edit--webkit.png
index 04c87cafee5c6d..e14d719a073e21 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-line-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-line-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png
index 89ad7841565cc9..fbeb271f50cf0d 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png and b/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-multi--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-multi--webkit.png
new file mode 100644
index 00000000000000..6015dabcec7138
Binary files /dev/null and b/frontend/__snapshots__/scenes-app-insights--trends-line-multi--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit--webkit.png
new file mode 100644
index 00000000000000..3f2231d07737c0
Binary files /dev/null and b/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit.png
new file mode 100644
index 00000000000000..649c945bdf267d
Binary files /dev/null and b/frontend/__snapshots__/scenes-app-insights--trends-line-multi-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-multi.png b/frontend/__snapshots__/scenes-app-insights--trends-line-multi.png
new file mode 100644
index 00000000000000..9fc201861aa47c
Binary files /dev/null and b/frontend/__snapshots__/scenes-app-insights--trends-line-multi.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line.png b/frontend/__snapshots__/scenes-app-insights--trends-line.png
index 7d0aeeadd935d8..e1b4848578966f 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-line.png and b/frontend/__snapshots__/scenes-app-insights--trends-line.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png
index b118e92405c221..17a8821fb39edd 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png
index 2a5f905f2d2cb8..796e6548e08c81 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number.png b/frontend/__snapshots__/scenes-app-insights--trends-number.png
index 932161c2835e5e..48d95207dd24d9 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number.png and b/frontend/__snapshots__/scenes-app-insights--trends-number.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png
index 0cd8bfe68f2d7f..2ba75da1d8204d 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png
index 45b723002a54ec..063e78dd5feaf0 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png
index fb9e0493728660..a3a2a9a805370b 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png
index e0ad1fcf310977..fb0e1de7e73103 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png
index b7e8cedbda6c6c..4ca89e34bfd222 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table.png b/frontend/__snapshots__/scenes-app-insights--trends-table.png
index 53b2b12ca2cf59..e36f384700aeeb 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table.png and b/frontend/__snapshots__/scenes-app-insights--trends-table.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--webkit.png
index aa0201c92e8b62..0db6e20f49afb7 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png b/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png
index 295d07af47a714..d196998a7e56f5 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png and b/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png b/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png
index 4ffe557aaf74a4..2086ed0aa90aa1 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png and b/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--headings.png b/frontend/__snapshots__/scenes-app-notebooks--headings.png
index 05544939768180..3186fed28fd49a 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--headings.png and b/frontend/__snapshots__/scenes-app-notebooks--headings.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png
index dc8cdf401a6f41..0df1f64e9ec3c4 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png and b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png b/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png
index a2a7a11db4cc92..c9f29c566c2c6c 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png and b/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png b/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png
index b9da335cd61d7b..cbe5aefd199edb 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png and b/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png b/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png
index b03f1fab581cf0..be8910d314d5b5 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png and b/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--text-formats.png b/frontend/__snapshots__/scenes-app-notebooks--text-formats.png
index 8c133958b39cc6..aa872f0a5cfe9c 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--text-formats.png and b/frontend/__snapshots__/scenes-app-notebooks--text-formats.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png b/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png
index a803eed954067f..f0ea3f9550997b 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png and b/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png
index 57b43ed4238ffb..a13107e8bbaa89 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png
index 854c2468d8cfcd..c51a24f39fa184 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png
index 4cf705d0bb98b7..dd103d2f11446b 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png b/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png
index 142d66d3f95dfb..c4c27f4db817aa 100644
Binary files a/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png and b/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png differ
diff --git a/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png b/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png
index 76d3085776638f..86a13a05a89268 100644
Binary files a/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png and b/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png differ
diff --git a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png
index 45cbb37f481ddb..68b73d4906ad25 100644
Binary files a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png and b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png b/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png
index 73966cfe593038..a86eba79b8ac08 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png and b/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--new-survey-targeting-section.png b/frontend/__snapshots__/scenes-app-surveys--new-survey-targeting-section.png
index 1fde22834eecff..59181dae850387 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--new-survey-targeting-section.png and b/frontend/__snapshots__/scenes-app-surveys--new-survey-targeting-section.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png b/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png
index a19faf8440760d..711d125b3d17ed 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png and b/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-view.png b/frontend/__snapshots__/scenes-app-surveys--survey-view.png
deleted file mode 100644
index 1fedb0eef095e0..00000000000000
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-view.png and /dev/null differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--surveys-list.png b/frontend/__snapshots__/scenes-app-surveys--surveys-list.png
index 2561db683b5f72..012692ee2758d8 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--surveys-list.png and b/frontend/__snapshots__/scenes-app-surveys--surveys-list.png differ
diff --git a/frontend/__snapshots__/scenes-other-login--cloud-with-google-login-enforcement.png b/frontend/__snapshots__/scenes-other-login--cloud-with-google-login-enforcement.png
index e34fe137f3088f..b0f0ee514ce7f8 100644
Binary files a/frontend/__snapshots__/scenes-other-login--cloud-with-google-login-enforcement.png and b/frontend/__snapshots__/scenes-other-login--cloud-with-google-login-enforcement.png differ
diff --git a/frontend/__snapshots__/scenes-other-login--self-hosted-with-saml.png b/frontend/__snapshots__/scenes-other-login--self-hosted-with-saml.png
index 6b63cb0b7dbc82..ee4ee6206d28ef 100644
Binary files a/frontend/__snapshots__/scenes-other-login--self-hosted-with-saml.png and b/frontend/__snapshots__/scenes-other-login--self-hosted-with-saml.png differ
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-organization.png b/frontend/__snapshots__/scenes-other-settings--settings-organization.png
new file mode 100644
index 00000000000000..05fee3ba225115
Binary files /dev/null and b/frontend/__snapshots__/scenes-other-settings--settings-organization.png differ
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-project.png b/frontend/__snapshots__/scenes-other-settings--settings-project.png
new file mode 100644
index 00000000000000..71514ddb64f122
Binary files /dev/null and b/frontend/__snapshots__/scenes-other-settings--settings-project.png differ
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-user.png b/frontend/__snapshots__/scenes-other-settings--settings-user.png
new file mode 100644
index 00000000000000..5574601d117944
Binary files /dev/null and b/frontend/__snapshots__/scenes-other-settings--settings-user.png differ
diff --git a/frontend/src/exporter/Exporter.stories.tsx b/frontend/src/exporter/Exporter.stories.tsx
index 2fec27d41785c2..4c5acbd7257aa5 100644
--- a/frontend/src/exporter/Exporter.stories.tsx
+++ b/frontend/src/exporter/Exporter.stories.tsx
@@ -38,107 +38,115 @@ const Template: StoryFn<typeof Exporter> = (props) => {
 }
 
 export const TrendsLineInsight: Story = Template.bind({})
-TrendsLineInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsLine.json') }
+TrendsLineInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLine.json') }
+
+export const TrendsLineMultiInsight: Story = Template.bind({})
+TrendsLineMultiInsight.args = {
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'),
+}
+TrendsLineMultiInsight.parameters = {
+    mockDate: '2023-07-10',
+}
 
 export const TrendsLineBreakdownInsight: Story = Template.bind({})
 TrendsLineBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json'),
 }
 
 export const TrendsBarInsight: Story = Template.bind({})
-TrendsBarInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsBar.json') }
+TrendsBarInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsBar.json') }
 
 export const TrendsBarBreakdownInsight: Story = Template.bind({})
 TrendsBarBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json'),
 }
 
 export const TrendsValueInsight: Story = Template.bind({})
-TrendsValueInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsValue.json') }
+TrendsValueInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsValue.json') }
 
 export const TrendsValueBreakdownInsight: Story = Template.bind({})
 TrendsValueBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsValueBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsValueBreakdown.json'),
 }
 
 export const TrendsAreaInsight: Story = Template.bind({})
-TrendsAreaInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsArea.json') }
+TrendsAreaInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsArea.json') }
 
 export const TrendsAreaBreakdownInsight: Story = Template.bind({})
 TrendsAreaBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsAreaBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsAreaBreakdown.json'),
 }
 
 export const TrendsNumberInsight: Story = Template.bind({})
-TrendsNumberInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsNumber.json') }
+TrendsNumberInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsNumber.json') }
 
 export const TrendsTableInsight: Story = Template.bind({})
-TrendsTableInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsTable.json') }
+TrendsTableInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsTable.json') }
 
 export const TrendsTableBreakdownInsight: Story = Template.bind({})
 TrendsTableBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsTableBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsTableBreakdown.json'),
 }
 
 export const TrendsPieInsight: Story = Template.bind({})
-TrendsPieInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsPie.json') }
+TrendsPieInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsPie.json') }
 
 export const TrendsPieBreakdownInsight: Story = Template.bind({})
 TrendsPieBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json'),
 }
 
 export const TrendsWorldMapInsight: Story = Template.bind({})
 TrendsWorldMapInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json'),
 }
 
 export const FunnelLeftToRightInsight: Story = Template.bind({})
 FunnelLeftToRightInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json'),
 }
 
 export const FunnelLeftToRightBreakdownInsight: Story = Template.bind({})
 FunnelLeftToRightBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRightBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json'),
 }
 
 export const FunnelTopToBottomInsight: Story = Template.bind({})
 FunnelTopToBottomInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json'),
 }
 
 export const FunnelTopToBottomBreakdownInsight: Story = Template.bind({})
 FunnelTopToBottomBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottomBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json'),
 }
 
 export const FunnelHistoricalTrendsInsight: Story = Template.bind({})
 FunnelHistoricalTrendsInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelHistoricalTrends.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelHistoricalTrends.json'),
 }
 
 export const FunnelTimeToConvertInsight: Story = Template.bind({})
 FunnelTimeToConvertInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/funnelTimeToConvert.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelTimeToConvert.json'),
 }
 
 export const RetentionInsight: Story = Template.bind({})
-RetentionInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/retention.json') }
+RetentionInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/retention.json') }
 
 export const RetentionBreakdownInsight: Story = Template.bind({})
 RetentionBreakdownInsight.args = {
-    insight: require('../mocks/fixtures/api/projects/:team_id/insights/retentionBreakdown.json'),
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/retentionBreakdown.json'),
 }
 
 export const LifecycleInsight: Story = Template.bind({})
-LifecycleInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/lifecycle.json') }
+LifecycleInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/lifecycle.json') }
 
 export const StickinessInsight: Story = Template.bind({})
-StickinessInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/stickiness.json') }
+StickinessInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/stickiness.json') }
 
 export const UserPathsInsight: Story = Template.bind({})
-UserPathsInsight.args = { insight: require('../mocks/fixtures/api/projects/:team_id/insights/userPaths.json') }
+UserPathsInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/userPaths.json') }
 
 export const Dashboard: Story = Template.bind({})
 Dashboard.args = { dashboard }
diff --git a/frontend/src/layout/GlobalModals.tsx b/frontend/src/layout/GlobalModals.tsx
new file mode 100644
index 00000000000000..83e61a3476da01
--- /dev/null
+++ b/frontend/src/layout/GlobalModals.tsx
@@ -0,0 +1,81 @@
+import { kea, path, actions, reducers, useActions, useValues } from 'kea'
+import { CreateOrganizationModal } from 'scenes/organization/CreateOrganizationModal'
+import { CreateProjectModal } from 'scenes/project/CreateProjectModal'
+
+import type { globalModalsLogicType } from './GlobalModalsType'
+import { FeaturePreviewsModal } from './FeaturePreviews'
+import { UpgradeModal } from 'scenes/UpgradeModal'
+import { LemonModal } from '@posthog/lemon-ui'
+import { Setup2FA } from 'scenes/authentication/Setup2FA'
+import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
+import { FlaggedFeature } from 'lib/components/FlaggedFeature'
+import { Prompt } from 'lib/logic/newPrompt/Prompt'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
+import { InviteModal } from 'scenes/settings/organization/InviteModal'
+
+export const globalModalsLogic = kea<globalModalsLogicType>([
+    path(['layout', 'navigation', 'globalModalsLogic']),
+    actions({
+        showCreateOrganizationModal: true,
+        hideCreateOrganizationModal: true,
+        showCreateProjectModal: true,
+        hideCreateProjectModal: true,
+    }),
+    reducers({
+        isCreateOrganizationModalShown: [
+            false,
+            {
+                showCreateOrganizationModal: () => true,
+                hideCreateOrganizationModal: () => false,
+            },
+        ],
+        isCreateProjectModalShown: [
+            false,
+            {
+                showCreateProjectModal: () => true,
+                hideCreateProjectModal: () => false,
+            },
+        ],
+    }),
+])
+
+export function GlobalModals(): JSX.Element {
+    const { isCreateOrganizationModalShown, isCreateProjectModalShown } = useValues(globalModalsLogic)
+    const { hideCreateOrganizationModal, hideCreateProjectModal } = useActions(globalModalsLogic)
+    const { isInviteModalShown } = useValues(inviteLogic)
+    const { hideInviteModal } = useActions(inviteLogic)
+    const { user } = useValues(userLogic)
+
+    return (
+        <>
+            <InviteModal isOpen={isInviteModalShown} onClose={hideInviteModal} />
+            <CreateOrganizationModal isVisible={isCreateOrganizationModalShown} onClose={hideCreateOrganizationModal} />
+            <CreateProjectModal isVisible={isCreateProjectModalShown} onClose={hideCreateProjectModal} />
+            <FeaturePreviewsModal />
+            <UpgradeModal />
+
+            {user && user.organization?.enforce_2fa && !user.is_2fa_enabled && (
+                <LemonModal title="Set up 2FA" closable={false}>
+                    <p>
+                        <b>Your organization requires you to set up 2FA.</b>
+                    </p>
+                    <p>
+                        <b>
+                            Use an authenticator app like Google Authenticator or 1Password to scan the QR code below.
+                        </b>
+                    </p>
+                    <Setup2FA
+                        onSuccess={() => {
+                            userLogic.actions.loadUser()
+                            membersLogic.actions.loadMembers()
+                        }}
+                    />
+                </LemonModal>
+            )}
+            <FlaggedFeature flag="enable-prompts">
+                <Prompt />
+            </FlaggedFeature>
+        </>
+    )
+}
diff --git a/frontend/src/layout/navigation-3000/Navigation.scss b/frontend/src/layout/navigation-3000/Navigation.scss
index c9b6ed65e2903c..ad0629bb138fb6 100644
--- a/frontend/src/layout/navigation-3000/Navigation.scss
+++ b/frontend/src/layout/navigation-3000/Navigation.scss
@@ -22,7 +22,6 @@
     position: relative;
     margin: var(--scene-padding-y) var(--scene-padding-x);
     min-height: calc(100vh - var(--breadcrumbs-height-full) - var(--scene-padding-y) * 2);
-    overflow-x: hidden;
     &.Navigation3000__scene--raw {
         --scene-padding-y: 0px;
         --scene-padding-x: 0px;
diff --git a/frontend/src/layout/navigation-3000/Navigation.tsx b/frontend/src/layout/navigation-3000/Navigation.tsx
index 253156e51398a0..04d577454aadd7 100644
--- a/frontend/src/layout/navigation-3000/Navigation.tsx
+++ b/frontend/src/layout/navigation-3000/Navigation.tsx
@@ -29,6 +29,9 @@ export function Navigation({
         document.getElementById('bottom-notice')?.remove()
     }, [])
 
+    if (sceneConfig?.layout === 'plain') {
+        return <>{children}</>
+    }
     return (
         <div className="Navigation3000">
             <Navbar />
diff --git a/frontend/src/layout/navigation-3000/components/Breadcrumbs.tsx b/frontend/src/layout/navigation-3000/components/Breadcrumbs.tsx
index 497d9ec56bad2c..b818d42923c955 100644
--- a/frontend/src/layout/navigation-3000/components/Breadcrumbs.tsx
+++ b/frontend/src/layout/navigation-3000/components/Breadcrumbs.tsx
@@ -36,7 +36,6 @@ export function Breadcrumbs(): JSX.Element | null {
         <div
             className="Breadcrumbs3000"
             style={
-                // eslint-disable-line react/forbid-dom-props
                 {
                     '--breadcrumbs-compaction-rate': compactionRate,
                 } as React.CSSProperties
@@ -104,6 +103,11 @@ function Breadcrumb({ breadcrumb, index, here }: BreadcrumbProps): JSX.Element {
                         setPopoverShown(false)
                     }
                 }}
+                onClickInside={() => {
+                    if (popoverShown) {
+                        setPopoverShown(false)
+                    }
+                }}
             >
                 {breadcrumbContent}
             </Popover>
diff --git a/frontend/src/layout/navigation-3000/components/Navbar.tsx b/frontend/src/layout/navigation-3000/components/Navbar.tsx
index c91b9289ee8850..26619b7fd6cf20 100644
--- a/frontend/src/layout/navigation-3000/components/Navbar.tsx
+++ b/frontend/src/layout/navigation-3000/components/Navbar.tsx
@@ -104,9 +104,9 @@ export function Navbar(): JSX.Element {
                         />
                         <NavbarButton
                             icon={<IconGear />}
-                            identifier={Scene.ProjectSettings}
+                            identifier={Scene.Settings}
                             title="Project settings"
-                            to={urls.projectSettings()}
+                            to={urls.settings('project')}
                         />
                         <Popover
                             overlay={<SitePopoverOverlay />}
diff --git a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
index c6dc5479055b8e..72e07508a9ebf1 100644
--- a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
+++ b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
@@ -4,6 +4,7 @@ import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import clsx from 'clsx'
 import { useValues } from 'kea'
 import { sceneLogic } from 'scenes/sceneLogic'
+import { SidebarChangeNoticeContent, useSidebarChangeNotices } from '~/layout/navigation/SideBar/SidebarChangeNotice'
 import { navigation3000Logic } from '../navigationLogic'
 import { LemonTag } from '@posthog/lemon-ui'
 import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
@@ -63,29 +64,46 @@ export const NavbarButton: FunctionComponent<NavbarButtonProps> = React.forwardR
         }
     }
 
+    const buttonContent = (
+        <LemonButton
+            ref={ref}
+            data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+            onMouseEnter={() => setHasBeenClicked(false)}
+            onClick={() => {
+                setHasBeenClicked(true)
+                onClick?.()
+            }}
+            className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
+            fullWidth
+            {...buttonProps}
+        >
+            {content}
+        </LemonButton>
+    )
+
+    const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
+
     return (
         <li className="w-full">
-            <Tooltip
-                title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
-                placement="right"
-                delayMs={0}
-                visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
-            >
-                <LemonButton
-                    ref={ref}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    onMouseEnter={() => setHasBeenClicked(false)}
-                    onClick={() => {
-                        setHasBeenClicked(true)
-                        onClick?.()
-                    }}
-                    className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
-                    fullWidth
-                    {...buttonProps}
+            {notices.length ? (
+                <Tooltip
+                    title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
+                    placement={notices[0].placement ?? 'right'}
+                    delayMs={0}
+                    visible={true}
+                >
+                    {buttonContent}
+                </Tooltip>
+            ) : (
+                <Tooltip
+                    title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
+                    placement="right"
+                    delayMs={0}
+                    visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
                 >
-                    {content}
-                </LemonButton>
-            </Tooltip>
+                    {buttonContent}
+                </Tooltip>
+            )}
         </li>
     )
 })
diff --git a/frontend/src/layout/navigation-3000/navigationLogic.tsx b/frontend/src/layout/navigation-3000/navigationLogic.tsx
index 48f14cf59fd204..5e5c1237c1b8f7 100644
--- a/frontend/src/layout/navigation-3000/navigationLogic.tsx
+++ b/frontend/src/layout/navigation-3000/navigationLogic.tsx
@@ -19,9 +19,7 @@ import {
     IconHome,
     IconLive,
     IconPeople,
-    IconPerson,
     IconPieChart,
-    IconQuestion,
     IconRewindPlay,
     IconTestTube,
     IconToggle,
@@ -32,8 +30,6 @@ import {
     IconChat,
 } from '@posthog/icons'
 import { urls } from 'scenes/urls'
-import { annotationsSidebarLogic } from './sidebars/annotations'
-import { cohortsSidebarLogic } from './sidebars/cohorts'
 import { dashboardsSidebarLogic } from './sidebars/dashboards'
 import { dataManagementSidebarLogic } from './sidebars/dataManagement'
 import { experimentsSidebarLogic } from './sidebars/experiments'
@@ -322,33 +318,12 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                             to: isUsingSidebar ? undefined : urls.eventDefinitions(),
                         },
                         {
-                            identifier: Scene.Persons,
-                            label: 'People and groups',
-                            icon: <IconPerson />,
+                            identifier: Scene.PersonsManagement,
+                            label: 'People',
+                            icon: <IconPeople />,
                             logic: isUsingSidebar ? personsAndGroupsSidebarLogic : undefined,
                             to: isUsingSidebar ? undefined : urls.persons(),
                         },
-                        {
-                            identifier: Scene.Cohorts,
-                            label: 'Cohorts',
-                            icon: <IconPeople />,
-                            logic: isUsingSidebar ? cohortsSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.cohorts(),
-                        },
-                        {
-                            identifier: Scene.Annotations,
-                            label: 'Annotations',
-                            icon: <IconQuestion />,
-                            logic: isUsingSidebar ? annotationsSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.annotations(),
-                        },
-                        {
-                            identifier: Scene.ToolbarLaunch,
-                            label: 'Toolbar',
-                            icon: <IconToolbar />,
-                            logic: isUsingSidebar ? toolbarSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.toolbarLaunch(),
-                        },
                     ],
                     [
                         {
@@ -364,7 +339,7 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                                   label: 'Web analytics',
                                   icon: <IconPieChart />,
                                   to: isUsingSidebar ? undefined : urls.webAnalytics(),
-                                  tag: 'alpha' as const,
+                                  tag: 'beta' as const,
                               }
                             : null,
                         {
@@ -415,6 +390,13 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                             icon: <IconApps />,
                             to: urls.projectApps(),
                         },
+                        {
+                            identifier: Scene.ToolbarLaunch,
+                            label: 'Toolbar',
+                            icon: <IconToolbar />,
+                            logic: isUsingSidebar ? toolbarSidebarLogic : undefined,
+                            to: isUsingSidebar ? undefined : urls.toolbarLaunch(),
+                        },
                     ],
                 ]
             },
diff --git a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.scss b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.scss
index f2744d39ae95bf..4f3d08f139753e 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.scss
+++ b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.scss
@@ -20,7 +20,7 @@
             box-shadow: 0px 0px 30px rgba(0, 0, 0, 0.2);
 
             [theme='dark'] & {
-                box-shadow: 0px 0px 30px rgba(255, 255, 255, 0.1);
+                box-shadow: none;
             }
         }
 
diff --git a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
index 6bba9592f0972f..3411db82b14655 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
@@ -1,15 +1,19 @@
 import { LemonButton } from '@posthog/lemon-ui'
 import './SidePanel.scss'
 import { useActions, useValues } from 'kea'
-import { SidePanelTab, sidePanelLogic } from './sidePanelLogic'
+import { sidePanelLogic } from './sidePanelLogic'
 import clsx from 'clsx'
 import { Resizer } from 'lib/components/Resizer/Resizer'
 import { useRef } from 'react'
 import { ResizerLogicProps, resizerLogic } from 'lib/components/Resizer/resizerLogic'
-import { IconNotebook, IconQuestion, IconInfo } from '@posthog/icons'
+import { IconNotebook, IconQuestion, IconInfo, IconGear } from '@posthog/icons'
 import { SidePanelDocs } from './panels/SidePanelDocs'
 import { SidePanelSupport } from './panels/SidePanelSupport'
 import { NotebookPanel } from 'scenes/notebooks/NotebookPanel/NotebookPanel'
+import { SidePanelActivation, SidePanelActivationIcon } from './panels/SidePanelActivation'
+import { SidePanelSettings } from './panels/SidePanelSettings'
+import { SidePanelTab } from '~/types'
+import { sidePanelStateLogic } from './sidePanelStateLogic'
 
 export const SidePanelTabs: Record<SidePanelTab, { label: string; Icon: any; Content: any }> = {
     [SidePanelTab.Notebooks]: {
@@ -27,11 +31,23 @@ export const SidePanelTabs: Record<SidePanelTab, { label: string; Icon: any; Con
         Icon: IconInfo,
         Content: SidePanelDocs,
     },
+
+    [SidePanelTab.Activation]: {
+        label: 'Quick start',
+        Icon: SidePanelActivationIcon,
+        Content: SidePanelActivation,
+    },
+    [SidePanelTab.Settings]: {
+        label: 'Settings',
+        Icon: IconGear,
+        Content: SidePanelSettings,
+    },
 }
 
 export function SidePanel(): JSX.Element | null {
-    const { selectedTab, sidePanelOpen, enabledTabs } = useValues(sidePanelLogic)
-    const { openSidePanel, closeSidePanel } = useActions(sidePanelLogic)
+    const { visibleTabs } = useValues(sidePanelLogic)
+    const { selectedTab, sidePanelOpen } = useValues(sidePanelStateLogic)
+    const { openSidePanel, closeSidePanel } = useActions(sidePanelStateLogic)
 
     const activeTab = sidePanelOpen && selectedTab
 
@@ -51,7 +67,7 @@ export function SidePanel(): JSX.Element | null {
 
     const { desiredWidth, isResizeInProgress } = useValues(resizerLogic(resizerLogicProps))
 
-    if (!enabledTabs.length) {
+    if (!visibleTabs.length) {
         return null
     }
 
@@ -71,9 +87,9 @@ export function SidePanel(): JSX.Element | null {
             <Resizer {...resizerLogicProps} />
             <div className="SidePanel3000__bar">
                 <div className="rotate-90 flex items-center gap-1 px-2">
-                    {Object.entries(SidePanelTabs)
-                        .filter(([tab]) => enabledTabs.includes(tab as SidePanelTab))
-                        .map(([tab, { label, Icon }]) => (
+                    {visibleTabs.map((tab: SidePanelTab) => {
+                        const { Icon, label } = SidePanelTabs[tab]
+                        return (
                             <LemonButton
                                 key={tab}
                                 icon={<Icon className="rotate-270 w-6" />}
@@ -85,7 +101,8 @@ export function SidePanel(): JSX.Element | null {
                             >
                                 {label}
                             </LemonButton>
-                        ))}
+                        )
+                    })}
                 </div>
             </div>
             <Resizer {...resizerLogicProps} offset={'3rem'} />
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx
new file mode 100644
index 00000000000000..f6a137cc850eed
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx
@@ -0,0 +1,58 @@
+import { useValues } from 'kea'
+import { ActivationTask } from 'lib/components/ActivationSidebar/ActivationSidebar'
+import { ActivationTaskType, activationLogic } from 'lib/components/ActivationSidebar/activationLogic'
+import { ProfessorHog } from 'lib/components/hedgehogs'
+import { LemonProgressCircle } from 'lib/lemon-ui/LemonProgressCircle'
+import { LemonIconProps } from 'lib/lemon-ui/icons'
+
+export const SidePanelActivation = (): JSX.Element => {
+    const { activeTasks, completionPercent, completedTasks } = useValues(activationLogic)
+
+    return (
+        <div className="p-4 space-y-2">
+            <h2>Quick Start</h2>
+            <p>Use our Quick Start guide to learn about everything PostHog can do for you and your product.</p>
+            <div className="flex items-center justify-center">
+                <div className="flex flex-col items-center">
+                    <LemonProgressCircle progress={completionPercent / 100} size={100} className="text-primary">
+                        <span className="text-2xl">{activeTasks.length}</span>
+                    </LemonProgressCircle>
+                    <p className="text-muted mt-2 ">still to go</p>
+                </div>
+                <div className="h-60">
+                    <ProfessorHog className="max-h-full w-auto object-contain" />
+                </div>
+            </div>
+            {activeTasks.length > 0 && (
+                <div>
+                    <h4>What's next?</h4>
+                    <ul className="space-y-2">
+                        {activeTasks.map((task: ActivationTaskType) => (
+                            <ActivationTask key={task.id} {...task} />
+                        ))}
+                    </ul>
+                </div>
+            )}
+            {completedTasks.length > 0 && (
+                <div>
+                    <h4>Completed</h4>
+                    <ul className="space-y-2">
+                        {completedTasks.map((task: ActivationTaskType) => (
+                            <ActivationTask key={task.id} {...task} />
+                        ))}
+                    </ul>
+                </div>
+            )}
+        </div>
+    )
+}
+
+export const SidePanelActivationIcon = ({ className }: { className: LemonIconProps['className'] }): JSX.Element => {
+    const { activeTasks, completionPercent } = useValues(activationLogic)
+
+    return (
+        <LemonProgressCircle progress={completionPercent / 100} size={20} className={className}>
+            <span className="text-xs font-bold">{activeTasks.length}</span>
+        </LemonProgressCircle>
+    )
+}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSettings.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSettings.tsx
new file mode 100644
index 00000000000000..2b9009f3f5be8d
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSettings.tsx
@@ -0,0 +1,47 @@
+import { useActions, useValues } from 'kea'
+import { sidePanelSettingsLogic } from './sidePanelSettingsLogic'
+import { Settings } from 'scenes/settings/Settings'
+import { LemonButton } from '@posthog/lemon-ui'
+import { IconOpenInNew } from 'lib/lemon-ui/icons'
+import { urls } from 'scenes/urls'
+import { SettingsLogicProps, settingsLogic } from 'scenes/settings/settingsLogic'
+import { useEffect } from 'react'
+
+export const SidePanelSettings = (): JSX.Element => {
+    const { settings } = useValues(sidePanelSettingsLogic)
+    const { closeSidePanel, setSettings } = useActions(sidePanelSettingsLogic)
+
+    const settingsLogicProps: SettingsLogicProps = {
+        ...settings,
+        logicKey: 'sidepanel',
+    }
+    const { selectedSectionId, selectedLevel } = useValues(settingsLogic(settingsLogicProps))
+
+    useEffect(() => {
+        setSettings({
+            sectionId: selectedSectionId ?? undefined,
+            settingLevelId: selectedLevel,
+        })
+    }, [selectedSectionId, selectedLevel])
+
+    return (
+        <div className="flex flex-col overflow-hidden">
+            <div className="border-b flex-0 p-1 flex items-center justify-end gap-2">
+                <LemonButton
+                    size="small"
+                    to={urls.settings(settings.sectionId ?? settings.settingLevelId, settings.settingId)}
+                    onClick={() => closeSidePanel()}
+                    icon={<IconOpenInNew />}
+                >
+                    All settings
+                </LemonButton>
+                <LemonButton size="small" onClick={() => closeSidePanel()}>
+                    Done
+                </LemonButton>
+            </div>
+            <div className="flex-1 p-4 overflow-y-auto">
+                <Settings {...settingsLogicProps} />
+            </div>
+        </div>
+    )
+}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
index 4cfa7be0130e06..71344bb84b4a69 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
@@ -1,12 +1,13 @@
 import { useActions, useValues } from 'kea'
 import { SupportForm, SupportFormButtons } from 'lib/components/Support/SupportForm'
-import { SidePanelTab, sidePanelLogic } from '../sidePanelLogic'
 import { supportLogic } from 'lib/components/Support/supportLogic'
 import { useEffect } from 'react'
+import { sidePanelStateLogic } from '../sidePanelStateLogic'
+import { SidePanelTab } from '~/types'
 
 export const SidePanelSupport = (): JSX.Element => {
-    const { closeSidePanel } = useActions(sidePanelLogic)
-    const { selectedTab } = useValues(sidePanelLogic)
+    const { closeSidePanel } = useActions(sidePanelStateLogic)
+    const { selectedTab } = useValues(sidePanelStateLogic)
 
     const theLogic = supportLogic({ onClose: () => closeSidePanel(SidePanelTab.Feedback) })
     const { title } = useValues(theLogic)
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelDocsLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelDocsLogic.ts
index a74907018531c6..ed5ae45ebde094 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelDocsLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelDocsLogic.ts
@@ -1,14 +1,15 @@
 import { actions, kea, reducers, path, listeners, connect } from 'kea'
-import { SidePanelTab, sidePanelLogic } from '../sidePanelLogic'
 
 import type { sidePanelDocsLogicType } from './sidePanelDocsLogicType'
+import { sidePanelStateLogic } from '../sidePanelStateLogic'
+import { SidePanelTab } from '~/types'
 
 const POSTHOG_COM_DOMAIN = 'https://posthog.com'
 
 export const sidePanelDocsLogic = kea<sidePanelDocsLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelDocsLogic']),
     connect({
-        actions: [sidePanelLogic, ['openSidePanel', 'closeSidePanel']],
+        actions: [sidePanelStateLogic, ['openSidePanel', 'closeSidePanel']],
     }),
 
     actions({
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelSettingsLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelSettingsLogic.tsx
new file mode 100644
index 00000000000000..da07a199f139d9
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelSettingsLogic.tsx
@@ -0,0 +1,60 @@
+import { actions, kea, reducers, path, listeners, connect } from 'kea'
+import { Settings } from 'scenes/settings/Settings'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { LemonDialog } from '@posthog/lemon-ui'
+
+import type { sidePanelSettingsLogicType } from './sidePanelSettingsLogicType'
+import { sidePanelStateLogic } from '../sidePanelStateLogic'
+import { SidePanelTab } from '~/types'
+import { SettingsLogicProps } from 'scenes/settings/settingsLogic'
+
+export const sidePanelSettingsLogic = kea<sidePanelSettingsLogicType>([
+    path(['scenes', 'navigation', 'sidepanel', 'sidePanelSettingsLogic']),
+    connect({
+        values: [featureFlagLogic, ['featureFlags']],
+        actions: [sidePanelStateLogic, ['openSidePanel', 'closeSidePanel']],
+    }),
+
+    actions({
+        openSettingsPanel: (settingsLogicProps: SettingsLogicProps) => ({
+            settingsLogicProps,
+        }),
+        setSettings: (settingsLogicProps: SettingsLogicProps) => ({
+            settingsLogicProps,
+        }),
+    }),
+
+    reducers(() => ({
+        settings: [
+            {} as SettingsLogicProps,
+            { persist: true },
+            {
+                openSettingsPanel: (_, { settingsLogicProps }) => {
+                    return settingsLogicProps
+                },
+                setSettings: (_, { settingsLogicProps }) => {
+                    return settingsLogicProps
+                },
+            },
+        ],
+    })),
+
+    listeners(({ actions, values }) => ({
+        openSettingsPanel: ({ settingsLogicProps }) => {
+            if (!values.featureFlags[FEATURE_FLAGS.POSTHOG_3000]) {
+                LemonDialog.open({
+                    title: 'Settings',
+                    content: <Settings {...settingsLogicProps} hideSections logicKey="modal" />,
+                    width: 600,
+                    primaryButton: {
+                        children: 'Done',
+                    },
+                })
+                return
+            }
+
+            actions.openSidePanel(SidePanelTab.Settings)
+        },
+    })),
+])
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
index c51ccb50a07162..aef21253e546f5 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
@@ -1,44 +1,25 @@
-import { actions, kea, reducers, path, listeners, selectors, connect } from 'kea'
+import { kea, path, selectors, connect } from 'kea'
 
 import type { sidePanelLogicType } from './sidePanelLogicType'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
-
-export enum SidePanelTab {
-    Notebooks = 'notebook',
-    Feedback = 'feedback',
-    Docs = 'docs',
-}
+import { activationLogic } from 'lib/components/ActivationSidebar/activationLogic'
+import { SidePanelTab } from '~/types'
+import { sidePanelStateLogic } from './sidePanelStateLogic'
 
 export const sidePanelLogic = kea<sidePanelLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelLogic']),
-    actions({
-        setSidePanelOpen: (open: boolean) => ({ open }),
-        openSidePanel: (tab: SidePanelTab) => ({ tab }),
-        closeSidePanel: (tab?: SidePanelTab) => ({ tab }),
-    }),
-
     connect({
-        values: [featureFlagLogic, ['featureFlags'], preflightLogic, ['isCloudOrDev']],
-    }),
-
-    reducers(() => ({
-        selectedTab: [
-            null as SidePanelTab | null,
-            { persist: true },
-            {
-                openSidePanel: (_, { tab }) => tab,
-            },
-        ],
-        sidePanelOpen: [
-            false,
-            { persist: true },
-            {
-                setSidePanelOpen: (_, { open }) => open,
-            },
+        values: [
+            featureFlagLogic,
+            ['featureFlags'],
+            preflightLogic,
+            ['isCloudOrDev'],
+            activationLogic,
+            ['isReady', 'hasCompletedAllTasks'],
         ],
-    })),
+    }),
 
     selectors({
         enabledTabs: [
@@ -58,23 +39,39 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
                     tabs.push(SidePanelTab.Docs)
                 }
 
+                tabs.push(SidePanelTab.Settings)
+                tabs.push(SidePanelTab.Activation)
+
                 return tabs
             },
         ],
-    }),
 
-    listeners(({ actions, values }) => ({
-        openSidePanel: () => {
-            actions.setSidePanelOpen(true)
-        },
-        closeSidePanel: ({ tab }) => {
-            if (!tab) {
-                // If we aren't specifiying the tab we always close
-                actions.setSidePanelOpen(false)
-            } else if (values.selectedTab === tab) {
-                // Otherwise we only close it if the tab is the currently open one
-                actions.setSidePanelOpen(false)
-            }
-        },
-    })),
+        visibleTabs: [
+            (s) => [
+                s.enabledTabs,
+                sidePanelStateLogic.selectors.selectedTab,
+                sidePanelStateLogic.selectors.sidePanelOpen,
+                s.isReady,
+                s.hasCompletedAllTasks,
+            ],
+            (enabledTabs, selectedTab, sidePanelOpen, isReady, hasCompletedAllTasks): SidePanelTab[] => {
+                return enabledTabs.filter((tab: any) => {
+                    if (tab === selectedTab && sidePanelOpen) {
+                        return true
+                    }
+
+                    // Hide certain tabs unless they are selected
+                    if ([SidePanelTab.Settings].includes(tab)) {
+                        return false
+                    }
+
+                    if (tab === SidePanelTab.Activation && (!isReady || hasCompletedAllTasks)) {
+                        return false
+                    }
+
+                    return true
+                })
+            },
+        ],
+    }),
 ])
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
new file mode 100644
index 00000000000000..2c29443facbc6b
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
@@ -0,0 +1,48 @@
+import { actions, kea, listeners, path, reducers } from 'kea'
+import { SidePanelTab } from '~/types'
+
+import type { sidePanelStateLogicType } from './sidePanelStateLogicType'
+
+// The side panel imports a lot of other components so this allows us to avoid circular dependencies
+
+export const sidePanelStateLogic = kea<sidePanelStateLogicType>([
+    path(['scenes', 'navigation', 'sidepanel', 'sidePanelStateLogic']),
+    actions({
+        openSidePanel: (tab: SidePanelTab) => ({ tab }),
+        closeSidePanel: (tab?: SidePanelTab) => ({ tab }),
+        setSidePanelOpen: (open: boolean) => ({ open }),
+    }),
+
+    reducers(() => ({
+        selectedTab: [
+            null as SidePanelTab | null,
+            { persist: true },
+            {
+                openSidePanel: (_, { tab }) => tab,
+            },
+        ],
+        sidePanelOpen: [
+            false,
+            { persist: true },
+            {
+                setSidePanelOpen: (_, { open }) => open,
+            },
+        ],
+    })),
+    listeners(({ actions, values }) => ({
+        // NOTE: We explicitly reference the actions instead of connecting so that people don't accidentally
+        // use this logic instead of sidePanelStateLogic
+        openSidePanel: () => {
+            actions.setSidePanelOpen(true)
+        },
+        closeSidePanel: ({ tab }) => {
+            if (!tab) {
+                // If we aren't specifiying the tab we always close
+                actions.setSidePanelOpen(false)
+            } else if (values.selectedTab === tab) {
+                // Otherwise we only close it if the tab is the currently open one
+                actions.setSidePanelOpen(false)
+            }
+        },
+    })),
+])
diff --git a/frontend/src/layout/navigation-3000/themeLogic.ts b/frontend/src/layout/navigation-3000/themeLogic.ts
index 98ae67f02c45b2..811960d5bf15a7 100644
--- a/frontend/src/layout/navigation-3000/themeLogic.ts
+++ b/frontend/src/layout/navigation-3000/themeLogic.ts
@@ -4,6 +4,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
 import type { themeLogicType } from './themeLogicType'
+import { sceneLogic } from 'scenes/sceneLogic'
 
 export const themeLogic = kea<themeLogicType>([
     path(['layout', 'navigation-3000', 'themeLogic']),
@@ -32,8 +33,21 @@ export const themeLogic = kea<themeLogicType>([
     }),
     selectors({
         isDarkModeOn: [
-            (s) => [s.darkModeSavedPreference, s.darkModeSystemPreference, featureFlagLogic.selectors.featureFlags],
-            (darkModeSavedPreference, darkModeSystemPreference, featureFlags) => {
+            (s) => [
+                s.darkModeSavedPreference,
+                s.darkModeSystemPreference,
+                featureFlagLogic.selectors.featureFlags,
+                sceneLogic.selectors.sceneConfig,
+            ],
+            (darkModeSavedPreference, darkModeSystemPreference, featureFlags, sceneConfig) => {
+                // NOTE: Unauthenticated users always get the light mode until we have full support across onboarding flows
+                if (
+                    sceneConfig?.layout === 'plain' ||
+                    sceneConfig?.allowUnauthenticated ||
+                    sceneConfig?.onlyUnauthenticated
+                ) {
+                    return false
+                }
                 // Dark mode is a PostHog 3000 feature
                 // User-saved preference is used when set, oterwise we fall back to the system value
                 return featureFlags[FEATURE_FLAGS.POSTHOG_3000]
diff --git a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
index 04e0abc6fd424a..dd49842bc5fa7d 100644
--- a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
+++ b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
@@ -7,7 +7,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { Scene } from 'scenes/sceneTypes'
 
 const blankScene = (): any => ({ scene: { component: () => null, logic: null } })
-const scenes: any = { [Scene.Annotations]: blankScene, [Scene.Dashboards]: blankScene }
+const scenes: any = { [Scene.SavedInsights]: blankScene, [Scene.Dashboards]: blankScene }
 
 describe('breadcrumbsLogic', () => {
     let logic: ReturnType<typeof breadcrumbsLogic.build>
@@ -24,9 +24,9 @@ describe('breadcrumbsLogic', () => {
         logic.mount()
 
         // test with .delay because subscriptions happen async
-        router.actions.push(urls.annotations())
-        await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Annotations • PostHog' })
-        expect(global.document.title).toEqual('Annotations • PostHog')
+        router.actions.push(urls.savedInsights())
+        await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Insights • PostHog' })
+        expect(global.document.title).toEqual('Insights • PostHog')
 
         router.actions.push(urls.dashboards())
         await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Dashboards • PostHog' })
diff --git a/frontend/src/layout/navigation/OrganizationSwitcher.tsx b/frontend/src/layout/navigation/OrganizationSwitcher.tsx
index 4c1d5401a854d6..ed9232ee87256e 100644
--- a/frontend/src/layout/navigation/OrganizationSwitcher.tsx
+++ b/frontend/src/layout/navigation/OrganizationSwitcher.tsx
@@ -11,6 +11,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { userLogic } from 'scenes/userLogic'
 import { AvailableFeature, OrganizationBasicType } from '~/types'
 import { navigationLogic } from './navigationLogic'
+import { globalModalsLogic } from '../GlobalModals'
 
 export function AccessLevelIndicator({ organization }: { organization: OrganizationBasicType }): JSX.Element {
     return (
@@ -44,7 +45,8 @@ export function OtherOrganizationButton({
 }
 
 export function NewOrganizationButton(): JSX.Element {
-    const { closeSitePopover, showCreateOrganizationModal } = useActions(navigationLogic)
+    const { closeSitePopover } = useActions(navigationLogic)
+    const { showCreateOrganizationModal } = useActions(globalModalsLogic)
     const { guardAvailableFeature } = useActions(sceneLogic)
 
     return (
diff --git a/frontend/src/layout/navigation/ProjectNotice.tsx b/frontend/src/layout/navigation/ProjectNotice.tsx
index e4e19d9abddf0b..a6f977ae6fad91 100644
--- a/frontend/src/layout/navigation/ProjectNotice.tsx
+++ b/frontend/src/layout/navigation/ProjectNotice.tsx
@@ -1,7 +1,7 @@
 import { useActions, useValues } from 'kea'
 import { Link } from 'lib/lemon-ui/Link'
 import { navigationLogic, ProjectNoticeVariant } from './navigationLogic'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { IconPlus, IconSettings } from 'lib/lemon-ui/icons'
 import { LemonBannerAction } from 'lib/lemon-ui/LemonBanner/LemonBanner'
@@ -64,7 +64,7 @@ export function ProjectNotice(): JSX.Element | null {
                         ingestion wizard
                     </Link>{' '}
                     or grab your project API key/HTML snippet from{' '}
-                    <Link to="/project/settings" data-attr="real_project_with_no_events-settings">
+                    <Link to={urls.settings()} data-attr="real_project_with_no_events-settings">
                         Project Settings
                     </Link>{' '}
                     to get things moving
diff --git a/frontend/src/layout/navigation/ProjectSwitcher.tsx b/frontend/src/layout/navigation/ProjectSwitcher.tsx
index 092991119972f0..8e8c9d5422e825 100644
--- a/frontend/src/layout/navigation/ProjectSwitcher.tsx
+++ b/frontend/src/layout/navigation/ProjectSwitcher.tsx
@@ -11,6 +11,7 @@ import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
 import { AvailableFeature, TeamBasicType } from '~/types'
 import { navigationLogic } from './navigationLogic'
+import { globalModalsLogic } from '../GlobalModals'
 
 export function ProjectName({ team }: { team: TeamBasicType }): JSX.Element {
     return (
@@ -25,7 +26,8 @@ export function ProjectSwitcherOverlay(): JSX.Element {
     const { currentOrganization, projectCreationForbiddenReason } = useValues(organizationLogic)
     const { currentTeam } = useValues(teamLogic)
     const { guardAvailableFeature } = useActions(sceneLogic)
-    const { showCreateProjectModal, hideProjectSwitcher } = useActions(navigationLogic)
+    const { hideProjectSwitcher } = useActions(navigationLogic)
+    const { showCreateProjectModal } = useActions(globalModalsLogic)
 
     return (
         <div className="project-switcher-container">
@@ -74,7 +76,7 @@ function CurrentProjectButton(): JSX.Element | null {
                 tooltip: `Go to ${currentTeam.name} settings`,
                 onClick: () => {
                     hideProjectSwitcher()
-                    push(urls.projectSettings())
+                    push(urls.settings('project'))
                 },
             }}
             title={`Switch to project ${currentTeam.name}`}
@@ -101,7 +103,7 @@ function OtherProjectButton({ team }: { team: TeamBasicType }): JSX.Element {
                 tooltip: `Go to ${team.name} settings`,
                 onClick: () => {
                     hideProjectSwitcher()
-                    updateCurrentTeam(team.id, '/project/settings')
+                    updateCurrentTeam(team.id, '/settings')
                 },
             }}
             title={`Switch to project ${team.name}`}
diff --git a/frontend/src/layout/navigation/SideBar/PageButton.tsx b/frontend/src/layout/navigation/SideBar/PageButton.tsx
index f76b535ddc74e4..1e8fafeca07de6 100644
--- a/frontend/src/layout/navigation/SideBar/PageButton.tsx
+++ b/frontend/src/layout/navigation/SideBar/PageButton.tsx
@@ -6,6 +6,7 @@ import { Scene } from 'scenes/sceneTypes'
 import { LemonButton, LemonButtonProps, LemonButtonWithSideAction, SideAction } from 'lib/lemon-ui/LemonButton'
 import { sceneConfigurations } from 'scenes/scenes'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
+import { SidebarChangeNoticeTooltip } from '~/layout/navigation/SideBar/SidebarChangeNotice'
 
 export interface PageButtonProps extends Pick<LemonButtonProps, 'icon' | 'onClick' | 'to'> {
     /** Used for highlighting the active scene. `identifier` of type number means dashboard ID instead of scene. */
@@ -32,48 +33,51 @@ export function PageButton({ title, sideAction, identifier, highlight, ...button
 
     return (
         <li>
-            {sideAction ? (
-                <LemonButtonWithSideAction
-                    fullWidth
-                    status={buttonStatus}
-                    active={isActive}
-                    onClick={hideSideBarMobile}
-                    sideAction={{
-                        ...sideAction,
-                        'data-attr': sideAction.identifier
-                            ? `menu-item-${sideAction.identifier.toLowerCase()}`
-                            : undefined,
-                    }}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    {...buttonProps}
-                >
-                    <span className="text-default">{title}</span>
-                </LemonButtonWithSideAction>
-            ) : (
-                <LemonButton
-                    fullWidth
-                    status={buttonStatus}
-                    active={isActive}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    onClick={hideSideBarMobile}
-                    {...buttonProps}
-                >
-                    <span className="text-default grow">{title}</span>
-                    {highlight === 'alpha' ? (
-                        <LemonTag type="completion" className="ml-1 float-right uppercase">
-                            Alpha
-                        </LemonTag>
-                    ) : highlight === 'beta' ? (
-                        <LemonTag type="warning" className="ml-1 float-right uppercase">
-                            Beta
-                        </LemonTag>
-                    ) : highlight === 'new' ? (
-                        <LemonTag type="success" className="ml-1 float-right uppercase">
-                            New
-                        </LemonTag>
-                    ) : null}
-                </LemonButton>
-            )}
+            <SidebarChangeNoticeTooltip identifier={identifier}>
+                {sideAction ? (
+                    <LemonButtonWithSideAction
+                        fullWidth
+                        status={buttonStatus}
+                        active={isActive}
+                        onClick={hideSideBarMobile}
+                        sideAction={{
+                            ...sideAction,
+                            'data-attr': sideAction.identifier
+                                ? `menu-item-${sideAction.identifier.toLowerCase()}`
+                                : undefined,
+                        }}
+                        data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+                        {...buttonProps}
+                    >
+                        <span className="text-default">{title}</span>
+                    </LemonButtonWithSideAction>
+                ) : (
+                    <LemonButton
+                        fullWidth
+                        status={buttonStatus}
+                        active={isActive}
+                        data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+                        onClick={hideSideBarMobile}
+                        sideIcon={null}
+                        {...buttonProps}
+                    >
+                        <span className="text-default grow">{title}</span>
+                        {highlight === 'alpha' ? (
+                            <LemonTag type="completion" className="ml-1 float-right uppercase">
+                                Alpha
+                            </LemonTag>
+                        ) : highlight === 'beta' ? (
+                            <LemonTag type="warning" className="ml-1 float-right uppercase">
+                                Beta
+                            </LemonTag>
+                        ) : highlight === 'new' ? (
+                            <LemonTag type="success" className="ml-1 float-right uppercase">
+                                New
+                            </LemonTag>
+                        ) : null}
+                    </LemonButton>
+                )}
+            </SidebarChangeNoticeTooltip>
         </li>
     )
 }
diff --git a/frontend/src/layout/navigation/SideBar/SideBar.tsx b/frontend/src/layout/navigation/SideBar/SideBar.tsx
index dce2dbf9936acb..6e2309a9a5ca24 100644
--- a/frontend/src/layout/navigation/SideBar/SideBar.tsx
+++ b/frontend/src/layout/navigation/SideBar/SideBar.tsx
@@ -7,7 +7,6 @@ import {
     IconApps,
     IconBarChart,
     IconCohort,
-    IconComment,
     IconDatabase,
     IconExperiment,
     IconFlag,
@@ -15,7 +14,6 @@ import {
     IconLive,
     IconMessages,
     IconOpenInApp,
-    IconPerson,
     IconPinOutline,
     IconPipeline,
     IconPlus,
@@ -39,7 +37,6 @@ import { AvailableFeature } from '~/types'
 import './SideBar.scss'
 import { navigationLogic } from '../navigationLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
-import { groupsModel } from '~/models/groupsModel'
 import { userLogic } from 'scenes/userLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { SideBarApps } from '~/layout/navigation/SideBar/SideBarApps'
@@ -50,17 +47,16 @@ import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { DebugNotice } from 'lib/components/DebugNotice'
-import ActivationSidebar from 'lib/components/ActivationSidebar/ActivationSidebar'
 import { NotebookPopover } from 'scenes/notebooks/NotebookPanel/NotebookPopover'
 import { FlaggedFeature } from 'lib/components/FlaggedFeature'
 import { IconNotebook } from 'scenes/notebooks/IconNotebook'
+import { ActivationSidebar } from 'lib/components/ActivationSidebar/ActivationSidebar'
 
 function Pages(): JSX.Element {
     const { currentOrganization } = useValues(organizationLogic)
     const { hideSideBarMobile, toggleProjectSwitcher, hideProjectSwitcher } = useActions(navigationLogic)
     const { isProjectSwitcherShown } = useValues(navigationLogic)
     const { pinnedDashboards } = useValues(dashboardsModel)
-    const { showGroupsOptions } = useValues(groupsModel)
     const { hasAvailableFeature } = useValues(userLogic)
     const { preflight } = useValues(preflightLogic)
     const { currentTeam } = useValues(teamLogic)
@@ -182,7 +178,7 @@ function Pages(): JSX.Element {
                             icon={<IconWeb />}
                             identifier={Scene.WebAnalytics}
                             to={urls.webAnalytics()}
-                            highlight="alpha"
+                            highlight="beta"
                         />
                     </FlaggedFeature>
                     <PageButton icon={<IconRecording />} identifier={Scene.Replay} to={urls.replay()} />
@@ -222,10 +218,10 @@ function Pages(): JSX.Element {
                         to={urls.eventDefinitions()}
                     />
                     <PageButton
-                        icon={<IconPerson />}
-                        identifier={Scene.Persons}
+                        icon={<IconCohort />}
+                        identifier={Scene.PersonsManagement}
                         to={urls.persons()}
-                        title={`Persons${showGroupsOptions ? ' & Groups' : ''}`}
+                        title="People"
                     />
                     <FlaggedFeature flag={FEATURE_FLAGS.PIPELINE_UI}>
                         <PageButton icon={<IconPipeline />} identifier={Scene.Pipeline} to={urls.pipeline()} />
@@ -239,8 +235,6 @@ function Pages(): JSX.Element {
                             highlight="beta"
                         />
                     </FlaggedFeature>
-                    <PageButton icon={<IconCohort />} identifier={Scene.Cohorts} to={urls.cohorts()} />
-                    <PageButton icon={<IconComment />} identifier={Scene.Annotations} to={urls.annotations()} />
                     {canViewPlugins(currentOrganization) || Object.keys(frontendApps).length > 0 ? (
                         <>
                             <div className="SideBar__heading">Apps</div>
@@ -277,11 +271,7 @@ function Pages(): JSX.Element {
                             },
                         }}
                     />
-                    <PageButton
-                        icon={<IconSettings />}
-                        identifier={Scene.ProjectSettings}
-                        to={urls.projectSettings()}
-                    />
+                    <PageButton icon={<IconSettings />} identifier={Scene.Settings} to={urls.settings('project')} />
                 </>
             )}
         </ul>
diff --git a/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx b/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx
new file mode 100644
index 00000000000000..c95511a491e733
--- /dev/null
+++ b/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx
@@ -0,0 +1,130 @@
+import { LemonButton, LemonDivider, Tooltip, TooltipProps } from '@posthog/lemon-ui'
+import { useValues } from 'kea'
+import { IconClose } from 'lib/lemon-ui/icons'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import posthog from 'posthog-js'
+import React, { Fragment, useState } from 'react'
+import { Scene } from 'scenes/sceneTypes'
+
+export type SidebarChangeNoticeProps = {
+    identifier: string | number
+}
+
+export type SidebarChangeNoticeTooltipProps = SidebarChangeNoticeProps & {
+    children: TooltipProps['children']
+}
+
+/**
+ * Used in combination with a feature flag like:
+ *
+ * sidebar-notice-annotations-2023-10-30
+ * matching:
+ *   properties:
+ *     sidebar_notice/annotations-2023-10-30: doesn't equal true
+ *     joined_at: before 2023-10-30
+ *
+ */
+
+const NOTICES: {
+    identifier: Scene
+    description: React.ReactNode
+    placement: TooltipProps['placement']
+    flagSuffix: string
+}[] = [
+    {
+        identifier: Scene.DataManagement,
+        description: (
+            <>
+                <b>Annotations</b> have moved here!
+                <br />
+                You can now find them in <b>Data Management</b>
+            </>
+        ),
+        placement: 'rightBottom',
+        flagSuffix: 'annotations-2023-10-30',
+    },
+    {
+        identifier: Scene.PersonsManagement,
+        description: (
+            <>
+                <b>Cohorts</b> have moved here!
+                <br />
+                You can now find them in <b>People</b>
+            </>
+        ),
+        placement: 'rightTop',
+        flagSuffix: 'cohorts-2023-10-30',
+    },
+]
+
+export function SidebarChangeNoticeContent({
+    notices,
+    onAcknowledged,
+}: {
+    notices: typeof NOTICES
+    onAcknowledged: () => void
+}): JSX.Element | null {
+    return (
+        <div className="flex items-center gap-1" onClick={onAcknowledged}>
+            <div className="flex-1">
+                {notices.map((notice, i) => (
+                    <Fragment key={i}>
+                        {notice.description}
+                        {i < notices.length - 1 && <LemonDivider />}
+                    </Fragment>
+                ))}
+            </div>
+
+            <LemonButton size="small" onClick={onAcknowledged} icon={<IconClose />} />
+        </div>
+    )
+}
+
+export function useSidebarChangeNotices({ identifier }: SidebarChangeNoticeProps): [typeof NOTICES, () => void] {
+    const { featureFlags } = useValues(featureFlagLogic)
+    const [noticeAcknowledged, setNoticeAcknowledged] = useState(false)
+
+    const notices = NOTICES.filter((notice) => notice.identifier === identifier).filter(
+        (notice) => featureFlags[`sidebar-notice-${notice.flagSuffix}`]
+    )
+
+    const onAcknowledged = (): void => {
+        notices.forEach((change) => {
+            posthog.capture('sidebar notice acknowledged', {
+                change: change.flagSuffix,
+                $set: {
+                    [`sidebar_notice/${change.flagSuffix}`]: true,
+                },
+            })
+            setNoticeAcknowledged(true)
+        })
+    }
+
+    return [!noticeAcknowledged ? notices : [], onAcknowledged]
+}
+
+export function SidebarChangeNoticeTooltip({ identifier, children }: SidebarChangeNoticeTooltipProps): JSX.Element {
+    const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
+
+    if (!notices.length) {
+        return <>{children}</>
+    }
+
+    return (
+        <Tooltip
+            visible
+            placement={notices[0].placement}
+            delayMs={0}
+            title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
+        >
+            {React.cloneElement(children as React.ReactElement, {
+                onClick: () => {
+                    onAcknowledged()
+                    if (React.isValidElement(children)) {
+                        children.props.onClick?.()
+                    }
+                },
+            })}
+        </Tooltip>
+    )
+}
diff --git a/frontend/src/layout/navigation/TopBar/SitePopover.tsx b/frontend/src/layout/navigation/TopBar/SitePopover.tsx
index c59fb8b443ec51..9d8269df080b1b 100644
--- a/frontend/src/layout/navigation/TopBar/SitePopover.tsx
+++ b/frontend/src/layout/navigation/TopBar/SitePopover.tsx
@@ -29,7 +29,7 @@ import {
     NewOrganizationButton,
     OtherOrganizationButton,
 } from '~/layout/navigation/OrganizationSwitcher'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { LemonButtonPropsBase } from '@posthog/lemon-ui'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -63,7 +63,7 @@ function AccountInfo(): JSX.Element {
             </div>
             <Tooltip title="Account settings" placement="left">
                 <LemonButton
-                    to={urls.mySettings()}
+                    to={urls.settings('user')}
                     onClick={closeSitePopover}
                     data-attr="top-menu-item-me"
                     status="stealth"
@@ -85,7 +85,7 @@ function CurrentOrganization({ organization }: { organization: OrganizationBasic
                 sideIcon={<IconSettings />}
                 status="stealth"
                 fullWidth
-                to={urls.organizationSettings()}
+                to={urls.settings('organization')}
                 onClick={closeSitePopover}
             >
                 <div className="SitePopover__main-info SitePopover__organization">
diff --git a/frontend/src/layout/navigation/TopBar/TopBar.tsx b/frontend/src/layout/navigation/TopBar/TopBar.tsx
index b81bbed16648e6..c769d91869ba10 100644
--- a/frontend/src/layout/navigation/TopBar/TopBar.tsx
+++ b/frontend/src/layout/navigation/TopBar/TopBar.tsx
@@ -5,35 +5,21 @@ import { Announcement } from './Announcement'
 import { navigationLogic } from '../navigationLogic'
 import { HelpButton } from 'lib/components/HelpButton/HelpButton'
 import { CommandPalette } from 'lib/components/CommandPalette'
-import { CreateOrganizationModal } from 'scenes/organization/CreateOrganizationModal'
-import { InviteModal } from 'scenes/organization/Settings/InviteModal'
 import { Link } from 'lib/lemon-ui/Link'
 import { IconMenu, IconMenuOpen } from 'lib/lemon-ui/icons'
-import { CreateProjectModal } from 'scenes/project/CreateProjectModal'
 import './TopBar.scss'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
 import { UniversalSearchPopover } from 'lib/components/UniversalSearch/UniversalSearchPopover'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { groupsModel } from '~/models/groupsModel'
 import { NotificationBell } from '~/layout/navigation/TopBar/NotificationBell'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
-import ActivationSidebarToggle from 'lib/components/ActivationSidebar/ActivationSidebarToggle'
 import { NotebookButton } from '~/layout/navigation/TopBar/NotebookButton'
+import { ActivationSidebarToggle } from 'lib/components/ActivationSidebar/ActivationSidebarToggle'
 
 export function TopBar(): JSX.Element {
-    const {
-        isSideBarShown,
-        noSidebar,
-        minimalTopBar,
-        mobileLayout,
-        isCreateOrganizationModalShown,
-        isCreateProjectModalShown,
-    } = useValues(navigationLogic)
-    const { toggleSideBarBase, toggleSideBarMobile, hideCreateOrganizationModal, hideCreateProjectModal } =
-        useActions(navigationLogic)
-    const { isInviteModalShown } = useValues(inviteLogic)
-    const { hideInviteModal } = useActions(inviteLogic)
+    const { isSideBarShown, noSidebar, minimalTopBar, mobileLayout } = useValues(navigationLogic)
+    const { toggleSideBarBase, toggleSideBarMobile } = useActions(navigationLogic)
     const { groupNamesTaxonomicTypes } = useValues(groupsModel)
     const { featureFlags } = useValues(featureFlagLogic)
 
@@ -96,9 +82,6 @@ export function TopBar(): JSX.Element {
                 </div>
             </header>
             <CommandPalette />
-            <InviteModal isOpen={isInviteModalShown} onClose={hideInviteModal} />
-            <CreateOrganizationModal isVisible={isCreateOrganizationModalShown} onClose={hideCreateOrganizationModal} />
-            <CreateProjectModal isVisible={isCreateProjectModalShown} onClose={hideCreateProjectModal} />
         </>
     )
 }
diff --git a/frontend/src/layout/navigation/navigationLogic.ts b/frontend/src/layout/navigation/navigationLogic.ts
index 5fa4fa296b86e9..2814fbb936b8e4 100644
--- a/frontend/src/layout/navigation/navigationLogic.ts
+++ b/frontend/src/layout/navigation/navigationLogic.ts
@@ -8,7 +8,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
 import type { navigationLogicType } from './navigationLogicType'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { Scene } from 'scenes/sceneTypes'
 
@@ -35,10 +35,6 @@ export const navigationLogic = kea<navigationLogicType>([
         openSitePopover: true,
         closeSitePopover: true,
         toggleSitePopover: true,
-        showCreateOrganizationModal: true,
-        hideCreateOrganizationModal: true,
-        showCreateProjectModal: true,
-        hideCreateProjectModal: true,
         toggleProjectSwitcher: true,
         hideProjectSwitcher: true,
         openAppSourceEditor: (id: number, pluginId: number) => ({ id, pluginId }),
@@ -95,20 +91,6 @@ export const navigationLogic = kea<navigationLogicType>([
                 toggleSitePopover: (state) => !state,
             },
         ],
-        isCreateOrganizationModalShown: [
-            false,
-            {
-                showCreateOrganizationModal: () => true,
-                hideCreateOrganizationModal: () => false,
-            },
-        ],
-        isCreateProjectModalShown: [
-            false,
-            {
-                showCreateProjectModal: () => true,
-                hideCreateProjectModal: () => false,
-            },
-        ],
         isProjectSwitcherShown: [
             false,
             {
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 63e4d08fd2d8f3..805c8c3262ca5a 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -19,6 +19,8 @@ import {
     ExportedAssetType,
     FeatureFlagAssociatedRoleType,
     FeatureFlagType,
+    OrganizationFeatureFlags,
+    OrganizationFeatureFlagsCopyBody,
     InsightModel,
     IntegrationType,
     MediaUploadResponse,
@@ -178,6 +180,20 @@ class ApiRequest {
         return this.organizationResourceAccess().addPathComponent(id)
     }
 
+    public organizationFeatureFlags(orgId: OrganizationType['id'], featureFlagKey: FeatureFlagType['key']): ApiRequest {
+        return this.organizations()
+            .addPathComponent(orgId)
+            .addPathComponent('feature_flags')
+            .addPathComponent(featureFlagKey)
+    }
+
+    public copyOrganizationFeatureFlags(orgId: OrganizationType['id']): ApiRequest {
+        return this.organizations()
+            .addPathComponent(orgId)
+            .addPathComponent('feature_flags')
+            .addPathComponent('copy_flags')
+    }
+
     // # Projects
     public projects(): ApiRequest {
         return this.addPathComponent('projects')
@@ -674,6 +690,21 @@ const api = {
         },
     },
 
+    organizationFeatureFlags: {
+        async get(
+            orgId: OrganizationType['id'] = getCurrentOrganizationId(),
+            featureFlagKey: FeatureFlagType['key']
+        ): Promise<OrganizationFeatureFlags> {
+            return await new ApiRequest().organizationFeatureFlags(orgId, featureFlagKey).get()
+        },
+        async copy(
+            orgId: OrganizationType['id'] = getCurrentOrganizationId(),
+            data: OrganizationFeatureFlagsCopyBody
+        ): Promise<{ success: FeatureFlagType[]; failed: any }> {
+            return await new ApiRequest().copyOrganizationFeatureFlags(orgId).create({ data })
+        },
+    },
+
     actions: {
         async get(actionId: ActionType['id']): Promise<ActionType> {
             return await new ApiRequest().actionsDetail(actionId).get()
diff --git a/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx b/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx
index 7dec0282897dda..2e66f6e854a5ad 100644
--- a/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx
+++ b/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx
@@ -6,11 +6,18 @@ import { activationLogic, ActivationTaskType } from './activationLogic'
 import './ActivationSidebar.scss'
 import { Progress } from 'antd'
 import { IconCheckmark, IconClose } from 'lib/lemon-ui/icons'
-import { SessionRecording as SessionRecordingConfig } from 'scenes/project/Settings/SessionRecording'
 import { ProfessorHog } from '../hedgehogs'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 
-const Task = ({ id, name, description, completed, canSkip, skipped, url }: ActivationTaskType): JSX.Element => {
+export const ActivationTask = ({
+    id,
+    name,
+    description,
+    completed,
+    canSkip,
+    skipped,
+    url,
+}: ActivationTaskType): JSX.Element => {
     const displaySideAction = !completed && !skipped && canSkip
     const { runTask, skipTask } = useActions(activationLogic)
     const { reportActivationSideBarTaskClicked } = useActions(eventUsageLogic)
@@ -60,75 +67,57 @@ const Task = ({ id, name, description, completed, canSkip, skipped, url }: Activ
     )
 }
 
-const ActivationSidebar = (): JSX.Element => {
+export const ActivationSidebar = (): JSX.Element => {
     const { isActivationSideBarShown } = useValues(navigationLogic)
     const { hideActivationSideBar } = useActions(navigationLogic)
-    const { activeTasks, completedTasks, completionPercent, showSessionRecordingConfig } = useValues(activationLogic)
-    const { setShowSessionRecordingConfig } = useActions(activationLogic)
+    const { activeTasks, completedTasks, completionPercent } = useValues(activationLogic)
 
     return (
         <div className={clsx('ActivationSideBar', !isActivationSideBarShown && 'ActivationSideBar--hidden')}>
             <div className="ActivationSideBar__content pt-2 px-4 pb-16">
                 <div className="ActivationSideBar__close_button">
-                    <LemonButton
-                        icon={<IconClose />}
-                        onClick={() => {
-                            if (showSessionRecordingConfig) {
-                                setShowSessionRecordingConfig(false)
-                            } else {
-                                hideActivationSideBar()
-                            }
-                        }}
-                    />
+                    <LemonButton icon={<IconClose />} onClick={() => hideActivationSideBar()} />
                 </div>
-                {showSessionRecordingConfig ? (
-                    <SessionRecordingConfig />
-                ) : (
-                    <>
-                        <h2 className="subtitle">Quick Start</h2>
-                        <p>
-                            Use our Quick Start guide to learn about everything PostHog can do for you and your product.
-                        </p>
-                        <div className="my-4 flex items-center justify-center">
-                            <div className="flex flex-col items-center">
-                                <Progress
-                                    type="circle"
-                                    strokeWidth={10}
-                                    percent={completionPercent}
-                                    format={() => activeTasks.length}
-                                    strokeColor="#345cff" // primary-light
-                                />
-                                <p className="text-muted mt-2">still to go</p>
-                            </div>
-                            <div className="ActivationSideBar__hog">
-                                <ProfessorHog className="max-h-full w-auto object-contain" />
-                            </div>
+                <>
+                    <h2 className="subtitle">Quick Start</h2>
+                    <p>Use our Quick Start guide to learn about everything PostHog can do for you and your product.</p>
+                    <div className="my-4 flex items-center justify-center">
+                        <div className="flex flex-col items-center">
+                            <Progress
+                                type="circle"
+                                strokeWidth={10}
+                                percent={completionPercent}
+                                format={() => activeTasks.length}
+                                strokeColor="#345cff" // primary-light
+                            />
+                            <p className="text-muted mt-2">still to go</p>
                         </div>
-                        {activeTasks.length > 0 && (
-                            <div className="mt-4">
-                                <div className="text-muted uppercase text-xs">What's next?</div>
-                                <ul>
-                                    {activeTasks.map((task: ActivationTaskType) => (
-                                        <Task key={task.id} {...task} />
-                                    ))}
-                                </ul>
-                            </div>
-                        )}
-                        {completedTasks.length > 0 && (
-                            <div className="mt-4">
-                                <div className="text-muted uppercase text-xs">Completed</div>
-                                <ul>
-                                    {completedTasks.map((task: ActivationTaskType) => (
-                                        <Task key={task.id} {...task} />
-                                    ))}
-                                </ul>
-                            </div>
-                        )}
-                    </>
-                )}
+                        <div className="ActivationSideBar__hog">
+                            <ProfessorHog className="max-h-full w-auto object-contain" />
+                        </div>
+                    </div>
+                    {activeTasks.length > 0 && (
+                        <div className="mt-4">
+                            <div className="text-muted uppercase text-xs">What's next?</div>
+                            <ul>
+                                {activeTasks.map((task: ActivationTaskType) => (
+                                    <ActivationTask key={task.id} {...task} />
+                                ))}
+                            </ul>
+                        </div>
+                    )}
+                    {completedTasks.length > 0 && (
+                        <div className="mt-4">
+                            <div className="text-muted uppercase text-xs">Completed</div>
+                            <ul>
+                                {completedTasks.map((task: ActivationTaskType) => (
+                                    <ActivationTask key={task.id} {...task} />
+                                ))}
+                            </ul>
+                        </div>
+                    )}
+                </>
             </div>
         </div>
     )
 }
-
-export default ActivationSidebar
diff --git a/frontend/src/lib/components/ActivationSidebar/ActivationSidebarToggle.tsx b/frontend/src/lib/components/ActivationSidebar/ActivationSidebarToggle.tsx
index 8c22b7f734d5d8..f123a002471354 100644
--- a/frontend/src/lib/components/ActivationSidebar/ActivationSidebarToggle.tsx
+++ b/frontend/src/lib/components/ActivationSidebar/ActivationSidebarToggle.tsx
@@ -4,10 +4,11 @@ import { navigationLogic } from '~/layout/navigation/navigationLogic'
 import { Progress } from 'antd'
 import { activationLogic } from './activationLogic'
 
-const ActivationSidebarToggle = (): JSX.Element | null => {
+export const ActivationSidebarToggle = (): JSX.Element | null => {
     const { mobileLayout } = useValues(navigationLogic)
     const { toggleActivationSideBar } = useActions(navigationLogic)
     const { activeTasks, completionPercent, isReady, hasCompletedAllTasks } = useValues(activationLogic)
+
     if (!isReady || hasCompletedAllTasks) {
         return null
     }
@@ -37,5 +38,3 @@ const ActivationSidebarToggle = (): JSX.Element | null => {
         </LemonButton>
     )
 }
-
-export default ActivationSidebarToggle
diff --git a/frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts b/frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts
index 827d5eb5c3643c..064e9d442b6076 100644
--- a/frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts
+++ b/frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts
@@ -1,6 +1,6 @@
 import { expectLogic } from 'kea-test-utils'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { navigationLogic } from '~/layout/navigation/navigationLogic'
diff --git a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts b/frontend/src/lib/components/ActivationSidebar/activationLogic.ts
index 71df41f6c1305b..b2579b889df9e2 100644
--- a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts
+++ b/frontend/src/lib/components/ActivationSidebar/activationLogic.ts
@@ -3,8 +3,8 @@ import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import api from 'lib/api'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { navigationLogic } from '~/layout/navigation/navigationLogic'
@@ -13,6 +13,7 @@ import type { activationLogicType } from './activationLogicType'
 import { urls } from 'scenes/urls'
 import { savedInsightsLogic } from 'scenes/saved-insights/savedInsightsLogic'
 import { dashboardsModel } from '~/models/dashboardsModel'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 export enum ActivationTasks {
     IngestFirstEvent = 'ingest_first_event',
@@ -77,7 +78,6 @@ export const activationLogic = kea<activationLogicType>([
         runTask: (id: string) => ({ id }),
         skipTask: (id: string) => ({ id }),
         addSkippedTask: (teamId: TeamBasicType['id'], taskId: string) => ({ teamId, taskId }),
-        setShowSessionRecordingConfig: (value: boolean) => ({ value }),
     }),
     reducers(() => ({
         skippedTasks: [
@@ -89,12 +89,6 @@ export const activationLogic = kea<activationLogicType>([
                 },
             },
         ],
-        showSessionRecordingConfig: [
-            false,
-            {
-                setShowSessionRecordingConfig: (_, { value }) => value,
-            },
-        ],
         areMembersLoaded: [
             false,
             {
@@ -143,7 +137,7 @@ export const activationLogic = kea<activationLogicType>([
             0,
             {
                 loadCustomEvents: async (_, breakpoint) => {
-                    breakpoint(200)
+                    await breakpoint(200)
                     const url = api.eventDefinitions.determineListEndpoint({
                         event_type: EventDefinitionType.EventCustom,
                     })
@@ -345,7 +339,7 @@ export const activationLogic = kea<activationLogicType>([
                     router.actions.push(urls.dashboards())
                     break
                 case ActivationTasks.SetupSessionRecordings:
-                    actions.setShowSessionRecordingConfig(true)
+                    router.actions.push(urls.replay())
                     break
                 case ActivationTasks.InstallFirstApp:
                     router.actions.push(urls.projectApps())
@@ -359,9 +353,6 @@ export const activationLogic = kea<activationLogicType>([
                 actions.addSkippedTask(values.currentTeam.id, id)
             }
         },
-        toggleActivationSideBar: async () => {
-            actions.setShowSessionRecordingConfig(false)
-        },
         showActivationSideBar: async () => {
             actions.reportActivationSideBarShown(
                 values.activeTasks.length,
@@ -385,4 +376,5 @@ export const activationLogic = kea<activationLogicType>([
             }
         },
     })),
+    permanentlyMount(),
 ])
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss b/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
index b42ba8047e90dd..8176646fac6e32 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
@@ -127,6 +127,7 @@
 
 .SeriesDisplay__raw-name {
     display: inline-flex;
+    align-items: center;
     padding: 0.125rem 0.25rem;
     margin: 0 0.25rem;
     background: var(--primary-bg-hover);
@@ -135,12 +136,12 @@
     font-size: 0.6875rem;
     font-weight: 600;
     line-height: 1rem;
-    vertical-align: -0.3em;
     &.SeriesDisplay__raw-name--action,
     &.SeriesDisplay__raw-name--event {
         padding: 0.25rem;
         &::before {
             display: inline-block;
+            flex-shrink: 0;
             text-align: center;
             width: 1rem;
             border-radius: 0.25rem;
@@ -169,5 +170,4 @@
     margin-right: 0.25rem;
     color: var(--border-bold);
     font-size: 1.25rem;
-    vertical-align: middle;
 }
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightCard.stories.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightCard.stories.tsx
index ea7eeaa423f79a..15224b0c3d747d 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightCard.stories.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightCard.stories.tsx
@@ -3,21 +3,23 @@ import { useState } from 'react'
 import { ChartDisplayType, InsightColor, InsightModel, InsightShortId, TrendsFilterType } from '~/types'
 import { InsightCard as InsightCardComponent } from './index'
 
-import EXAMPLE_TRENDS from '../../../../mocks/fixtures/api/projects/:team_id/insights/trendsLine.json'
-import EXAMPLE_TRENDS_HORIZONTAL_BAR from '../../../../mocks/fixtures/api/projects/:team_id/insights/trendsValue.json'
-import EXAMPLE_TRENDS_TABLE from '../../../../mocks/fixtures/api/projects/:team_id/insights/trendsTable.json'
-import EXAMPLE_TRENDS_PIE from '../../../../mocks/fixtures/api/projects/:team_id/insights/trendsPie.json'
-import EXAMPLE_TRENDS_WORLD_MAP from '../../../../mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json'
-import EXAMPLE_FUNNEL from '../../../../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json'
-import EXAMPLE_RETENTION from '../../../../mocks/fixtures/api/projects/:team_id/insights/retention.json'
-import EXAMPLE_PATHS from '../../../../mocks/fixtures/api/projects/:team_id/insights/userPaths.json'
-import EXAMPLE_STICKINESS from '../../../../mocks/fixtures/api/projects/:team_id/insights/stickiness.json'
-import EXAMPLE_LIFECYCLE from '../../../../mocks/fixtures/api/projects/:team_id/insights/lifecycle.json'
-import EXAMPLE_DATA_TABLE_NODE_HOGQL_QUERY from '../../../../mocks/fixtures/api/projects/:team_id/insights/dataTableHogQL.json'
-import EXAMPLE_DATA_TABLE_NODE_EVENTS_QUERY from '../../../../mocks/fixtures/api/projects/:team_id/insights/dataTableEvents.json'
+import EXAMPLE_TRENDS from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsLine.json'
+import EXAMPLE_TRENDS_MULTI from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'
+import EXAMPLE_TRENDS_HORIZONTAL_BAR from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsValue.json'
+import EXAMPLE_TRENDS_TABLE from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsTable.json'
+import EXAMPLE_TRENDS_PIE from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsPie.json'
+import EXAMPLE_TRENDS_WORLD_MAP from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json'
+import EXAMPLE_FUNNEL from '../../../../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json'
+import EXAMPLE_RETENTION from '../../../../mocks/fixtures/api/projects/team_id/insights/retention.json'
+import EXAMPLE_PATHS from '../../../../mocks/fixtures/api/projects/team_id/insights/userPaths.json'
+import EXAMPLE_STICKINESS from '../../../../mocks/fixtures/api/projects/team_id/insights/stickiness.json'
+import EXAMPLE_LIFECYCLE from '../../../../mocks/fixtures/api/projects/team_id/insights/lifecycle.json'
+import EXAMPLE_DATA_TABLE_NODE_HOGQL_QUERY from '../../../../mocks/fixtures/api/projects/team_id/insights/dataTableHogQL.json'
+import EXAMPLE_DATA_TABLE_NODE_EVENTS_QUERY from '../../../../mocks/fixtures/api/projects/team_id/insights/dataTableEvents.json'
 
 const examples = [
     EXAMPLE_TRENDS,
+    EXAMPLE_TRENDS_MULTI,
     EXAMPLE_TRENDS_HORIZONTAL_BAR,
     EXAMPLE_TRENDS_TABLE,
     EXAMPLE_TRENDS_PIE,
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
index fd45ba5fed66dc..73d5b42ac3841e 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
@@ -18,6 +18,7 @@ import { mathsLogic } from 'scenes/trends/mathsLogic'
 import { ExportButton } from 'lib/components/ExportButton/ExportButton'
 import { CardMeta } from 'lib/components/Cards/CardMeta'
 import { DashboardPrivilegeLevel } from 'lib/constants'
+// eslint-disable-next-line no-restricted-imports
 import { PieChartFilled } from '@ant-design/icons'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { TopHeading } from 'lib/components/Cards/InsightCard/TopHeading'
diff --git a/frontend/src/lib/components/CloseButton.tsx b/frontend/src/lib/components/CloseButton.tsx
index c75a598bd5dcde..abd6ca7d2ef777 100644
--- a/frontend/src/lib/components/CloseButton.tsx
+++ b/frontend/src/lib/components/CloseButton.tsx
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { CloseOutlined } from '@ant-design/icons'
 
 // TODO: Remove, but de-ant PropertyFilterButton and SelectGradientOverflow first
diff --git a/frontend/src/lib/components/CommandPalette/commandPaletteLogic.tsx b/frontend/src/lib/components/CommandPalette/commandPaletteLogic.tsx
index a29dca16342aec..d601677ab3ce45 100644
--- a/frontend/src/lib/components/CommandPalette/commandPaletteLogic.tsx
+++ b/frontend/src/lib/components/CommandPalette/commandPaletteLogic.tsx
@@ -8,7 +8,7 @@ import { DashboardType, InsightType } from '~/types'
 import api from 'lib/api'
 import { copyToClipboard, isMobile, isURL, sample, uniqueBy } from 'lib/utils'
 import { userLogic } from 'scenes/userLogic'
-import { personalAPIKeysLogic } from '../PersonalAPIKeys/personalAPIKeysLogic'
+import { personalAPIKeysLogic } from '../../../scenes/settings/user/personalAPIKeysLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import posthog from 'posthog-js'
 import { debugCHQueries } from './DebugCHQueries'
@@ -494,7 +494,7 @@ export const commandPaletteLogic = kea<commandPaletteLogicType>([
                         display: 'Go to Team members',
                         synonyms: ['organization', 'members', 'invites', 'teammates'],
                         executor: () => {
-                            push(urls.organizationSettings())
+                            push(urls.settings('organization'))
                         },
                     },
                     {
@@ -508,7 +508,7 @@ export const commandPaletteLogic = kea<commandPaletteLogicType>([
                         icon: IconSettings,
                         display: 'Go to Project settings',
                         executor: () => {
-                            push(urls.projectSettings())
+                            push(urls.settings('project'))
                         },
                     },
                     {
@@ -518,7 +518,7 @@ export const commandPaletteLogic = kea<commandPaletteLogicType>([
                         display: 'Go to My settings',
                         synonyms: ['account'],
                         executor: () => {
-                            push(urls.mySettings())
+                            push(urls.settings('user'))
                         },
                     },
                     {
@@ -658,7 +658,7 @@ export const commandPaletteLogic = kea<commandPaletteLogicType>([
                                     display: `Create Key "${argument}"`,
                                     executor: () => {
                                         personalAPIKeysLogic.actions.createKey(argument)
-                                        push(urls.mySettings(), {}, 'personal-api-keys')
+                                        push(urls.settings('user'), {}, 'personal-api-keys')
                                     },
                                 }
                             }
diff --git a/frontend/src/lib/components/DefinitionPopover/DefinitionPopover.tsx b/frontend/src/lib/components/DefinitionPopover/DefinitionPopover.tsx
index 559bd573735e48..65a7711d3b635b 100644
--- a/frontend/src/lib/components/DefinitionPopover/DefinitionPopover.tsx
+++ b/frontend/src/lib/components/DefinitionPopover/DefinitionPopover.tsx
@@ -8,7 +8,7 @@ import { KeyMapping, UserBasicType, PropertyDefinition } from '~/types'
 import { Owner } from 'scenes/events/Owner'
 import { dayjs } from 'lib/dayjs'
 import { Divider, DividerProps, Select } from 'antd'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { Link } from 'lib/lemon-ui/Link'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
diff --git a/frontend/src/lib/components/InsightLabel/index.tsx b/frontend/src/lib/components/InsightLabel/index.tsx
index 0969e8ca353d8d..2f11144d7c2cf1 100644
--- a/frontend/src/lib/components/InsightLabel/index.tsx
+++ b/frontend/src/lib/components/InsightLabel/index.tsx
@@ -1,4 +1,3 @@
-import { Tag } from 'antd'
 import { ActionFilter, BreakdownKeyType } from '~/types'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
 import { capitalizeFirstLetter, hexToRGBA, midEllipsis } from 'lib/utils'
@@ -10,6 +9,7 @@ import { mathsLogic } from 'scenes/trends/mathsLogic'
 import clsx from 'clsx'
 import { groupsModel } from '~/models/groupsModel'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { LemonTag } from '@posthog/lemon-ui'
 
 export enum IconSize {
     Small = 'small',
@@ -54,18 +54,18 @@ function MathTag({ math, mathProperty, mathHogQL, mathGroupTypeIndex }: MathTagP
     const { aggregationLabel } = useValues(groupsModel)
 
     if (!math || math === 'total') {
-        return <Tag>Total</Tag>
+        return <LemonTag>Total</LemonTag>
     }
     if (math === 'dau') {
-        return <Tag>Unique</Tag>
+        return <LemonTag>Unique</LemonTag>
     }
     if (math === 'unique_group' && mathGroupTypeIndex != undefined) {
-        return <Tag>Unique {aggregationLabel(mathGroupTypeIndex).plural}</Tag>
+        return <LemonTag>Unique {aggregationLabel(mathGroupTypeIndex).plural}</LemonTag>
     }
     if (math && ['sum', 'avg', 'min', 'max', 'median', 'p90', 'p95', 'p99'].includes(math || '')) {
         return (
             <>
-                <Tag>{mathDefinitions[math]?.name || capitalizeFirstLetter(math)}</Tag>
+                <LemonTag>{mathDefinitions[math]?.name || capitalizeFirstLetter(math)}</LemonTag>
                 {mathProperty && (
                     <>
                         <span>of</span>
@@ -76,13 +76,9 @@ function MathTag({ math, mathProperty, mathHogQL, mathGroupTypeIndex }: MathTagP
         )
     }
     if (math === 'hogql') {
-        return (
-            <Tag title={String(mathHogQL)} className="max-w-60 text-ellipsis overflow-hidden">
-                {String(mathHogQL)}
-            </Tag>
-        )
+        return <LemonTag className="max-w-60 text-ellipsis overflow-hidden">{String(mathHogQL) || 'HogQL'}</LemonTag>
     }
-    return <Tag>{capitalizeFirstLetter(math)}</Tag>
+    return <LemonTag>{capitalizeFirstLetter(math)}</LemonTag>
 }
 
 export function InsightLabel({
@@ -171,12 +167,12 @@ export function InsightLabel({
                         <div className="flex flex-wrap gap-1">
                             {pillValues.map((pill) => (
                                 <Tooltip title={pill} key={pill}>
-                                    <Tag className="tag-pill" closable={false}>
+                                    <LemonTag className="tag-pill">
                                         {/* eslint-disable-next-line react/forbid-dom-props */}
                                         <span className="truncate" style={{ maxWidth: pillMaxWidth }}>
                                             {pillMidEllipsis ? midEllipsis(String(pill), 50) : pill}
                                         </span>
-                                    </Tag>
+                                    </LemonTag>
                                 </Tooltip>
                             ))}
                         </div>
diff --git a/frontend/src/lib/components/IntervalFilter/intervalFilterLogic.ts b/frontend/src/lib/components/IntervalFilter/intervalFilterLogic.ts
new file mode 100644
index 00000000000000..d2136d8d8a682a
--- /dev/null
+++ b/frontend/src/lib/components/IntervalFilter/intervalFilterLogic.ts
@@ -0,0 +1,144 @@
+import { kea, props, key, path, connect, actions, reducers, listeners } from 'kea'
+import { objectsEqual, dateMapping } from 'lib/utils'
+import type { intervalFilterLogicType } from './intervalFilterLogicType'
+import { IntervalKeyType, Intervals, intervals } from 'lib/components/IntervalFilter/intervals'
+import { BaseMathType, InsightLogicProps, IntervalType } from '~/types'
+import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
+import { dayjs } from 'lib/dayjs'
+import { InsightQueryNode, TrendsQuery } from '~/queries/schema'
+import { lemonToast } from 'lib/lemon-ui/lemonToast'
+import { BASE_MATH_DEFINITIONS } from 'scenes/trends/mathsLogic'
+import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
+
+export const intervalFilterLogic = kea<intervalFilterLogicType>([
+    props({} as InsightLogicProps),
+    key(keyForInsightLogicProps('new')),
+    path((key) => ['lib', 'components', 'IntervalFilter', 'intervalFilterLogic', key]),
+    connect((props: InsightLogicProps) => ({
+        actions: [insightVizDataLogic(props), ['updateQuerySource']],
+        values: [insightVizDataLogic(props), ['interval', 'querySource']],
+    })),
+    actions(() => ({
+        setInterval: (interval: IntervalKeyType) => ({ interval }),
+        setEnabledIntervals: (enabledIntervals: Intervals) => ({ enabledIntervals }),
+    })),
+    reducers(() => ({
+        enabledIntervals: [
+            { ...intervals } as Intervals,
+            {
+                setEnabledIntervals: (_, { enabledIntervals }) => enabledIntervals,
+            },
+        ],
+    })),
+    listeners(({ values, actions, selectors }) => ({
+        setInterval: ({ interval }) => {
+            if (values.interval !== interval) {
+                actions.updateQuerySource({ interval } as Partial<InsightQueryNode>)
+            }
+        },
+        updateQuerySource: ({ querySource }, _, __, previousState) => {
+            const { date_from, date_to } = querySource.dateRange || {}
+            const previousDateRange = selectors.querySource(previousState)?.dateRange || {}
+
+            let activeUsersMath: BaseMathType.WeeklyActiveUsers | BaseMathType.MonthlyActiveUsers | null = null
+
+            // We disallow grouping by certain intervals for weekly active users and monthly active users views
+            // e.g. WAUs grouped by month. Here, look for the first event/action running WAUs/MAUs math and
+            // pass that down to the interval filter to determine what groupings are allowed.
+            for (const series of (values.querySource as TrendsQuery)?.series || []) {
+                if (series.math === BaseMathType.WeeklyActiveUsers) {
+                    activeUsersMath = BaseMathType.WeeklyActiveUsers
+                    break
+                }
+
+                if (series.math === BaseMathType.MonthlyActiveUsers) {
+                    activeUsersMath = BaseMathType.MonthlyActiveUsers
+                    break
+                }
+            }
+
+            const enabledIntervals: Intervals = { ...intervals }
+
+            if (activeUsersMath) {
+                // Disallow grouping by hour for WAUs/MAUs as it's an expensive query that produces a view that's not useful for users
+                enabledIntervals.hour = {
+                    ...enabledIntervals.hour,
+                    disabledReason:
+                        'Grouping by hour is not supported on insights with weekly or monthly active users series.',
+                }
+
+                // Disallow grouping by month for WAUs as the resulting view is misleading to users
+                if (activeUsersMath === BaseMathType.WeeklyActiveUsers) {
+                    enabledIntervals.month = {
+                        ...enabledIntervals.month,
+                        disabledReason:
+                            'Grouping by month is not supported on insights with weekly active users series.',
+                    }
+                }
+            }
+
+            actions.setEnabledIntervals(enabledIntervals)
+
+            // If the user just flipped an event action to use WAUs/MAUs math and their
+            // current interval is unsupported by the math type, switch their interval
+            // to an appropriate allowed interval and inform them of the change via a toast
+            if (
+                activeUsersMath &&
+                (values.querySource as TrendsQuery)?.interval &&
+                enabledIntervals[(values.querySource as TrendsQuery).interval as IntervalType].disabledReason
+            ) {
+                if (values.interval === 'hour') {
+                    lemonToast.info(
+                        `Switched to grouping by day, because "${BASE_MATH_DEFINITIONS[activeUsersMath].name}" does not support grouping by ${values.interval}.`
+                    )
+                    actions.updateQuerySource({ interval: 'day' } as Partial<InsightQueryNode>)
+                } else {
+                    lemonToast.info(
+                        `Switched to grouping by week, because "${BASE_MATH_DEFINITIONS[activeUsersMath].name}" does not support grouping by ${values.interval}.`
+                    )
+                    actions.updateQuerySource({ interval: 'week' } as Partial<InsightQueryNode>)
+                }
+                return
+            }
+
+            if (
+                !date_from ||
+                (objectsEqual(date_from, previousDateRange.date_from) &&
+                    objectsEqual(date_to, previousDateRange.date_to))
+            ) {
+                return
+            }
+
+            // automatically set an interval for fixed date ranges
+            if (
+                date_from &&
+                date_to &&
+                dayjs(querySource.dateRange?.date_from).isValid() &&
+                dayjs(querySource.dateRange?.date_to).isValid()
+            ) {
+                if (dayjs(date_to).diff(dayjs(date_from), 'day') <= 3) {
+                    actions.updateQuerySource({ interval: 'hour' } as Partial<InsightQueryNode>)
+                } else if (dayjs(date_to).diff(dayjs(date_from), 'month') <= 3) {
+                    actions.updateQuerySource({ interval: 'day' } as Partial<InsightQueryNode>)
+                } else {
+                    actions.updateQuerySource({ interval: 'month' } as Partial<InsightQueryNode>)
+                }
+                return
+            }
+            // get a defaultInterval for dateOptions that have a default value
+            let interval: IntervalType = 'day'
+            for (const { key, values, defaultInterval } of dateMapping) {
+                if (
+                    values[0] === date_from &&
+                    values[1] === (date_to || undefined) &&
+                    key !== 'Custom' &&
+                    defaultInterval
+                ) {
+                    interval = defaultInterval
+                    break
+                }
+            }
+            actions.updateQuerySource({ interval } as Partial<InsightQueryNode>)
+        },
+    })),
+])
diff --git a/frontend/src/lib/components/JSBookmarklet.tsx b/frontend/src/lib/components/JSBookmarklet.tsx
index 6202320a403f89..54d87d84cc9af6 100644
--- a/frontend/src/lib/components/JSBookmarklet.tsx
+++ b/frontend/src/lib/components/JSBookmarklet.tsx
@@ -2,6 +2,7 @@ import { TeamBasicType } from '~/types'
 import { useActions } from 'kea'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { IconBookmarkBorder } from 'lib/lemon-ui/icons'
+import { useEffect, useRef } from 'react'
 
 export function JSBookmarklet({ team }: { team: TeamBasicType }): JSX.Element {
     const initCall = `posthog.init('${team?.api_token}',{api_host:'${location.origin}', loaded: () => alert('PostHog is now tracking events!')})`
@@ -10,12 +11,18 @@ export function JSBookmarklet({ team }: { team: TeamBasicType }): JSX.Element {
     )}%7D%7D)()`
 
     const { reportBookmarkletDragged } = useActions(eventUsageLogic)
+    const ref = useRef<HTMLAnchorElement>(null)
+
+    useEffect(() => {
+        // React cleverly stops js links from working, so we need to set the href manually
+        ref.current?.setAttribute('href', href)
+    }, [ref.current, href])
 
     return (
         <>
             {/* eslint-disable-next-line react/forbid-elements */}
             <a
-                href={href}
+                ref={ref}
                 className="w-full text-primary-alt bg-primary-alt-highlight rounded-lg justify-center p-4 flex font-bold gap-2 items-center"
                 onDragStart={reportBookmarkletDragged}
             >
diff --git a/frontend/src/lib/components/JSSnippet.tsx b/frontend/src/lib/components/JSSnippet.tsx
index 1c4bafcb11d80a..8458e79ad9c1bc 100644
--- a/frontend/src/lib/components/JSSnippet.tsx
+++ b/frontend/src/lib/components/JSSnippet.tsx
@@ -7,7 +7,7 @@ export function JSSnippet(): JSX.Element {
 
     return (
         <CodeSnippet language={Language.HTML}>{`<script>
-    !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
+    !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys onSessionId".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
     posthog.init('${currentTeam?.api_token}',{api_host:'${window.location.origin}'})
 </script>`}</CodeSnippet>
     )
diff --git a/frontend/src/lib/components/Map/Map.stories.tsx b/frontend/src/lib/components/Map/Map.stories.tsx
index 41807351e63677..e7e120a8244a39 100644
--- a/frontend/src/lib/components/Map/Map.stories.tsx
+++ b/frontend/src/lib/components/Map/Map.stories.tsx
@@ -14,6 +14,11 @@ const meta: Meta<typeof Map> = {
         center: coordinates,
         className: 'h-60',
     },
+    parameters: {
+        testOptions: {
+            skip: true,
+        },
+    },
 }
 type Story = StoryObj<typeof Map>
 
diff --git a/frontend/src/lib/components/ObjectTags/ObjectTags.tsx b/frontend/src/lib/components/ObjectTags/ObjectTags.tsx
index 8d9e0d438cb3e6..00d447b71ff0c6 100644
--- a/frontend/src/lib/components/ObjectTags/ObjectTags.tsx
+++ b/frontend/src/lib/components/ObjectTags/ObjectTags.tsx
@@ -1,7 +1,8 @@
 import { Tag, Select } from 'antd'
 import { colorForString } from 'lib/utils'
 import { CSSProperties, useMemo } from 'react'
-import { PlusOutlined, SyncOutlined, CloseOutlined } from '@ant-design/icons'
+// eslint-disable-next-line no-restricted-imports
+import { SyncOutlined, CloseOutlined } from '@ant-design/icons'
 import { SelectGradientOverflow } from '../SelectGradientOverflow'
 import { useActions, useValues } from 'kea'
 import { objectTagsLogic } from 'lib/components/ObjectTags/objectTagsLogic'
@@ -9,6 +10,7 @@ import { AvailableFeature } from '~/types'
 import { sceneLogic } from 'scenes/sceneLogic'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import clsx from 'clsx'
+import { IconPlus } from '@posthog/icons'
 
 interface ObjectTagsPropsBase {
     tags: string[]
@@ -126,7 +128,7 @@ export function ObjectTags({
                             backgroundColor: 'var(--bg-light)',
                             display: addingNewTag ? 'none' : 'initial',
                         }}
-                        icon={<PlusOutlined />}
+                        icon={<IconPlus />}
                     >
                         Add tag
                     </Tag>
diff --git a/frontend/src/lib/components/PersonPropertySelect/PersonPropertySelect.tsx b/frontend/src/lib/components/PersonPropertySelect/PersonPropertySelect.tsx
index d981c95aad5a77..d14d233f90f3b2 100644
--- a/frontend/src/lib/components/PersonPropertySelect/PersonPropertySelect.tsx
+++ b/frontend/src/lib/components/PersonPropertySelect/PersonPropertySelect.tsx
@@ -36,6 +36,7 @@ const SortableProperty = ({
             className={clsx(sortable ? 'cursor-move' : 'cursor-auto')}
             {...attributes}
             {...listeners}
+            // eslint-disable-next-line react/forbid-dom-props
             style={{
                 transform: CSS.Translate.toString(transform),
                 transition,
diff --git a/frontend/src/lib/components/PersonalAPIKeys/index.tsx b/frontend/src/lib/components/PersonalAPIKeys/index.tsx
deleted file mode 100644
index 4b79332193d2cf..00000000000000
--- a/frontend/src/lib/components/PersonalAPIKeys/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { PersonalAPIKeys } from './PersonalAPIKeys'
diff --git a/frontend/src/lib/components/PropertyFilters/PropertyFilters.stories.tsx b/frontend/src/lib/components/PropertyFilters/PropertyFilters.stories.tsx
index fb925b583c6695..484b294b29b475 100644
--- a/frontend/src/lib/components/PropertyFilters/PropertyFilters.stories.tsx
+++ b/frontend/src/lib/components/PropertyFilters/PropertyFilters.stories.tsx
@@ -38,7 +38,6 @@ export function ComparingPropertyFilters(): JSX.Element {
                 propertyFilters={[...propertyFilters]}
                 onChange={() => {}}
                 pageKey={'pageKey'}
-                style={{ marginBottom: 0 }}
                 showNestedArrow
                 eventNames={[]}
             />
@@ -48,7 +47,6 @@ export function ComparingPropertyFilters(): JSX.Element {
                 propertyFilters={[...propertyFilters]}
                 onChange={() => {}}
                 pageKey={'pageKey'}
-                style={{ marginBottom: 0 }}
                 eventNames={[]}
                 disablePopover={true}
             />
diff --git a/frontend/src/lib/components/PropertyFilters/PropertyFilters.tsx b/frontend/src/lib/components/PropertyFilters/PropertyFilters.tsx
index 18415dba6c362c..dc9506368a0cdb 100644
--- a/frontend/src/lib/components/PropertyFilters/PropertyFilters.tsx
+++ b/frontend/src/lib/components/PropertyFilters/PropertyFilters.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, useEffect } from 'react'
+import React, { useEffect } from 'react'
 import { useValues, BindLogic, useActions } from 'kea'
 import { propertyFilterLogic } from './propertyFilterLogic'
 import { FilterRow } from './components/FilterRow'
@@ -15,7 +15,6 @@ interface PropertyFiltersProps {
     pageKey: string
     showConditionBadge?: boolean
     disablePopover?: boolean
-    style?: CSSProperties
     taxonomicGroupTypes?: TaxonomicFilterGroupType[]
     hogQLTable?: string
     showNestedArrow?: boolean
@@ -39,7 +38,6 @@ export function PropertyFilters({
     disablePopover = false, // use bare PropertyFilter without popover
     taxonomicGroupTypes,
     hogQLTable,
-    style = {},
     showNestedArrow = false,
     eventNames = [],
     orFiltering = false,
@@ -62,7 +60,7 @@ export function PropertyFilters({
     }, [propertyFilters])
 
     return (
-        <div className="PropertyFilters" style={style}>
+        <div className="PropertyFilters">
             {showNestedArrow && !disablePopover && <div className="PropertyFilters__prefix">{<>&#8627;</>}</div>}
             <div className="PropertyFilters__content">
                 <BindLogic logic={propertyFilterLogic} props={logicProps}>
diff --git a/frontend/src/lib/components/PropertyFilters/components/OperatorValueSelect.tsx b/frontend/src/lib/components/PropertyFilters/components/OperatorValueSelect.tsx
index 838569a81c8ab6..817677a1f7f8ab 100644
--- a/frontend/src/lib/components/PropertyFilters/components/OperatorValueSelect.tsx
+++ b/frontend/src/lib/components/PropertyFilters/components/OperatorValueSelect.tsx
@@ -126,7 +126,7 @@ export function OperatorValueSelect({
                 />
             </div>
             {!isOperatorFlag(currentOperator || PropertyOperator.Exact) && type && propkey && (
-                <div className="flex-1" style={{ minWidth: '10rem' }} data-attr="taxonomic-value-select">
+                <div className="flex-1 min-w-40" data-attr="taxonomic-value-select">
                     <PropertyValue
                         type={type}
                         key={propkey}
diff --git a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
index fa2baa74c9c2cc..97aaa8014eee11 100644
--- a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
+++ b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
@@ -1,6 +1,5 @@
 .PropertyFilterButton {
     overflow: hidden;
-    color: var(--bg-charcoal);
     border-color: transparent;
     background: var(--border);
     display: inline-flex;
@@ -10,7 +9,7 @@
     &:focus {
         border-color: var(--border);
         background: var(--border);
-        color: var(--bg-charcoal);
+        color: var(--text-default);
     }
 
     text-shadow: none;
@@ -27,8 +26,4 @@
         overflow: hidden;
         text-overflow: ellipsis;
     }
-
-    .anticon-close {
-        color: var(--bg-charcoal);
-    }
 }
diff --git a/frontend/src/lib/components/PropertyFilters/components/PropertyFiltersDisplay.tsx b/frontend/src/lib/components/PropertyFilters/components/PropertyFiltersDisplay.tsx
index e1cb0816c05335..1db0201362ea1b 100644
--- a/frontend/src/lib/components/PropertyFilters/components/PropertyFiltersDisplay.tsx
+++ b/frontend/src/lib/components/PropertyFilters/components/PropertyFiltersDisplay.tsx
@@ -1,15 +1,9 @@
-import { CSSProperties } from 'react'
 import { AnyPropertyFilter } from '~/types'
 import { PropertyFilterButton } from './PropertyFilterButton'
 
-type Props = {
-    filters: AnyPropertyFilter[]
-    style?: CSSProperties
-}
-
-const PropertyFiltersDisplay: React.FunctionComponent<Props> = ({ filters, style }: Props) => {
+const PropertyFiltersDisplay = ({ filters }: { filters: AnyPropertyFilter[] }): JSX.Element => {
     return (
-        <div className="PropertyFilters mb-4" style={style}>
+        <div className="PropertyFilters flex-wrap">
             {filters &&
                 filters.map((item) => {
                     return <PropertyFilterButton key={item.key} item={item} />
diff --git a/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx b/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
index e99bcf464c9e2c..1ee7d36a6d27d4 100644
--- a/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
+++ b/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
@@ -109,7 +109,7 @@ export function TaxonomicPropertyFilter({
 
     const { ref: wrapperRef, size } = useResizeBreakpoints({
         0: 'tiny',
-        400: 'small',
+        300: 'small',
         550: 'medium',
     })
 
diff --git a/frontend/src/lib/components/PropertyFilters/utils.ts b/frontend/src/lib/components/PropertyFilters/utils.ts
index 9f5b93fa7c313b..b6371b8881c312 100644
--- a/frontend/src/lib/components/PropertyFilters/utils.ts
+++ b/frontend/src/lib/components/PropertyFilters/utils.ts
@@ -79,6 +79,11 @@ export function isEventPropertyFilter(filter?: AnyFilterLike | null): filter is
 export function isPersonPropertyFilter(filter?: AnyFilterLike | null): filter is PersonPropertyFilter {
     return filter?.type === PropertyFilterType.Person
 }
+export function isEventPropertyOrPersonPropertyFilter(
+    filter?: AnyFilterLike | null
+): filter is EventPropertyFilter | PersonPropertyFilter {
+    return filter?.type === PropertyFilterType.Event || filter?.type === PropertyFilterType.Person
+}
 export function isElementPropertyFilter(filter?: AnyFilterLike | null): filter is ElementPropertyFilter {
     return filter?.type === PropertyFilterType.Element
 }
diff --git a/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.scss b/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.scss
index 35addf19045642..6bfa3e13ada308 100644
--- a/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.scss
+++ b/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.scss
@@ -77,6 +77,6 @@
     }
 
     .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
-        background: #e5ebff;
+        background: var(--primary-highlight);
     }
 }
diff --git a/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.tsx b/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.tsx
index f0d26edd7c1a47..30d7c835ccf9f9 100644
--- a/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.tsx
+++ b/frontend/src/lib/components/PropertyGroupFilters/PropertyGroupFilters.tsx
@@ -113,7 +113,6 @@ export function PropertyGroupFilters({
                                                             ? (group.values as AnyPropertyFilter[])
                                                             : null
                                                     }
-                                                    style={{ marginBottom: 0 }}
                                                     onChange={(properties) => {
                                                         setPropertyFilters(properties, propertyGroupIndex)
                                                     }}
diff --git a/frontend/src/lib/components/RestrictedArea.tsx b/frontend/src/lib/components/RestrictedArea.tsx
index 9d86714ce8cd60..c334a3a2235e6c 100644
--- a/frontend/src/lib/components/RestrictedArea.tsx
+++ b/frontend/src/lib/components/RestrictedArea.tsx
@@ -18,17 +18,16 @@ export enum RestrictionScope {
     Project = 'project',
 }
 
-export interface RestrictedAreaProps {
-    Component: (props: RestrictedComponentProps) => JSX.Element
+export interface UseRestrictedAreaProps {
     minimumAccessLevel: EitherMembershipLevel
     scope?: RestrictionScope
 }
 
-export function RestrictedArea({
-    Component,
-    minimumAccessLevel,
-    scope = RestrictionScope.Organization,
-}: RestrictedAreaProps): JSX.Element {
+export interface RestrictedAreaProps extends UseRestrictedAreaProps {
+    Component: (props: RestrictedComponentProps) => JSX.Element
+}
+
+export function useRestrictedArea({ scope, minimumAccessLevel }: UseRestrictedAreaProps): null | string {
     const { currentOrganization } = useValues(organizationLogic)
     const { currentTeam } = useValues(teamLogic)
 
@@ -59,6 +58,16 @@ export function RestrictedArea({
         return null
     }, [currentOrganization])
 
+    return restrictionReason
+}
+
+export function RestrictedArea({
+    Component,
+    minimumAccessLevel,
+    scope = RestrictionScope.Organization,
+}: RestrictedAreaProps): JSX.Element {
+    const restrictionReason = useRestrictedArea({ minimumAccessLevel, scope })
+
     return restrictionReason ? (
         <Tooltip title={restrictionReason} placement="topLeft" delayMs={0}>
             <span>
diff --git a/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.test.ts b/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.test.ts
index 7b8709210517fa..88182d3131a78e 100644
--- a/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.test.ts
+++ b/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.test.ts
@@ -7,7 +7,7 @@ import { userLogic } from 'scenes/userLogic'
 import { useMocks } from '~/mocks/jest'
 import { Scene } from 'scenes/sceneTypes'
 
-describe('sceneDashboardChoiceModalLogic ', () => {
+describe('sceneDashboardChoiceModalLogic', () => {
     let logic: ReturnType<typeof sceneDashboardChoiceModalLogic.build>
 
     beforeEach(async () => {
diff --git a/frontend/src/lib/components/SelectGradientOverflow.tsx b/frontend/src/lib/components/SelectGradientOverflow.tsx
index 253e645227d3b0..1623c08976ae35 100644
--- a/frontend/src/lib/components/SelectGradientOverflow.tsx
+++ b/frontend/src/lib/components/SelectGradientOverflow.tsx
@@ -1,3 +1,5 @@
+// eslint-disable-next-line no-restricted-imports
+import { LoadingOutlined } from '@ant-design/icons'
 import { ReactElement, RefObject, useEffect, useRef, useState } from 'react'
 import { ConfigProvider, Empty, Select, Tag } from 'antd'
 import { RefSelectProps, SelectProps } from 'antd/lib/select'
@@ -7,7 +9,6 @@ import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import './SelectGradientOverflow.scss'
 import { useValues } from 'kea'
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
-import { LoadingOutlined } from '@ant-design/icons'
 
 interface DropdownGradientRendererProps {
     updateScrollGradient: () => void
diff --git a/frontend/src/lib/components/SeriesGlyph.tsx b/frontend/src/lib/components/SeriesGlyph.tsx
index a34d6337951e76..156ebcf5f367bd 100644
--- a/frontend/src/lib/components/SeriesGlyph.tsx
+++ b/frontend/src/lib/components/SeriesGlyph.tsx
@@ -10,6 +10,7 @@ interface SeriesGlyphProps {
 
 export function SeriesGlyph({ className, style, children, variant }: SeriesGlyphProps): JSX.Element {
     return (
+        // eslint-disable-next-line react/forbid-dom-props
         <div className={`graph-series-glyph ${variant || ''} ${className}`} style={style}>
             {children}
         </div>
diff --git a/frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx b/frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx
index 961fa82e2ef849..d21d6a9bb6808f 100644
--- a/frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx
+++ b/frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx
@@ -1,10 +1,11 @@
-import { Select } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { FundOutlined } from '@ant-design/icons'
 import { smoothingOptions } from './smoothings'
 import { useActions, useValues } from 'kea'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 import { trendsDataLogic } from 'scenes/trends/trendsDataLogic'
+import { LemonSelect } from '@posthog/lemon-ui'
 
 export function SmoothingFilter(): JSX.Element | null {
     const { insightProps } = useValues(insightLogic)
@@ -31,9 +32,8 @@ export function SmoothingFilter(): JSX.Element | null {
     }))
 
     return options.length ? (
-        <Select
+        <LemonSelect
             key={interval}
-            bordered
             value={smoothing_intervals || 1}
             dropdownMatchSelectWidth={false}
             onChange={(key) => {
@@ -43,6 +43,7 @@ export function SmoothingFilter(): JSX.Element | null {
             }}
             data-attr="smoothing-filter"
             options={options}
+            size="small"
         />
     ) : (
         <></>
diff --git a/frontend/src/lib/components/Subscriptions/subscriptionLogic.ts b/frontend/src/lib/components/Subscriptions/subscriptionLogic.ts
index f92d15989caea5..87c84e204c0379 100644
--- a/frontend/src/lib/components/Subscriptions/subscriptionLogic.ts
+++ b/frontend/src/lib/components/Subscriptions/subscriptionLogic.ts
@@ -14,7 +14,7 @@ import { subscriptionsLogic } from './subscriptionsLogic'
 import type { subscriptionLogicType } from './subscriptionLogicType'
 import { getInsightId } from 'scenes/insights/utils'
 import { SubscriptionBaseProps, urlForSubscription } from './utils'
-import { integrationsLogic } from 'scenes/project/Settings/integrationsLogic'
+import { integrationsLogic } from 'scenes/settings/project/integrationsLogic'
 
 const NEW_SUBSCRIPTION: Partial<SubscriptionType> = {
     frequency: 'weekly',
diff --git a/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx b/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
index ec244d23247649..1926ad2b7fb12a 100644
--- a/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
+++ b/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from 'react'
 import { useActions, useValues } from 'kea'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { Field } from 'lib/forms/Field'
 import { dayjs } from 'lib/dayjs'
@@ -29,12 +29,12 @@ import {
     LemonSelectMultipleOptionItem,
 } from 'lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple'
 import { usersLemonSelectOptions } from 'lib/components/UserSelectItem'
-import { integrationsLogic } from 'scenes/project/Settings/integrationsLogic'
 import { urls } from 'scenes/urls'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { Form } from 'kea-forms'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
+import { integrationsLogic } from 'scenes/settings/project/integrationsLogic'
 
 interface EditSubscriptionProps extends SubscriptionBaseProps {
     id: number | 'new'
@@ -254,7 +254,7 @@ export function EditSubscription({
                                                 <>
                                                     Slack is not yet configured for this project. You can configure it
                                                     at{' '}
-                                                    <Link to={`${urls.projectSettings()}#slack`}>
+                                                    <Link to={`${urls.settings('project')}#slack`}>
                                                         {' '}
                                                         Slack Integration settings
                                                     </Link>
diff --git a/frontend/src/lib/components/Support/supportLogic.ts b/frontend/src/lib/components/Support/supportLogic.ts
index 266ead19094dbd..aae39aeaae6492 100644
--- a/frontend/src/lib/components/Support/supportLogic.ts
+++ b/frontend/src/lib/components/Support/supportLogic.ts
@@ -3,7 +3,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import type { supportLogicType } from './supportLogicType'
 import { forms } from 'kea-forms'
-import { Region, TeamType, UserType } from '~/types'
+import { Region, SidePanelTab, TeamType, UserType } from '~/types'
 import { uuid } from 'lib/utils'
 import posthog from 'posthog-js'
 import { lemonToast } from 'lib/lemon-ui/lemonToast'
@@ -12,7 +12,7 @@ import { captureException } from '@sentry/react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import * as Sentry from '@sentry/react'
-import { SidePanelTab, sidePanelLogic } from '~/layout/navigation-3000/sidepanel/sidePanelLogic'
+import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 
 function getSessionReplayLink(): string {
     const link = posthog
@@ -111,7 +111,7 @@ export const supportLogic = kea<supportLogicType>([
     path(['lib', 'components', 'support', 'supportLogic']),
     connect(() => ({
         values: [userLogic, ['user'], preflightLogic, ['preflight']],
-        actions: [sidePanelLogic, ['openSidePanel', 'closeSidePanel']],
+        actions: [sidePanelStateLogic, ['openSidePanel']],
     })),
     actions(() => ({
         closeSupportForm: () => true,
diff --git a/frontend/src/lib/components/TZLabel/index.tsx b/frontend/src/lib/components/TZLabel/index.tsx
index 859552654342b5..ed6c3b4ac5bbbd 100644
--- a/frontend/src/lib/components/TZLabel/index.tsx
+++ b/frontend/src/lib/components/TZLabel/index.tsx
@@ -1,6 +1,7 @@
 import './index.scss'
 import { useActions, useValues } from 'kea'
-import { ProjectOutlined, LaptopOutlined, GlobalOutlined } from '@ant-design/icons'
+// eslint-disable-next-line no-restricted-imports
+import { ProjectOutlined, LaptopOutlined } from '@ant-design/icons'
 import { humanFriendlyDetailedTime, shortTimeZone } from 'lib/utils'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { teamLogic } from '../../../scenes/teamLogic'
@@ -8,10 +9,11 @@ import { dayjs } from 'lib/dayjs'
 import clsx from 'clsx'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { LemonButton, LemonDivider, LemonDropdown, LemonDropdownProps } from '@posthog/lemon-ui'
-import { IconSettings } from 'lib/lemon-ui/icons'
+import { IconSettings, IconWeb } from 'lib/lemon-ui/icons'
 import { urls } from 'scenes/urls'
 
 const BASE_OUTPUT_FORMAT = 'ddd, MMM D, YYYY h:mm A'
+const BASE_OUTPUT_FORMAT_WITH_SECONDS = 'ddd, MMM D, YYYY h:mm:ss A'
 
 export type TZLabelProps = Omit<LemonDropdownProps, 'overlay' | 'trigger' | 'children'> & {
     time: string | dayjs.Dayjs
@@ -21,13 +23,14 @@ export type TZLabelProps = Omit<LemonDropdownProps, 'overlay' | 'trigger' | 'chi
     showPopover?: boolean
     noStyles?: boolean
     className?: string
+    children?: JSX.Element
 }
 
 const TZLabelPopoverContent = React.memo(function TZLabelPopoverContent({
     showSeconds,
     time,
 }: Pick<TZLabelProps, 'showSeconds'> & { time: dayjs.Dayjs }): JSX.Element {
-    const DATE_OUTPUT_FORMAT = !showSeconds ? BASE_OUTPUT_FORMAT : `${BASE_OUTPUT_FORMAT}:ss`
+    const DATE_OUTPUT_FORMAT = !showSeconds ? BASE_OUTPUT_FORMAT : BASE_OUTPUT_FORMAT_WITH_SECONDS
     const { currentTeam } = useValues(teamLogic)
     const { reportTimezoneComponentViewed } = useActions(eventUsageLogic)
 
@@ -40,7 +43,7 @@ const TZLabelPopoverContent = React.memo(function TZLabelPopoverContent({
             <div className="flex justify-between items-center">
                 <h3 className="mb-0">Timezone conversion</h3>
                 <span>
-                    <LemonButton icon={<IconSettings />} size="small" to={urls.projectSettings('timezone')} />
+                    <LemonButton icon={<IconSettings />} size="small" to={urls.settings('project', 'date-and-time')} />
                 </span>
             </div>
 
@@ -66,7 +69,7 @@ const TZLabelPopoverContent = React.memo(function TZLabelPopoverContent({
                 {currentTeam?.timezone !== 'UTC' && (
                     <div className="TZLabelPopover__row">
                         <div>
-                            <GlobalOutlined /> UTC
+                            <IconWeb /> UTC
                         </div>
                         <div />
                         <div>{time.tz('UTC').format(DATE_OUTPUT_FORMAT)}</div>
@@ -86,6 +89,7 @@ function TZLabelRaw({
     showPopover = true,
     noStyles = false,
     className,
+    children,
     ...dropdownProps
 }: TZLabelProps): JSX.Element {
     const parsedTime = useMemo(() => (dayjs.isDayjs(time) ? time : dayjs(time)), [time])
@@ -108,7 +112,7 @@ function TZLabelRaw({
         return () => clearInterval(interval)
     }, [parsedTime, format])
 
-    const innerContent = (
+    const innerContent = children ?? (
         <span
             className={
                 !noStyles ? clsx('whitespace-nowrap', showPopover && 'border-dotted border-b', className) : className
diff --git a/frontend/src/lib/components/Table/Table.tsx b/frontend/src/lib/components/Table/Table.tsx
index 6fc3d67005941a..bc8a41e524eec6 100644
--- a/frontend/src/lib/components/Table/Table.tsx
+++ b/frontend/src/lib/components/Table/Table.tsx
@@ -13,7 +13,7 @@ export function createdAtColumn<T extends Record<string, any> = Record<string, a
         render: function RenderCreatedAt(_, item): JSX.Element | undefined | '' {
             return (
                 item.created_at && (
-                    <div style={{ whiteSpace: 'nowrap' }}>
+                    <div className="whitespace-nowrap">
                         <TZLabel time={item.created_at} />
                     </div>
                 )
@@ -33,6 +33,7 @@ export function createdByColumn<T extends Record<string, any> = Record<string, a
                     {item.created_by && (
                         <ProfilePicture name={item.created_by.first_name} email={item.created_by.email} size="md" />
                     )}
+                    {/* eslint-disable-next-line react/forbid-dom-props */}
                     <div style={{ maxWidth: 250, width: 'auto', verticalAlign: 'middle', marginLeft: 8 }}>
                         {item.created_by ? item.created_by.first_name || item.created_by.email : '-'}
                     </div>
diff --git a/frontend/src/lib/components/Table/utils.tsx b/frontend/src/lib/components/Table/utils.tsx
index 877dbd3ec43b0a..8bd296810ae6f3 100644
--- a/frontend/src/lib/components/Table/utils.tsx
+++ b/frontend/src/lib/components/Table/utils.tsx
@@ -2,7 +2,7 @@ import { useWindowSize } from 'lib/hooks/useWindowSize'
 import { getBreakpoint } from 'lib/utils/responsiveUtils'
 
 export function normalizeColumnTitle(title: string | JSX.Element): JSX.Element {
-    return <span style={{ whiteSpace: 'nowrap' }}>{title}</span>
+    return <span className="whitespace-nowrap">{title}</span>
 }
 
 // Returns a boolean indicating whether table should be scrolling or not given a specific
diff --git a/frontend/src/lib/components/TaxonomicFilter/InfiniteList.tsx b/frontend/src/lib/components/TaxonomicFilter/InfiniteList.tsx
index 858327ea357216..408f7fc7e926bd 100644
--- a/frontend/src/lib/components/TaxonomicFilter/InfiniteList.tsx
+++ b/frontend/src/lib/components/TaxonomicFilter/InfiniteList.tsx
@@ -1,6 +1,6 @@
 import './InfiniteList.scss'
 import '../../lemon-ui/Popover/Popover.scss'
-import { Empty, Tag } from 'antd'
+import { Empty } from 'antd'
 import { AutoSizer } from 'react-virtualized/dist/es/AutoSizer'
 import { List, ListRowProps, ListRowRenderer } from 'react-virtualized/dist/es/List'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
@@ -22,6 +22,7 @@ import { ControlledDefinitionPopover } from 'lib/components/DefinitionPopover/De
 import { pluralize } from 'lib/utils'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { useState } from 'react'
+import { LemonTag } from '@posthog/lemon-ui'
 
 export interface InfiniteListProps {
     popupAnchorElement: HTMLDivElement | null
@@ -36,7 +37,7 @@ const staleIndicator = (parsedLastSeen: dayjs.Dayjs | null): JSX.Element => {
                 </>
             }
         >
-            <Tag className="lemonade-tag">Stale</Tag>
+            <LemonTag>Stale</LemonTag>
         </Tooltip>
     )
 }
@@ -64,7 +65,7 @@ const unusedIndicator = (eventNames: string[]): JSX.Element => {
                 </>
             }
         >
-            <Tag className="lemonade-tag">Not seen</Tag>
+            <LemonTag>Not seen</LemonTag>
         </Tooltip>
     )
 }
diff --git a/frontend/src/lib/components/TaxonomicFilter/InfiniteSelectResults.tsx b/frontend/src/lib/components/TaxonomicFilter/InfiniteSelectResults.tsx
index 5496ec2b95e6ef..777e11cf0c6fff 100644
--- a/frontend/src/lib/components/TaxonomicFilter/InfiniteSelectResults.tsx
+++ b/frontend/src/lib/components/TaxonomicFilter/InfiniteSelectResults.tsx
@@ -107,7 +107,7 @@ export function InfiniteSelectResults({
             </div>
             {taxonomicGroupTypes.map((groupType) => {
                 return (
-                    <div key={groupType} style={{ display: groupType === openTab ? 'block' : 'none', marginTop: 8 }}>
+                    <div key={groupType} className={clsx('mt-2', groupType === openTab ? 'block' : 'hidden')}>
                         <BindLogic
                             logic={infiniteListLogic}
                             props={{ ...taxonomicFilterLogicProps, listGroupType: groupType }}
diff --git a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
index 146e318549886b..7bcd6833e25abe 100644
--- a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
+++ b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
@@ -280,9 +280,13 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                         type: TaxonomicFilterGroupType.PersonProperties,
                         endpoint: combineUrl(`api/projects/${teamId}/property_definitions`, {
                             type: 'person',
+                            properties: propertyAllowList?.[TaxonomicFilterGroupType.PersonProperties]
+                                ? propertyAllowList[TaxonomicFilterGroupType.PersonProperties].join(',')
+                                : undefined,
                         }).url,
                         getName: (personProperty: PersonProperty) => personProperty.name,
                         getValue: (personProperty: PersonProperty) => personProperty.name,
+                        propertyAllowList: propertyAllowList?.[TaxonomicFilterGroupType.PersonProperties],
                         ...propertyTaxonomicGroupProps(true),
                     },
                     {
diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index 662c7aed551a64..090d275295eea5 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -161,6 +161,7 @@ export const FEATURE_FLAGS = {
     APPS_AND_EXPORTS_UI: 'apps-and-exports-ui', // owner: @benjackwhite
     SESSION_REPLAY_CORS_PROXY: 'session-replay-cors-proxy', // owner: #team-monitoring
     HOGQL_INSIGHTS: 'hogql-insights', // owner: @mariusandra
+    HOGQL_INSIGHT_LIVE_COMPARE: 'hogql-insight-live-compare', // owner: @mariusandra
     WEBHOOKS_DENYLIST: 'webhooks-denylist', // owner: #team-pipeline
     SURVEYS_MULTIPLE_QUESTIONS: 'surveys-multiple-questions', // owner: @liyiy
     SURVEYS_RESULTS_VISUALIZATIONS: 'surveys-results-visualizations', // owner: @jurajmajerik
diff --git a/frontend/src/lib/hooks/useResizeObserver.ts b/frontend/src/lib/hooks/useResizeObserver.ts
index 67a755d5556726..8e1db5844577a3 100644
--- a/frontend/src/lib/hooks/useResizeObserver.ts
+++ b/frontend/src/lib/hooks/useResizeObserver.ts
@@ -11,7 +11,10 @@ export const useResizeObserver = useResizeObserverImport
 
 export function useResizeBreakpoints<T>(
     breakpoints: { [key: number]: T },
-    ref?: RefObject<HTMLDivElement> | null | undefined
+    options?: {
+        ref?: RefObject<HTMLDivElement> | null | undefined
+        initialSize?: T
+    }
 ): {
     ref?: RefCallback<HTMLDivElement> | RefObject<HTMLDivElement>
     size: T
@@ -23,11 +26,10 @@ export function useResizeBreakpoints<T>(
                 .sort((a, b) => a - b),
         [breakpoints]
     )
-    const initialSize = breakpoints[sortedKeys[0]]
-    const [size, setSize] = useState(initialSize)
+    const [size, setSize] = useState(options?.initialSize ?? breakpoints[sortedKeys[0]])
 
     const { ref: refCb } = useResizeObserver<HTMLDivElement>({
-        ref,
+        ref: options?.ref,
         onResize: ({ width = 1 }) => {
             let newSize = breakpoints[sortedKeys[0]]
 
@@ -42,5 +44,5 @@ export function useResizeBreakpoints<T>(
         },
     })
 
-    return { ref: ref || refCb, size }
+    return { ref: options?.ref || refCb, size }
 }
diff --git a/frontend/src/lib/introductions/GroupsIntroductionOption.tsx b/frontend/src/lib/introductions/GroupsIntroductionOption.tsx
index 5fcbf09af87a79..c2b863cef3154b 100644
--- a/frontend/src/lib/introductions/GroupsIntroductionOption.tsx
+++ b/frontend/src/lib/introductions/GroupsIntroductionOption.tsx
@@ -1,8 +1,8 @@
 import { useValues } from 'kea'
-import { LockOutlined } from '@ant-design/icons'
 import Select from 'rc-select'
 import { Link } from 'lib/lemon-ui/Link'
 import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
+import { IconLock } from 'lib/lemon-ui/icons'
 
 // TODO: Remove, but de-ant FeatureFlagReleaseConditions first
 export function GroupsIntroductionOption({ value }: { value: any }): JSX.Element | null {
@@ -30,7 +30,7 @@ export function GroupsIntroductionOption({ value }: { value: any }): JSX.Element
                 color: 'var(--muted)',
             }}
         >
-            <LockOutlined style={{ marginRight: 6, color: 'var(--warning)' }} />
+            <IconLock style={{ marginRight: 6, color: 'var(--warning)' }} />
             Unique groups –{' '}
             <Link
                 to="https://posthog.com/docs/user-guides/group-analytics?utm_medium=in-product&utm_campaign=group-analytics-learn-more"
diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
index a55031621ad933..13538425ac4a5e 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
@@ -257,6 +257,19 @@
         }
     }
 
+    .ant-tooltip & {
+        // Buttons have an overriden style in tooltips, as they are always dark
+        &:hover {
+            background: rgba(255, 255, 255, 0.15) !important;
+        }
+        &:active {
+            background: rgba(255, 255, 255, 0.2) !important;
+        }
+        .LemonButton__icon {
+            color: #fff !important;
+        }
+    }
+
     .posthog-3000 & {
         font-size: 0.8125rem;
         border: none !important; // 3000 buttons never have borders
diff --git a/frontend/src/lib/lemon-ui/LemonCalendarRange/LemonCalendarRangeInline.tsx b/frontend/src/lib/lemon-ui/LemonCalendarRange/LemonCalendarRangeInline.tsx
index 8a25fd4d1fae19..898f77728dd269 100644
--- a/frontend/src/lib/lemon-ui/LemonCalendarRange/LemonCalendarRangeInline.tsx
+++ b/frontend/src/lib/lemon-ui/LemonCalendarRange/LemonCalendarRangeInline.tsx
@@ -33,8 +33,7 @@ export function LemonCalendarRangeInline({
     // How many months fit on the screen, capped between 1..2
     function getMonthCount(): number {
         const width =
-            // eslint-disable-next-line valid-typeof
-            typeof window === undefined ? WIDTH_OF_ONE_CALENDAR_MONTH * CALENDARS_IF_NO_WINDOW : window.innerWidth
+            typeof window === 'undefined' ? WIDTH_OF_ONE_CALENDAR_MONTH * CALENDARS_IF_NO_WINDOW : window.innerWidth
         return Math.min(Math.max(1, Math.floor(width / WIDTH_OF_ONE_CALENDAR_MONTH)), 2)
     }
     const [autoMonthCount, setAutoMonthCount] = useState(getMonthCount())
diff --git a/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.scss b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.scss
new file mode 100644
index 00000000000000..24d0850cff5dc9
--- /dev/null
+++ b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.scss
@@ -0,0 +1,23 @@
+.LemonProgressCircle {
+    display: inline-block;
+    position: relative;
+    vertical-align: text-bottom;
+
+    circle {
+        transition: stroke-dashoffset 0.35s;
+        transform: rotate(-90deg);
+        transform-origin: 50% 50%;
+    }
+
+    .LemonProgressCircle__content {
+        position: absolute;
+        inset: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .LemonButton__icon & {
+        display: inline-flex;
+    }
+}
diff --git a/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.stories.tsx b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.stories.tsx
new file mode 100644
index 00000000000000..7fc77ead264869
--- /dev/null
+++ b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.stories.tsx
@@ -0,0 +1,104 @@
+import { Meta, StoryFn, StoryObj } from '@storybook/react'
+import { LemonProgressCircle, LemonProgressCircleProps } from './LemonProgressCircle'
+import { useEffect, useState } from 'react'
+import { LemonButton } from '../LemonButton'
+import { IconGear } from '@posthog/icons'
+import { LemonCheckbox } from '../LemonCheckbox'
+
+type Story = StoryObj<typeof LemonProgressCircle>
+const meta: Meta<typeof LemonProgressCircle> = {
+    title: 'Lemon UI/Lemon Progress Circle',
+    component: LemonProgressCircle,
+    parameters: {
+        docs: {
+            description: {
+                component: `
+
+[Related Figma area](https://www.figma.com/file/Y9G24U4r04nEjIDGIEGuKI/PostHog-Design-System-One?node-id=3139%3A1388)
+
+Lemon Labels provide common styling and options for labeling form elements. They can be used directly but most commonly should be used via the \`Field\` component.
+
+`,
+            },
+        },
+    },
+    args: {
+        progress: 0.3,
+    },
+    tags: ['autodocs'],
+}
+export default meta
+
+export const Template: StoryFn<typeof LemonProgressCircle> = (props: LemonProgressCircleProps) => {
+    return <LemonProgressCircle {...props} />
+}
+
+export const Basic: Story = Template.bind({})
+Basic.args = {
+    progress: 0.3,
+}
+
+export const Overview = (): JSX.Element => {
+    const [progress, setProgress] = useState(0.2)
+    const [animate, setAnimate] = useState(false)
+
+    useEffect(() => {
+        if (!animate) {
+            return
+        }
+        const interval = setInterval(() => {
+            setProgress((progress) => {
+                const newProgress = progress + 0.1
+                return newProgress > 1 ? newProgress - 1 : newProgress
+            })
+        }, 500)
+        return () => clearInterval(interval)
+    }, [animate])
+
+    return (
+        <div className="flex flex-col gap-2">
+            <LemonCheckbox checked={animate} onChange={setAnimate} bordered label={'Animate'} />
+            <LemonProgressCircle progress={progress} />
+            <LemonProgressCircle progress={progress} strokePercentage={0.5} size={30} />
+
+            <span className="flex items-center gap-2">
+                <LemonButton
+                    icon={<LemonProgressCircle progress={progress} />}
+                    status="primary"
+                    sideIcon={<IconGear />}
+                    type="secondary"
+                    size="small"
+                >
+                    In a button!
+                </LemonButton>
+
+                <LemonButton
+                    icon={<LemonProgressCircle progress={progress} size={20} />}
+                    status="primary"
+                    sideIcon={<IconGear />}
+                    type="secondary"
+                >
+                    In a button!
+                </LemonButton>
+
+                <LemonButton
+                    icon={<LemonProgressCircle progress={progress} size={24} />}
+                    status="primary"
+                    sideIcon={<IconGear />}
+                    type="secondary"
+                    size="large"
+                >
+                    In a button!
+                </LemonButton>
+            </span>
+
+            <LemonProgressCircle progress={progress} size={40}>
+                <span className="font-semibold text-sm">{(100 * progress).toFixed(0)}</span>
+            </LemonProgressCircle>
+
+            <span>
+                Here is one inline <LemonProgressCircle progress={progress} /> with some text...
+            </span>
+        </div>
+    )
+}
diff --git a/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.tsx b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.tsx
new file mode 100644
index 00000000000000..6d8e48419aa199
--- /dev/null
+++ b/frontend/src/lib/lemon-ui/LemonProgressCircle/LemonProgressCircle.tsx
@@ -0,0 +1,62 @@
+import clsx from 'clsx'
+import './LemonProgressCircle.scss'
+
+export type LemonProgressCircleProps = {
+    strokePercentage?: number
+    backgroundStrokeOpacity?: number
+    size?: number
+    progress: number
+    children?: React.ReactNode
+    className?: string
+}
+
+export const LemonProgressCircle = ({
+    strokePercentage = 0.2,
+    backgroundStrokeOpacity = 0.2,
+    size = 16,
+    progress,
+    children,
+    className,
+}: LemonProgressCircleProps): JSX.Element => {
+    const radius = size / 2
+    const stroke = radius * strokePercentage
+    const circumference = size * Math.PI
+    const strokeDashoffset = circumference - progress * circumference
+
+    return (
+        <span
+            className={clsx('LemonProgressCircle', className)}
+            // eslint-disable-next-line react/forbid-dom-props
+            style={{
+                height: size,
+                width: size,
+            }}
+        >
+            <svg height={size} width={size}>
+                <circle
+                    stroke="currentColor"
+                    strokeOpacity={backgroundStrokeOpacity}
+                    fill="transparent"
+                    strokeWidth={stroke}
+                    r={radius - stroke / 2}
+                    cx={radius}
+                    cy={radius}
+                />
+
+                <circle
+                    stroke="currentColor"
+                    fill="transparent"
+                    strokeWidth={stroke}
+                    strokeDasharray={circumference + ' ' + circumference}
+                    // eslint-disable-next-line react/forbid-dom-props
+                    style={{ strokeDashoffset }}
+                    r={radius - stroke / 2}
+                    cx={radius}
+                    cy={radius}
+                />
+            </svg>
+
+            {children ? <span className="LemonProgressCircle__content">{children}</span> : null}
+        </span>
+    )
+}
diff --git a/frontend/src/lib/lemon-ui/LemonProgressCircle/index.tsx b/frontend/src/lib/lemon-ui/LemonProgressCircle/index.tsx
new file mode 100644
index 00000000000000..5e7f08e0cd23a5
--- /dev/null
+++ b/frontend/src/lib/lemon-ui/LemonProgressCircle/index.tsx
@@ -0,0 +1 @@
+export * from './LemonProgressCircle'
diff --git a/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.stories.tsx b/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.stories.tsx
index ba37e4da254603..f86c3b9fed7b03 100644
--- a/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.stories.tsx
+++ b/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.stories.tsx
@@ -62,7 +62,7 @@ SectionedOptions.args = {
             options: [{ value: 'tomato', label: 'Tomato??', disabled: true }],
             footer: (
                 <div className="bg-side rounded p-2">
-                    <p className="text-muted" style={{ maxWidth: '15rem' }}>
+                    <p className="text-muted max-w-60">
                         I am a custom footer! <br />
                         This might be a good time to tell you about our premium features...
                     </p>
diff --git a/frontend/src/lib/lemon-ui/Link/Link.tsx b/frontend/src/lib/lemon-ui/Link/Link.tsx
index c1571716d37f00..12c1c9e966a473 100644
--- a/frontend/src/lib/lemon-ui/Link/Link.tsx
+++ b/frontend/src/lib/lemon-ui/Link/Link.tsx
@@ -5,9 +5,10 @@ import clsx from 'clsx'
 import './Link.scss'
 import { IconOpenInNew } from '../icons'
 import { Tooltip } from '../Tooltip'
-import { useNotebookDrag } from 'scenes/notebooks/AddToNotebook/DraggableToNotebook'
 import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
 import { useActions } from 'kea'
+
+import { useNotebookDrag } from 'scenes/notebooks/AddToNotebook/DraggableToNotebook'
 import { sidePanelDocsLogic } from '~/layout/navigation-3000/sidepanel/panels/sidePanelDocsLogic'
 
 type RoutePart = string | Record<string, any>
@@ -134,10 +135,7 @@ export const Link: React.FC<LinkProps & React.RefAttributes<HTMLElement>> = Reac
                 {targetBlankIcon && target === '_blank' ? <IconOpenInNew /> : null}
             </a>
         ) : (
-            <Tooltip
-                isDefaultTooltip
-                title={disabledReason ? <span className="italic">{disabledReason}</span> : undefined}
-            >
+            <Tooltip title={disabledReason ? <span className="italic">{disabledReason}</span> : undefined}>
                 <span>
                     <button
                         ref={ref as any}
diff --git a/frontend/src/lib/lemon-ui/Popover/Popover.scss b/frontend/src/lib/lemon-ui/Popover/Popover.scss
index 81f793100297d8..3e53c125cfb19d 100644
--- a/frontend/src/lib/lemon-ui/Popover/Popover.scss
+++ b/frontend/src/lib/lemon-ui/Popover/Popover.scss
@@ -114,7 +114,7 @@
     width: 0.5rem;
     height: 0.5rem;
     transform: rotate(45deg);
-    background: var(--bg-light);
+    background: var(--bg-3000);
 
     [data-placement^='bottom'] & {
         top: -0.25rem;
diff --git a/frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx b/frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx
index c97db6270d428d..4e855d4ba00b76 100644
--- a/frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx
+++ b/frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import { useValues } from 'kea'
 import md5 from 'md5'
-import { CSSProperties, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { userLogic } from 'scenes/userLogic'
 import { IconRobot } from '../icons'
 import { Lettermark, LettermarkColor } from '../Lettermark/Lettermark'
@@ -13,7 +13,6 @@ export interface ProfilePictureProps {
     email?: string
     size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'
     showName?: boolean
-    style?: CSSProperties
     className?: string
     title?: string
     index?: number
@@ -25,7 +24,6 @@ export function ProfilePicture({
     email,
     size = 'lg',
     showName,
-    style,
     className,
     index,
     title,
@@ -64,7 +62,6 @@ export function ProfilePicture({
                 src={gravatarUrl}
                 title={title || `This is the Gravatar for ${combinedNameAndEmail}`}
                 alt=""
-                style={style}
             />
         )
     } else {
@@ -72,7 +69,7 @@ export function ProfilePicture({
             type === 'bot' ? (
                 <IconRobot className={clsx(pictureClass, 'p-0.5')} />
             ) : (
-                <span className={pictureClass} style={style}>
+                <span className={pictureClass}>
                     <Lettermark
                         name={combinedNameAndEmail}
                         index={index}
diff --git a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
index f7a56a141f08b7..0232b319bf7320 100644
--- a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
+++ b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
@@ -6,8 +6,6 @@ import { useDebounce } from 'use-debounce'
 const DEFAULT_DELAY_MS = 500
 
 export type TooltipProps = AntdTooltipProps & {
-    /** Whether Ant Design's default Tooltip behavior should be used instead of PostHog's. */
-    isDefaultTooltip?: boolean
     delayMs?: number
 }
 
@@ -17,17 +15,11 @@ export type TooltipProps = AntdTooltipProps & {
  * See https://github.com/ant-design/ant-design/blob/master/components/tooltip/index.tsx#L82-L130.
  */
 // CAUTION: Any changes here will affect tooltips across the entire app.
-export function Tooltip({
-    children,
-    visible,
-    isDefaultTooltip = false,
-    delayMs = DEFAULT_DELAY_MS,
-    ...props
-}: TooltipProps): JSX.Element {
-    const [localVisible, setVisible] = useState(!!visible)
+export function Tooltip({ children, visible, delayMs = DEFAULT_DELAY_MS, ...props }: TooltipProps): JSX.Element {
+    const [localVisible, setVisible] = useState(false)
     const [debouncedLocalVisible] = useDebounce(visible ?? localVisible, delayMs)
 
-    if (!isDefaultTooltip && !('mouseEnterDelay' in props)) {
+    if (!('mouseEnterDelay' in props)) {
         // If not preserving default behavior and mouseEnterDelay is not already provided, we use a custom default here
         props.mouseEnterDelay = delayMs
     }
@@ -36,16 +28,22 @@ export function Tooltip({
     // See https://github.com/ant-design/ant-design/blob/master/components/tooltip/index.tsx#L226
     const child = React.isValidElement(children) ? children : <span>{children}</span>
 
+    const derivedVisible = typeof visible === 'undefined' ? localVisible && debouncedLocalVisible : visible
+
     return props.title ? (
-        <AntdTooltip {...props} visible={isDefaultTooltip ? visible : localVisible && debouncedLocalVisible}>
+        <AntdTooltip {...props} visible={derivedVisible}>
             {React.cloneElement(child, {
                 onMouseEnter: () => {
                     child.props.onMouseEnter?.()
-                    setVisible(true)
+                    if (typeof visible === 'undefined') {
+                        setVisible(true)
+                    }
                 },
                 onMouseLeave: () => {
                     child.props.onMouseLeave?.()
-                    setVisible(false)
+                    if (typeof visible === 'undefined') {
+                        setVisible(false)
+                    }
                 },
             })}
         </AntdTooltip>
diff --git a/frontend/src/lib/logic/featureFlagLogic.ts b/frontend/src/lib/logic/featureFlagLogic.ts
index 7b2869d12cc0a7..061bca49a70eac 100644
--- a/frontend/src/lib/logic/featureFlagLogic.ts
+++ b/frontend/src/lib/logic/featureFlagLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path, actions, reducers, events } from 'kea'
+import { kea, path, actions, reducers, afterMount } from 'kea'
 import type { featureFlagLogicType } from './featureFlagLogicType'
 import posthog from 'posthog-js'
 import { getAppContext } from 'lib/utils/getAppContext'
@@ -84,9 +84,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
             },
         ],
     }),
-    events(({ actions }) => ({
-        afterMount: () => {
-            posthog.onFeatureFlags(actions.setFeatureFlags)
-        },
-    })),
+    afterMount(({ actions }) => {
+        posthog.onFeatureFlags(actions.setFeatureFlags)
+    }),
 ])
diff --git a/frontend/src/lib/taxonomy.tsx b/frontend/src/lib/taxonomy.tsx
index e0fb582536b203..e841ec72c7323e 100644
--- a/frontend/src/lib/taxonomy.tsx
+++ b/frontend/src/lib/taxonomy.tsx
@@ -142,8 +142,8 @@ export const KEY_MAPPING: KeyMappingInterface = {
             description: (
                 <span>
                     This variable will be set to the distinct ID if you've called{' '}
-                    <pre style={{ display: 'inline' }}>posthog.identify('distinct id')</pre>. If the user is anonymous,
-                    it'll be empty.
+                    <pre className="inline">posthog.identify('distinct id')</pre>. If the user is anonymous, it'll be
+                    empty.
                 </span>
             ),
         },
diff --git a/frontend/src/lib/utils.tsx b/frontend/src/lib/utils.tsx
index 3db2d4a4e8dbe2..be48d5618e0e5d 100644
--- a/frontend/src/lib/utils.tsx
+++ b/frontend/src/lib/utils.tsx
@@ -1827,3 +1827,27 @@ export function shouldCancelQuery(error: any): boolean {
     // the query will continue running in ClickHouse
     return error.name === 'AbortError' || error.message?.name === 'AbortError' || error.status === 504
 }
+
+export function flattenObject(ob: Record<string, any>): Record<string, any> {
+    const toReturn = {}
+
+    for (const i in ob) {
+        if (!ob.hasOwnProperty(i)) {
+            continue
+        }
+
+        if (typeof ob[i] == 'object') {
+            const flatObject = flattenObject(ob[i])
+            for (const x in flatObject) {
+                if (!flatObject.hasOwnProperty(x)) {
+                    continue
+                }
+
+                toReturn[i + '.' + x] = flatObject[x]
+            }
+        } else {
+            toReturn[i] = ob[i]
+        }
+    }
+    return toReturn
+}
diff --git a/frontend/src/lib/utils/eventUsageLogic.ts b/frontend/src/lib/utils/eventUsageLogic.ts
index 95e26683e52e0c..2ec59bf991d2d4 100644
--- a/frontend/src/lib/utils/eventUsageLogic.ts
+++ b/frontend/src/lib/utils/eventUsageLogic.ts
@@ -632,6 +632,7 @@ export const eventUsageLogic = kea<eventUsageLogicType>([
                 properties.stickiness_days = filters.stickiness_days
             }
             properties.mode = insightMode // View or edit
+            // eslint-disable-next-line no-constant-binary-expression
             properties.viewer_is_creator = insightModel.created_by?.uuid === values.user?.uuid ?? null // `null` means we couldn't determine this
             properties.is_saved = insightModel.saved
             properties.description_length = insightModel.description?.length ?? 0
diff --git a/frontend/src/lib/utils/kea-logic-builders.ts b/frontend/src/lib/utils/kea-logic-builders.ts
new file mode 100644
index 00000000000000..8724c0acfd9fb8
--- /dev/null
+++ b/frontend/src/lib/utils/kea-logic-builders.ts
@@ -0,0 +1,14 @@
+import { BuiltLogic, afterMount } from 'kea'
+/**
+ * Some kea logics are used heavily across multiple areas so we keep it mounted once loaded with this trick.
+ */
+export function permanentlyMount(): (logic: BuiltLogic) => void {
+    return (logic) => {
+        afterMount(() => {
+            if (!logic.cache._permanentMount) {
+                logic.cache._permanentMount = true
+                logic.wrapper.mount()
+            }
+        })(logic)
+    }
+}
diff --git a/frontend/src/mocks/fixtures/_billing_v2_with_flat_fee.json b/frontend/src/mocks/fixtures/_billing_v2_with_flat_fee.json
new file mode 100644
index 00000000000000..cb3a7fa06ef5a8
--- /dev/null
+++ b/frontend/src/mocks/fixtures/_billing_v2_with_flat_fee.json
@@ -0,0 +1,1515 @@
+{
+    "available_features": [
+        "surveys_unlimited_surveys",
+        "surveys_all_question_types",
+        "surveys_user_targeting",
+        "surveys_user_sampling",
+        "surveys_styling",
+        "surveys_text_html",
+        "surveys_api_mode",
+        "surveys_results_analysis",
+        "surveys_templates",
+        "zapier",
+        "slack_integration",
+        "microsoft_teams_integration",
+        "discord_integration",
+        "apps",
+        "app_metrics",
+        "boolean_flags",
+        "persist_flags_cross_authentication",
+        "feature_flag_payloads",
+        "multiple_release_conditions",
+        "release_condition_overrides",
+        "targeting_by_group",
+        "local_evaluation_and_bootstrapping",
+        "flag_usage_stats",
+        "console_logs",
+        "recordings_playlists",
+        "recordings_performance",
+        "recordings_file_export",
+        "group_analytics",
+        "dashboards",
+        "funnels",
+        "graphs_trends",
+        "paths",
+        "subscriptions",
+        "paths_advanced",
+        "dashboard_permissioning",
+        "dashboard_collaboration",
+        "ingestion_taxonomy",
+        "correlation_analysis",
+        "tagging",
+        "behavioral_cohort_filtering",
+        "tracked_users",
+        "data_retention",
+        "team_members",
+        "organizations_projects",
+        "api_access",
+        "project_based_permissioning",
+        "social_sso",
+        "sso_enforcement",
+        "white_labelling",
+        "community_support",
+        "dedicated_support",
+        "email_support",
+        "terms_and_conditions",
+        "security_assessment"
+    ],
+    "license": {
+        "plan": "cloud"
+    },
+    "customer_id": "cus_1234",
+    "deactivated": false,
+    "has_active_subscription": true,
+    "billing_period": {
+        "current_period_start": "2023-10-13T09:54:24Z",
+        "current_period_end": "2023-11-13T09:54:24Z",
+        "interval": "month"
+    },
+    "available_product_features": [
+        {
+            "key": "surveys_unlimited_surveys",
+            "name": "Unlimited surveys",
+            "description": "Create as many surveys as you want.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_all_question_types",
+            "name": "All question types",
+            "description": "Rating scale (for NPS and the like), multiple choice, single choice, emoji rating, link, free text.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_user_targeting",
+            "name": "User property targeting",
+            "description": "Target users based on any of their user properties.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_user_sampling",
+            "name": "User sampling",
+            "description": "Sample users to only survey a portion of the users who match the criteria.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_styling",
+            "name": "Custom colors & positioning",
+            "description": "Customize the colors of your surveys to match your brand and set survey position.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_text_html",
+            "name": "Custom HTML text",
+            "description": "Add custom HTML to your survey text.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_api_mode",
+            "name": "API mode",
+            "description": "Create surveys via the API.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_results_analysis",
+            "name": "Results analysis",
+            "description": "Analyze your survey results including completion rates and drop offs.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "surveys_templates",
+            "name": "Templates",
+            "description": "Use our templates to get started quickly with NPS, customer satisfaction surveys, user interviews, and more.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "zapier",
+            "name": "Zapier",
+            "description": "Zapier lets you connect PostHog with thousands of the most popular apps, so you can automate your work and have more time for what matters most—no code required.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "slack_integration",
+            "name": "Slack",
+            "description": "Get notified about new actions in Slack.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "microsoft_teams_integration",
+            "name": "Microsoft Teams",
+            "description": "Get notified about new actions in Microsoft Teams.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "discord_integration",
+            "name": "Discord",
+            "description": "Get notified about new actions in Discord.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "apps",
+            "name": "CDP + Apps library",
+            "description": "Connect your data with 50+ apps including BigQuery, Redshift, and more.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "app_metrics",
+            "name": "App metrics",
+            "description": "Get metrics on your apps to see their usage, reliability, and more.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "boolean_flags",
+            "name": "Boolean feature flags",
+            "description": "Turn features on and off for specific users.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "persist_flags_cross_authentication",
+            "name": "Persist flags across authentication",
+            "description": "Persist feature flags across authentication events so that flag values don't change when an anonymous user logs in and becomes identified.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "feature_flag_payloads",
+            "name": "Payloads",
+            "description": "Send additional pieces of information (any valid JSON) to your app when a flag is matched for a user.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "multiple_release_conditions",
+            "name": "Multiple release conditions",
+            "description": "Target multiple groups of users with different release conditions for the same feature flag.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "release_condition_overrides",
+            "name": "Release condition overrides",
+            "description": "For any release condition, specify which flag value the users or groups in that condition should receive.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "targeting_by_group",
+            "name": "Flag targeting by groups",
+            "description": "Target feature flag release conditions by group properties, not just user properties.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "local_evaluation_and_bootstrapping",
+            "name": "Local evaluation & bootstrapping",
+            "description": "Bootstrap flags on initialization so all flags are available immediately, without having to make extra network requests.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "flag_usage_stats",
+            "name": "Flag usage stats",
+            "description": "See how many times a flag has been evaluated, how many times each variant has been returned, and what values users received.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "console_logs",
+            "name": "Console logs",
+            "description": "Diagnose issues by inspecting errors in the user's network console",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "recordings_playlists",
+            "name": "Recording playlists",
+            "description": "Create playlists of certain session recordings to easily find and watch them again in the future.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "recordings_performance",
+            "name": "Network performance on recordings",
+            "description": "See your end-user's network performance and information alongside session recordings.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "recordings_file_export",
+            "name": "Recordings file export",
+            "description": "Save session recordings as a file to your local filesystem.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "group_analytics",
+            "name": "Group analytics",
+            "description": "Associate events with a group - such as a company, community, or project - and analyze them in that context.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "dashboards",
+            "name": "Dashboards",
+            "description": "Save trends, funnels, and other insights for easy reference by your whole team.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "funnels",
+            "name": "Funnels",
+            "description": "Visualize user dropoff between a sequence of events.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "graphs_trends",
+            "name": "Graphs & trends",
+            "description": "Plot any number of events or actions over time.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "paths",
+            "name": "Paths",
+            "description": "Limited paths excludes: customizing path insights by setting the maximum number of paths, number of people on each path, how path names appear",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "subscriptions",
+            "name": "Insight & dashboard subscriptions",
+            "description": "Create a subscription for any insight or dashboard in PostHog to receive regular reports with their updates.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "paths_advanced",
+            "name": "Advanced paths",
+            "description": "Customize your path insights by setting the maximum number of paths, number of people on each path, and how path names should appear.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "dashboard_permissioning",
+            "name": "Dashboard permissions",
+            "description": "Restrict access to dashboards within the organization to only those who need it.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "dashboard_collaboration",
+            "name": "Tags & text cards",
+            "description": "Keep organized by adding tags to your dashboards, cohorts and more. Add text cards and descriptions to your dashboards to provide context to your team.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "ingestion_taxonomy",
+            "name": "Ingestion taxonomy",
+            "description": "Ingestion taxonomy",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "correlation_analysis",
+            "name": "Correlation analysis",
+            "description": "Automatically highlight significant factors that affect the conversion rate of users within a funnel.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "tagging",
+            "name": "Dashboard tags",
+            "description": "Organize dashboards with tags.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "behavioral_cohort_filtering",
+            "name": "Lifecycle cohorts",
+            "description": "Group users based on their long term behavior, such as whether they frequently performed an event, or have recently stopped performing an event.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "tracked_users",
+            "name": "Tracked users",
+            "description": "Track users across devices and sessions.",
+            "unit": null,
+            "limit": null,
+            "note": "Unlimited"
+        },
+        {
+            "key": "data_retention",
+            "name": "Data retention",
+            "description": "Keep a historical record of your data.",
+            "unit": null,
+            "limit": null,
+            "note": "7 years"
+        },
+        {
+            "key": "team_members",
+            "name": "Team members",
+            "description": "PostHog doesn't charge per seat add your entire team!",
+            "unit": null,
+            "limit": null,
+            "note": "Unlimited"
+        },
+        {
+            "key": "organizations_projects",
+            "name": "Projects",
+            "description": "Create silos of data within PostHog. All data belongs to a single project and all queries are project-specific.",
+            "unit": null,
+            "limit": null,
+            "note": "Unlimited"
+        },
+        {
+            "key": "api_access",
+            "name": "API access",
+            "description": "Access your data via our developer-friendly API.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "project_based_permissioning",
+            "name": "Project permissions",
+            "description": "Restrict access to data within the organization to only those who need it.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "social_sso",
+            "name": "SSO via Google, Github, or Gitlab",
+            "description": "Log in to PostHog with your Google, Github, or Gitlab account.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "sso_enforcement",
+            "name": "Enforce SSO login",
+            "description": "Users can only sign up and log in to your PostHog organization with your specified SSO provider.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "white_labelling",
+            "name": "White labeling",
+            "description": "Use your own branding in your PostHog organization.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "community_support",
+            "name": "Community support",
+            "description": "Get help from other users and PostHog team members in our Community forums.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "dedicated_support",
+            "name": "Slack (dedicated channel)",
+            "description": "Get help firectly from our support team in a dedicated Slack channel shared between you and the PostHog team.",
+            "unit": null,
+            "limit": null,
+            "note": "$2k/month spend or above"
+        },
+        {
+            "key": "email_support",
+            "name": "Direct access to engineers",
+            "description": "Get help directly from our product engineers via email. No wading through multiple support people before you get help.",
+            "unit": null,
+            "limit": null,
+            "note": null
+        },
+        {
+            "key": "terms_and_conditions",
+            "name": "Terms and conditions",
+            "description": "Terms and conditions",
+            "unit": null,
+            "limit": null,
+            "note": "Standard"
+        },
+        {
+            "key": "security_assessment",
+            "name": "Security assessment",
+            "description": "Security assessment",
+            "unit": null,
+            "limit": null,
+            "note": null
+        }
+    ],
+    "current_total_amount_usd": "543.72",
+    "current_total_amount_usd_after_discount": "543.72",
+    "products": [
+        {
+            "name": "Product analytics + data stack",
+            "description": "Trends, funnels, path analysis, CDP + more.",
+            "price_description": null,
+            "usage_key": "events",
+            "image_url": "https://posthog.com/images/product/product-icons/product-analytics.svg",
+            "icon_key": "IconGraph",
+            "docs_url": "https://posthog.com/docs/product-analytics",
+            "subscribed": true,
+            "plans": [],
+            "type": "product_analytics",
+            "free_allocation": 0,
+            "tiers": [
+                {
+                    "flat_amount_usd": "200",
+                    "unit_amount_usd": "0",
+                    "up_to": 5000000,
+                    "current_amount_usd": "200.00",
+                    "current_usage": 5000000,
+                    "projected_usage": 5000000,
+                    "projected_amount_usd": "200.00"
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.000075",
+                    "up_to": 25000000,
+                    "current_amount_usd": "343.72",
+                    "current_usage": 4582922,
+                    "projected_usage": 7082316,
+                    "projected_amount_usd": "531.17"
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.000005",
+                    "up_to": 50000000,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": 0,
+                    "projected_amount_usd": "0.00"
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.0000025",
+                    "up_to": null,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": 0,
+                    "projected_amount_usd": "0.00"
+                }
+            ],
+            "tiered": true,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": "543.72",
+            "current_amount_usd": "543.72",
+            "current_usage": 10101970,
+            "usage_limit": 13000000,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0.7770746153846154,
+            "projected_usage": 12082316,
+            "projected_amount_usd": "731.17",
+            "unit": "event",
+            "addons": [
+                {
+                    "name": "Group analytics",
+                    "description": "Associate events with a group or entity - such as a company, community, or project. Analyze these events as if they were sent by that entity itself. Great for B2B, marketplaces, and more.",
+                    "price_description": null,
+                    "image_url": "https://posthog.com/images/product/product-icons/group-analytics.svg",
+                    "icon_key": "IconPeople",
+                    "docs_url": "https://posthog.com/docs/product-analytics/group-analytics",
+                    "type": "group_analytics",
+                    "tiers": [],
+                    "tiered": false,
+                    "included_with_main_product": true,
+                    "subscribed": false,
+                    "unit": "event",
+                    "unit_amount_usd": null,
+                    "current_amount_usd": null,
+                    "current_usage": 0,
+                    "projected_usage": 0,
+                    "projected_amount_usd": null,
+                    "plans": [],
+                    "contact_support": false
+                }
+            ],
+            "contact_support": false,
+            "inclusion_only": false
+        },
+        {
+            "name": "Session replay",
+            "description": "Searchable recordings of people using your app or website with console logs and behavioral bucketing.",
+            "price_description": null,
+            "usage_key": "recordings",
+            "image_url": "https://posthog.com/images/product/product-icons/session-replay.svg",
+            "icon_key": "IconRewindPlay",
+            "docs_url": "https://posthog.com/docs/session-replay",
+            "subscribed": true,
+            "plans": [
+                {
+                    "plan_key": "free-20230117",
+                    "product_key": "session_replay",
+                    "name": "Session replay",
+                    "description": "Searchable recordings of people using your app or website with console logs and behavioral bucketing.",
+                    "image_url": "https://posthog.com/images/product/product-icons/session-replay.svg",
+                    "docs_url": "https://posthog.com/docs/session-replay",
+                    "note": null,
+                    "unit": "recording",
+                    "free_allocation": 15000,
+                    "features": [
+                        {
+                            "key": "console_logs",
+                            "name": "Console logs",
+                            "description": "Diagnose issues by inspecting errors in the user's network console",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "recordings_playlists",
+                            "name": "Recording playlists",
+                            "description": "Create playlists of certain session recordings to easily find and watch them again in the future.",
+                            "unit": "playlists",
+                            "limit": 5,
+                            "note": null
+                        }
+                    ],
+                    "tiers": null,
+                    "current_plan": false,
+                    "included_if": null
+                },
+                {
+                    "plan_key": "paid-20230117",
+                    "product_key": "session_replay",
+                    "name": "Session replay",
+                    "description": "Searchable recordings of people using your app or website with console logs and behavioral bucketing.",
+                    "image_url": "https://posthog.com/images/product/product-icons/session-replay.svg",
+                    "docs_url": "https://posthog.com/docs/session-replay",
+                    "note": null,
+                    "unit": "recording",
+                    "free_allocation": null,
+                    "features": [
+                        {
+                            "key": "console_logs",
+                            "name": "Console logs",
+                            "description": "Diagnose issues by inspecting errors in the user's network console",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "recordings_playlists",
+                            "name": "Recording playlists",
+                            "description": "Create playlists of certain session recordings to easily find and watch them again in the future.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "recordings_performance",
+                            "name": "Network performance on recordings",
+                            "description": "See your end-user's network performance and information alongside session recordings.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "recordings_file_export",
+                            "name": "Recordings file export",
+                            "description": "Save session recordings as a file to your local filesystem.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": [
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0",
+                            "up_to": 15000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.005",
+                            "up_to": 50000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.0045",
+                            "up_to": 150000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.004",
+                            "up_to": 500000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.0035",
+                            "up_to": null,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        }
+                    ],
+                    "current_plan": true,
+                    "included_if": null
+                }
+            ],
+            "type": "session_replay",
+            "free_allocation": 0,
+            "tiers": [
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0",
+                    "up_to": 15000,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": null,
+                    "projected_amount_usd": null
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.005",
+                    "up_to": 50000,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": null,
+                    "projected_amount_usd": null
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.0045",
+                    "up_to": 150000,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": null,
+                    "projected_amount_usd": null
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.004",
+                    "up_to": 500000,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": null,
+                    "projected_amount_usd": null
+                },
+                {
+                    "flat_amount_usd": "0",
+                    "unit_amount_usd": "0.0035",
+                    "up_to": null,
+                    "current_amount_usd": "0.00",
+                    "current_usage": 0,
+                    "projected_usage": null,
+                    "projected_amount_usd": null
+                }
+            ],
+            "tiered": true,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": "0.00",
+            "current_amount_usd": "0.00",
+            "current_usage": 0,
+            "usage_limit": 15000,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0.0,
+            "projected_usage": 0,
+            "projected_amount_usd": "0.00",
+            "unit": "recording",
+            "addons": [],
+            "contact_support": false,
+            "inclusion_only": false
+        },
+        {
+            "name": "Feature flags & A/B testing",
+            "description": "Safely roll out new features and run experiments on changes.",
+            "price_description": null,
+            "usage_key": "feature_flag_requests",
+            "image_url": "https://posthog.com/images/product/product-icons/feature-flags.svg",
+            "icon_key": "IconToggle",
+            "docs_url": "https://posthog.com/docs/feature-flags",
+            "subscribed": false,
+            "plans": [
+                {
+                    "plan_key": "free-20230712",
+                    "product_key": "feature_flags",
+                    "name": "Feature flags & A/B testing",
+                    "description": "Safely roll out new features and run experiments on changes.",
+                    "image_url": "https://posthog.com/images/product/product-icons/feature-flags.svg",
+                    "docs_url": "https://posthog.com/docs/feature-flags",
+                    "note": null,
+                    "unit": "request",
+                    "free_allocation": 10000000,
+                    "features": [
+                        {
+                            "key": "boolean_flags",
+                            "name": "Boolean feature flags",
+                            "description": "Turn features on and off for specific users.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "persist_flags_cross_authentication",
+                            "name": "Persist flags across authentication",
+                            "description": "Persist feature flags across authentication events so that flag values don't change when an anonymous user logs in and becomes identified.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "feature_flag_payloads",
+                            "name": "Payloads",
+                            "description": "Send additional pieces of information (any valid JSON) to your app when a flag is matched for a user.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "multiple_release_conditions",
+                            "name": "Multiple release conditions",
+                            "description": "Target multiple groups of users with different release conditions for the same feature flag.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "release_condition_overrides",
+                            "name": "Release condition overrides",
+                            "description": "For any release condition, specify which flag value the users or groups in that condition should receive.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "targeting_by_group",
+                            "name": "Flag targeting by groups",
+                            "description": "Target feature flag release conditions by group properties, not just user properties.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "local_evaluation_and_bootstrapping",
+                            "name": "Local evaluation & bootstrapping",
+                            "description": "Bootstrap flags on initialization so all flags are available immediately, without having to make extra network requests.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "flag_usage_stats",
+                            "name": "Flag usage stats",
+                            "description": "See how many times a flag has been evaluated, how many times each variant has been returned, and what values users received.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": null,
+                    "current_plan": true,
+                    "included_if": null
+                },
+                {
+                    "plan_key": "paid-20230712",
+                    "product_key": "feature_flags",
+                    "name": "Feature flags & A/B testing",
+                    "description": "Safely roll out new features and run experiments on changes.",
+                    "image_url": "https://posthog.com/images/product/product-icons/feature-flags.svg",
+                    "docs_url": "https://posthog.com/docs/feature-flags",
+                    "note": null,
+                    "unit": "request",
+                    "free_allocation": null,
+                    "features": [
+                        {
+                            "key": "boolean_flags",
+                            "name": "Boolean feature flags",
+                            "description": "Turn features on and off for specific users.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "multivariate_flags",
+                            "name": "Multivariate feature flags & experiments",
+                            "description": "Create three or more variants of a feature flag to test or release different versions of a feature.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "persist_flags_cross_authentication",
+                            "name": "Persist flags across authentication",
+                            "description": "Persist feature flags across authentication events so that flag values don't change when an anonymous user logs in and becomes identified.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "feature_flag_payloads",
+                            "name": "Payloads",
+                            "description": "Send additional pieces of information (any valid JSON) to your app when a flag is matched for a user.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "multiple_release_conditions",
+                            "name": "Multiple release conditions",
+                            "description": "Target multiple groups of users with different release conditions for the same feature flag.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "release_condition_overrides",
+                            "name": "Release condition overrides",
+                            "description": "For any release condition, specify which flag value the users or groups in that condition should receive.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "targeting_by_group",
+                            "name": "Flag targeting by groups",
+                            "description": "Target feature flag release conditions by group properties, not just user properties.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "local_evaluation_and_bootstrapping",
+                            "name": "Local evaluation & bootstrapping",
+                            "description": "Bootstrap flags on initialization so all flags are available immediately, without having to make extra network requests.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "flag_usage_stats",
+                            "name": "Flag usage stats",
+                            "description": "See how many times a flag has been evaluated, how many times each variant has been returned, and what values users received.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "experimentation",
+                            "name": "A/B testing",
+                            "description": "Test changes to your product and evaluate the impacts those changes make.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "group_experiments",
+                            "name": "Group experiments",
+                            "description": "Target experiments to specific groups of users so everyone in the same group gets the same variant.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "funnel_experiments",
+                            "name": "Funnel & trend experiments",
+                            "description": "Measure the impact of a change on a aggregate values or a series of events, like a signup flow.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "secondary_metrics",
+                            "name": "Secondary experiment metrics",
+                            "description": "Track additional metrics to see how your experiment affects other parts of your app or different flows.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "statistical_analysis",
+                            "name": "Statistical analysis",
+                            "description": "Get a statistical analysis of your experiment results to see if the results are significant, or if they're likely just due to chance.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": [
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0",
+                            "up_to": 10000000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.000025",
+                            "up_to": 50000000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.00001",
+                            "up_to": null,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        }
+                    ],
+                    "current_plan": false,
+                    "included_if": null
+                }
+            ],
+            "type": "feature_flags",
+            "free_allocation": 10000000,
+            "tiers": null,
+            "tiered": true,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": null,
+            "current_amount_usd": null,
+            "current_usage": 4576,
+            "usage_limit": 10000000,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0.0004576,
+            "projected_usage": 5603,
+            "projected_amount_usd": null,
+            "unit": "request",
+            "addons": [],
+            "contact_support": false,
+            "inclusion_only": false
+        },
+        {
+            "name": "Surveys",
+            "description": "Collect feedback from your users. Multiple choice, rating, open text, and more.",
+            "price_description": null,
+            "usage_key": "survey_responses",
+            "image_url": "https://posthog.com/images/product/product-icons/surveys.svg",
+            "icon_key": "IconMessage",
+            "docs_url": "https://posthog.com/docs/surveys",
+            "subscribed": false,
+            "plans": [
+                {
+                    "plan_key": "free-20230928-beta-users",
+                    "product_key": "surveys",
+                    "name": "Surveys",
+                    "description": "Collect feedback from your users. Multiple choice, rating, open text, and more.",
+                    "image_url": "https://posthog.com/images/product/product-icons/surveys.svg",
+                    "docs_url": "https://posthog.com/docs/surveys",
+                    "note": null,
+                    "unit": "survey response",
+                    "free_allocation": 1000,
+                    "features": [
+                        {
+                            "key": "surveys_unlimited_surveys",
+                            "name": "Unlimited surveys",
+                            "description": "Create as many surveys as you want.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_all_question_types",
+                            "name": "All question types",
+                            "description": "Rating scale (for NPS and the like), multiple choice, single choice, emoji rating, link, free text.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_user_targeting",
+                            "name": "User property targeting",
+                            "description": "Target users based on any of their user properties.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_user_sampling",
+                            "name": "User sampling",
+                            "description": "Sample users to only survey a portion of the users who match the criteria.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_styling",
+                            "name": "Custom colors & positioning",
+                            "description": "Customize the colors of your surveys to match your brand and set survey position.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_text_html",
+                            "name": "Custom HTML text",
+                            "description": "Add custom HTML to your survey text.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_api_mode",
+                            "name": "API mode",
+                            "description": "Create surveys via the API.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_results_analysis",
+                            "name": "Results analysis",
+                            "description": "Analyze your survey results including completion rates and drop offs.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_templates",
+                            "name": "Templates",
+                            "description": "Use our templates to get started quickly with NPS, customer satisfaction surveys, user interviews, and more.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": null,
+                    "current_plan": true,
+                    "included_if": null
+                },
+                {
+                    "plan_key": "paid-20230928-beta-users",
+                    "product_key": "surveys",
+                    "name": "Surveys",
+                    "description": "Collect feedback from your users. Multiple choice, rating, open text, and more.",
+                    "image_url": "https://posthog.com/images/product/product-icons/surveys.svg",
+                    "docs_url": "https://posthog.com/docs/surveys",
+                    "note": null,
+                    "unit": "survey response",
+                    "free_allocation": null,
+                    "features": [
+                        {
+                            "key": "surveys_unlimited_surveys",
+                            "name": "Unlimited surveys",
+                            "description": "Create as many surveys as you want.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_all_question_types",
+                            "name": "All question types",
+                            "description": "Rating scale (for NPS and the like), multiple choice, single choice, emoji rating, link, free text.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_multiple_questions",
+                            "name": "Multiple questions",
+                            "description": "Create multiple questions in a single survey.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_user_targeting",
+                            "name": "User property targeting",
+                            "description": "Target users based on any of their user properties.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_user_sampling",
+                            "name": "User sampling",
+                            "description": "Sample users to only survey a portion of the users who match the criteria.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_styling",
+                            "name": "Custom colors & positioning",
+                            "description": "Customize the colors of your surveys to match your brand and set survey position.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_text_html",
+                            "name": "Custom HTML text",
+                            "description": "Add custom HTML to your survey text.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_api_mode",
+                            "name": "API mode",
+                            "description": "Create surveys via the API.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_results_analysis",
+                            "name": "Results analysis",
+                            "description": "Analyze your survey results including completion rates and drop offs.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "surveys_templates",
+                            "name": "Templates",
+                            "description": "Use our templates to get started quickly with NPS, customer satisfaction surveys, user interviews, and more.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": [
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0",
+                            "up_to": 1000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.035",
+                            "up_to": 10000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.015",
+                            "up_to": 20000,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        },
+                        {
+                            "flat_amount_usd": "0",
+                            "unit_amount_usd": "0.01",
+                            "up_to": null,
+                            "current_amount_usd": "0.00",
+                            "current_usage": 0,
+                            "projected_usage": null,
+                            "projected_amount_usd": null
+                        }
+                    ],
+                    "current_plan": false,
+                    "included_if": null
+                }
+            ],
+            "type": "surveys",
+            "free_allocation": 1000,
+            "tiers": null,
+            "tiered": true,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": null,
+            "current_amount_usd": null,
+            "current_usage": 8,
+            "usage_limit": 1000,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0.008,
+            "projected_usage": 10,
+            "projected_amount_usd": null,
+            "unit": "survey response",
+            "addons": [],
+            "contact_support": false,
+            "inclusion_only": false
+        },
+        {
+            "name": "Integrations + CDP",
+            "description": "Connect PostHog to your favorite tools.",
+            "price_description": null,
+            "usage_key": null,
+            "image_url": "https://posthog.com/images/product/product-icons/integrations.svg",
+            "icon_key": "IconBolt",
+            "docs_url": "https://posthog.com/docs/apps",
+            "subscribed": null,
+            "plans": [
+                {
+                    "plan_key": "free-20230117",
+                    "product_key": "integrations",
+                    "name": "Integrations + CDP",
+                    "description": "Connect PostHog to your favorite tools.",
+                    "image_url": "https://posthog.com/images/product/product-icons/integrations.svg",
+                    "docs_url": "https://posthog.com/docs/apps",
+                    "note": null,
+                    "unit": null,
+                    "free_allocation": null,
+                    "features": [
+                        {
+                            "key": "zapier",
+                            "name": "Zapier",
+                            "description": "Zapier lets you connect PostHog with thousands of the most popular apps, so you can automate your work and have more time for what matters most—no code required.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "slack_integration",
+                            "name": "Slack",
+                            "description": "Get notified about new actions in Slack.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "microsoft_teams_integration",
+                            "name": "Microsoft Teams",
+                            "description": "Get notified about new actions in Microsoft Teams.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "discord_integration",
+                            "name": "Discord",
+                            "description": "Get notified about new actions in Discord.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "apps",
+                            "name": "CDP + Apps library",
+                            "description": "Connect your data with 50+ apps including BigQuery, Redshift, and more.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": null,
+                    "current_plan": false,
+                    "included_if": "no_active_subscription"
+                },
+                {
+                    "plan_key": "paid-20230117",
+                    "product_key": "integrations",
+                    "name": "Integrations + CDP",
+                    "description": "Connect PostHog to your favorite tools.",
+                    "image_url": "https://posthog.com/images/product/product-icons/integrations.svg",
+                    "docs_url": "https://posthog.com/docs/apps",
+                    "note": null,
+                    "unit": null,
+                    "free_allocation": null,
+                    "features": [
+                        {
+                            "key": "zapier",
+                            "name": "Zapier",
+                            "description": "Zapier lets you connect PostHog with thousands of the most popular apps, so you can automate your work and have more time for what matters most—no code required.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "slack_integration",
+                            "name": "Slack",
+                            "description": "Get notified about new actions in Slack.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "microsoft_teams_integration",
+                            "name": "Microsoft Teams",
+                            "description": "Get notified about new actions in Microsoft Teams.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "discord_integration",
+                            "name": "Discord",
+                            "description": "Get notified about new actions in Discord.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "apps",
+                            "name": "CDP + Apps library",
+                            "description": "Connect your data with 50+ apps including BigQuery, Redshift, and more.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        },
+                        {
+                            "key": "app_metrics",
+                            "name": "App metrics",
+                            "description": "Get metrics on your apps to see their usage, reliability, and more.",
+                            "unit": null,
+                            "limit": null,
+                            "note": null
+                        }
+                    ],
+                    "tiers": null,
+                    "current_plan": true,
+                    "included_if": "has_subscription"
+                }
+            ],
+            "type": "integrations",
+            "free_allocation": 0,
+            "tiers": null,
+            "tiered": false,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": null,
+            "current_amount_usd": null,
+            "current_usage": 0,
+            "usage_limit": 0,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0,
+            "projected_usage": 0,
+            "projected_amount_usd": null,
+            "unit": null,
+            "addons": [],
+            "contact_support": false,
+            "inclusion_only": true
+        },
+        {
+            "name": "Platform and support",
+            "description": "SSO, permission management, and support.",
+            "price_description": null,
+            "usage_key": null,
+            "image_url": "https://posthog.com/images/product/product-icons/platform.svg",
+            "icon_key": "IconStack",
+            "docs_url": "https://posthog.com/docs",
+            "subscribed": null,
+            "plans": [],
+            "type": "platform_and_support",
+            "free_allocation": 0,
+            "tiers": null,
+            "tiered": false,
+            "unit_amount_usd": null,
+            "current_amount_usd_before_addons": null,
+            "current_amount_usd": null,
+            "current_usage": 0,
+            "usage_limit": 0,
+            "has_exceeded_limit": false,
+            "percentage_usage": 0,
+            "projected_usage": 0,
+            "projected_amount_usd": null,
+            "unit": null,
+            "addons": [],
+            "contact_support": true,
+            "inclusion_only": true
+        }
+    ],
+    "custom_limits_usd": {
+        "session_replay": "0",
+        "product_analytics": "800"
+    },
+    "usage_summary": {
+        "events": {
+            "usage": 9582922,
+            "limit": 13000000
+        },
+        "recordings": {
+            "usage": 0,
+            "limit": 15000
+        },
+        "feature_flag_requests": {
+            "usage": 4576,
+            "limit": 10000000
+        },
+        "survey_responses": {
+            "usage": 8,
+            "limit": 1000
+        }
+    },
+    "free_trial_until": null,
+    "discount_percent": null,
+    "discount_amount_usd": null,
+    "amount_off_expires_at": null,
+    "never_drop_data": false,
+    "stripe_portal_url": "https://billing.stripe.com/p/session/live_YWNjdF8xSElNRERFdUlhdFJYU2R6LF9PeG9wUmZuUFpmcTlvaWVjeUd0ZlhFN2hHbjJUWDR30100sm6GDMjx"
+}
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/dataTableEvents.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/dataTableEvents.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/dataTableEvents.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/dataTableEvents.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/dataTableHogQL.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/dataTableHogQL.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/dataTableHogQL.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/dataTableHogQL.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelHistoricalTrends.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelHistoricalTrends.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelHistoricalTrends.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelHistoricalTrends.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRightBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRightBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTimeToConvert.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTimeToConvert.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTimeToConvert.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTimeToConvert.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottomBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottomBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/lifecycle.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/lifecycle.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/lifecycle.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/lifecycle.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/retention.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/retention.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/retention.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/retention.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/retentionBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/retentionBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/retentionBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/retentionBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/stickiness.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/stickiness.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/stickiness.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/stickiness.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsArea.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsArea.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsArea.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsArea.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsAreaBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsAreaBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsAreaBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsAreaBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsBar.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsBar.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsBar.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsBar.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsCumulative.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsCumulative.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsCumulative.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsCumulative.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsCumulativeBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsCumulativeBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsCumulativeBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsCumulativeBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsLine.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLine.json
similarity index 91%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsLine.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLine.json
index 25e5eef647f8ff..a24784a3490d13 100644
--- a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsLine.json
+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLine.json
@@ -4,37 +4,22 @@
     "name": "",
     "derived_name": "Pageview count",
     "filters": {
+        "display": "ActionsLineGraph",
         "events": [
             {
                 "id": "$pageview",
-                "name": "$pageview",
-                "type": "events",
-                "order": 0
-            },
-            {
-                "id": "$geoip_country_name",
-                "name": "$geoip_country_name",
                 "type": "events",
-                "order": 0
+                "order": 0,
+                "name": "$pageview",
+                "custom_name": null,
+                "math": null,
+                "math_property": null,
+                "math_group_type_index": null,
+                "properties": {}
             }
         ],
-        "actions": [],
-        "display": "ActionsLineGraph",
         "insight": "TRENDS",
-        "interval": "day",
-        "properties": {
-            "type": "AND",
-            "values": [
-                {
-                    "type": "AND",
-                    "values": [
-                        { "key": "$browser", "value": ["Chrome"], "operator": "exact", "type": "event" },
-                        { "key": "utm_source", "value": ["google"], "operator": "exact", "type": "event" }
-                    ]
-                }
-            ]
-        },
-        "filter_test_accounts": false
+        "interval": "day"
     },
     "filters_hash": "cache_42127776c1709f7c4209cea8925faefd",
     "order": null,
@@ -163,8 +148,6 @@
                 }
             ],
             "filter": {
-                "date_from": "2022-03-04T00:00:00+00:00",
-                "date_to": "2022-03-11T01:44:36.488058+00:00",
                 "display": "ActionsLineGraph",
                 "events": [
                     {
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json
new file mode 100644
index 00000000000000..1e1a410da23a48
--- /dev/null
+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json
@@ -0,0 +1,637 @@
+{
+    "id": 75,
+    "short_id": "ZzKvMiTK",
+    "name": "",
+    "derived_name": "Pageview count & Rageclick count & All events count",
+    "filters": {
+        "events": [
+            {
+                "id": "$pageview",
+                "math": "total",
+                "name": "$pageview",
+                "type": "events",
+                "order": 0
+            },
+            {
+                "id": "$rageclick",
+                "math": "total",
+                "name": "$rageclick",
+                "type": "events",
+                "order": 1
+            },
+            {
+                "id": null,
+                "math": "total",
+                "name": "All events",
+                "type": "events",
+                "order": 2
+            }
+        ],
+        "date_to": "2023-07-10",
+        "display": "ActionsLineGraph",
+        "insight": "TRENDS",
+        "interval": "day",
+        "date_from": "2023-07-03",
+        "entity_type": "events",
+        "filter_test_accounts": true
+    },
+    "query": null,
+    "order": null,
+    "deleted": false,
+    "dashboards": [],
+    "dashboard_tiles": [],
+    "last_refresh": "2023-11-06T10:50:47.286941Z",
+    "next_allowed_client_refresh": "2023-11-06T11:05:47.286941Z",
+    "result": [
+        {
+            "action": {
+                "id": "$pageview",
+                "type": "events",
+                "order": 0,
+                "name": "$pageview",
+                "custom_name": null,
+                "math": "total",
+                "math_property": null,
+                "math_hogql": null,
+                "math_group_type_index": null,
+                "properties": {}
+            },
+            "label": "$pageview",
+            "count": 702,
+            "data": [85, 77, 82, 84, 85, 96, 79, 114],
+            "labels": [
+                "3-Jul-2023",
+                "4-Jul-2023",
+                "5-Jul-2023",
+                "6-Jul-2023",
+                "7-Jul-2023",
+                "8-Jul-2023",
+                "9-Jul-2023",
+                "10-Jul-2023"
+            ],
+            "days": [
+                "2023-07-03",
+                "2023-07-04",
+                "2023-07-05",
+                "2023-07-06",
+                "2023-07-07",
+                "2023-07-08",
+                "2023-07-09",
+                "2023-07-10"
+            ],
+            "persons_urls": [
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-03T00:00:00Z",
+                        "date_to": "2023-07-03T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-03T00%3A00%3A00%2B00%3A00&date_to=2023-07-03T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-04T00:00:00Z",
+                        "date_to": "2023-07-04T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-04T00%3A00%3A00%2B00%3A00&date_to=2023-07-04T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-05T00:00:00Z",
+                        "date_to": "2023-07-05T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-05T00%3A00%3A00%2B00%3A00&date_to=2023-07-05T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-06T00:00:00Z",
+                        "date_to": "2023-07-06T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-06T00%3A00%3A00%2B00%3A00&date_to=2023-07-06T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-07T00:00:00Z",
+                        "date_to": "2023-07-07T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-07T00%3A00%3A00%2B00%3A00&date_to=2023-07-07T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-08T00:00:00Z",
+                        "date_to": "2023-07-08T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-08T00%3A00%3A00%2B00%3A00&date_to=2023-07-08T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-09T00:00:00Z",
+                        "date_to": "2023-07-09T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-09T00%3A00%3A00%2B00%3A00&date_to=2023-07-09T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$pageview",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-10T00:00:00Z",
+                        "date_to": "2023-07-10T23:59:59.999999Z",
+                        "entity_order": 0
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-10T00%3A00%3A00%2B00%3A00&date_to=2023-07-10T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24pageview&entity_math=total&entity_order=0&cache_invalidation_key=8uR5j88g"
+                }
+            ],
+            "filter": {
+                "breakdown_attribution_type": "first_touch",
+                "breakdown_normalize_url": false,
+                "date_from": "2023-07-03",
+                "date_to": "2023-07-10",
+                "display": "ActionsLineGraph",
+                "events": [
+                    {
+                        "id": "$pageview",
+                        "type": "events",
+                        "order": 0,
+                        "name": "$pageview",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": "$rageclick",
+                        "type": "events",
+                        "order": 1,
+                        "name": "$rageclick",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": null,
+                        "type": "events",
+                        "order": 2,
+                        "name": "All events",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    }
+                ],
+                "entity_type": "events",
+                "insight": "TRENDS",
+                "interval": "day",
+                "properties": {
+                    "type": "AND",
+                    "values": [
+                        {
+                            "key": "id",
+                            "type": "precalculated-cohort",
+                            "value": 2
+                        }
+                    ]
+                },
+                "sampling_factor": "",
+                "smoothing_intervals": 1
+            }
+        },
+        {
+            "action": {
+                "id": "$rageclick",
+                "type": "events",
+                "order": 1,
+                "name": "$rageclick",
+                "custom_name": null,
+                "math": "total",
+                "math_property": null,
+                "math_hogql": null,
+                "math_group_type_index": null,
+                "properties": {}
+            },
+            "label": "$rageclick",
+            "count": 0,
+            "data": [0, 0, 0, 0, 0, 0, 0, 0],
+            "labels": [
+                "3-Jul-2023",
+                "4-Jul-2023",
+                "5-Jul-2023",
+                "6-Jul-2023",
+                "7-Jul-2023",
+                "8-Jul-2023",
+                "9-Jul-2023",
+                "10-Jul-2023"
+            ],
+            "days": [
+                "2023-07-03",
+                "2023-07-04",
+                "2023-07-05",
+                "2023-07-06",
+                "2023-07-07",
+                "2023-07-08",
+                "2023-07-09",
+                "2023-07-10"
+            ],
+            "persons_urls": [
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-03T00:00:00Z",
+                        "date_to": "2023-07-03T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-03T00%3A00%3A00%2B00%3A00&date_to=2023-07-03T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-04T00:00:00Z",
+                        "date_to": "2023-07-04T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-04T00%3A00%3A00%2B00%3A00&date_to=2023-07-04T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-05T00:00:00Z",
+                        "date_to": "2023-07-05T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-05T00%3A00%3A00%2B00%3A00&date_to=2023-07-05T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-06T00:00:00Z",
+                        "date_to": "2023-07-06T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-06T00%3A00%3A00%2B00%3A00&date_to=2023-07-06T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-07T00:00:00Z",
+                        "date_to": "2023-07-07T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-07T00%3A00%3A00%2B00%3A00&date_to=2023-07-07T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-08T00:00:00Z",
+                        "date_to": "2023-07-08T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-08T00%3A00%3A00%2B00%3A00&date_to=2023-07-08T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-09T00:00:00Z",
+                        "date_to": "2023-07-09T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-09T00%3A00%3A00%2B00%3A00&date_to=2023-07-09T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                },
+                {
+                    "filter": {
+                        "entity_id": "$rageclick",
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-10T00:00:00Z",
+                        "date_to": "2023-07-10T23:59:59.999999Z",
+                        "entity_order": 1
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-10T00%3A00%3A00%2B00%3A00&date_to=2023-07-10T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_id=%24rageclick&entity_math=total&entity_order=1&cache_invalidation_key=o5IvdVHO"
+                }
+            ],
+            "filter": {
+                "breakdown_attribution_type": "first_touch",
+                "breakdown_normalize_url": false,
+                "date_from": "2023-07-03",
+                "date_to": "2023-07-10",
+                "display": "ActionsLineGraph",
+                "events": [
+                    {
+                        "id": "$pageview",
+                        "type": "events",
+                        "order": 0,
+                        "name": "$pageview",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": "$rageclick",
+                        "type": "events",
+                        "order": 1,
+                        "name": "$rageclick",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": null,
+                        "type": "events",
+                        "order": 2,
+                        "name": "All events",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    }
+                ],
+                "entity_type": "events",
+                "insight": "TRENDS",
+                "interval": "day",
+                "properties": {
+                    "type": "AND",
+                    "values": [
+                        {
+                            "key": "id",
+                            "type": "precalculated-cohort",
+                            "value": 2
+                        }
+                    ]
+                },
+                "sampling_factor": "",
+                "smoothing_intervals": 1
+            }
+        },
+        {
+            "action": {
+                "id": null,
+                "type": "events",
+                "order": 2,
+                "name": "All events",
+                "custom_name": null,
+                "math": "total",
+                "math_property": null,
+                "math_hogql": null,
+                "math_group_type_index": null,
+                "properties": {}
+            },
+            "label": "All events",
+            "count": 1598,
+            "data": [192, 174, 186, 185, 202, 217, 178, 264],
+            "labels": [
+                "3-Jul-2023",
+                "4-Jul-2023",
+                "5-Jul-2023",
+                "6-Jul-2023",
+                "7-Jul-2023",
+                "8-Jul-2023",
+                "9-Jul-2023",
+                "10-Jul-2023"
+            ],
+            "days": [
+                "2023-07-03",
+                "2023-07-04",
+                "2023-07-05",
+                "2023-07-06",
+                "2023-07-07",
+                "2023-07-08",
+                "2023-07-09",
+                "2023-07-10"
+            ],
+            "persons_urls": [
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-03T00:00:00Z",
+                        "date_to": "2023-07-03T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-03T00%3A00%3A00%2B00%3A00&date_to=2023-07-03T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-04T00:00:00Z",
+                        "date_to": "2023-07-04T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-04T00%3A00%3A00%2B00%3A00&date_to=2023-07-04T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-05T00:00:00Z",
+                        "date_to": "2023-07-05T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-05T00%3A00%3A00%2B00%3A00&date_to=2023-07-05T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-06T00:00:00Z",
+                        "date_to": "2023-07-06T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-06T00%3A00%3A00%2B00%3A00&date_to=2023-07-06T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-07T00:00:00Z",
+                        "date_to": "2023-07-07T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-07T00%3A00%3A00%2B00%3A00&date_to=2023-07-07T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-08T00:00:00Z",
+                        "date_to": "2023-07-08T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-08T00%3A00%3A00%2B00%3A00&date_to=2023-07-08T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-09T00:00:00Z",
+                        "date_to": "2023-07-09T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-09T00%3A00%3A00%2B00%3A00&date_to=2023-07-09T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                },
+                {
+                    "filter": {
+                        "entity_id": null,
+                        "entity_type": "events",
+                        "entity_math": "total",
+                        "date_from": "2023-07-10T00:00:00Z",
+                        "date_to": "2023-07-10T23:59:59.999999Z",
+                        "entity_order": 2
+                    },
+                    "url": "api/projects/1/persons/trends/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=2023-07-10T00%3A00%3A00%2B00%3A00&date_to=2023-07-10T23%3A59%3A59.999999%2B00%3A00&display=ActionsLineGraph&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24rageclick%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24rageclick%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+null%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22All+events%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+%22total%22%2C+%22math_property%22%3A+null%2C+%22math_hogql%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&entity_type=events&insight=TRENDS&interval=day&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&sampling_factor=&smoothing_intervals=1&entity_math=total&entity_order=2&cache_invalidation_key=ZOGpDIEg"
+                }
+            ],
+            "filter": {
+                "breakdown_attribution_type": "first_touch",
+                "breakdown_normalize_url": false,
+                "date_from": "2023-07-03",
+                "date_to": "2023-07-10",
+                "display": "ActionsLineGraph",
+                "events": [
+                    {
+                        "id": "$pageview",
+                        "type": "events",
+                        "order": 0,
+                        "name": "$pageview",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": "$rageclick",
+                        "type": "events",
+                        "order": 1,
+                        "name": "$rageclick",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    },
+                    {
+                        "id": null,
+                        "type": "events",
+                        "order": 2,
+                        "name": "All events",
+                        "custom_name": null,
+                        "math": "total",
+                        "math_property": null,
+                        "math_hogql": null,
+                        "math_group_type_index": null,
+                        "properties": {}
+                    }
+                ],
+                "entity_type": "events",
+                "insight": "TRENDS",
+                "interval": "day",
+                "properties": {
+                    "type": "AND",
+                    "values": [
+                        {
+                            "key": "id",
+                            "type": "precalculated-cohort",
+                            "value": 2
+                        }
+                    ]
+                },
+                "sampling_factor": "",
+                "smoothing_intervals": 1
+            }
+        }
+    ],
+    "created_at": "2023-11-06T10:51:27.097499Z",
+    "created_by": {
+        "id": 1,
+        "uuid": "018a92f8-b5a3-0000-5af3-ef9c18b7af66",
+        "distinct_id": "krRfgopsUy1TwNU1yhSDLqNDTd6N5tMZrHlm8nLJIDI",
+        "first_name": "Employee 427",
+        "email": "test@posthog.com",
+        "is_email_verified": null
+    },
+    "description": "",
+    "updated_at": "2023-11-06T10:51:27.097614Z",
+    "favorited": false,
+    "saved": true,
+    "last_modified_at": "2023-11-06T10:51:27.096743Z",
+    "last_modified_by": {
+        "id": 1,
+        "uuid": "018a92f8-b5a3-0000-5af3-ef9c18b7af66",
+        "distinct_id": "krRfgopsUy1TwNU1yhSDLqNDTd6N5tMZrHlm8nLJIDI",
+        "first_name": "Employee 427",
+        "email": "test@posthog.com",
+        "is_email_verified": null
+    },
+    "is_sample": false,
+    "effective_restriction_level": 21,
+    "effective_privilege_level": 37,
+    "timezone": "UTC",
+    "is_cached": true,
+    "tags": [],
+    "filters_hash": "cache_b53c35f102234cbe71094050b19539e3"
+}
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsNumber.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsNumber.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsNumber.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsNumber.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsPie.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsPie.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsPie.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsPie.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsTable.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsTable.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsTable.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsTable.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsTableBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsTableBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsTableBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsTableBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsValue.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsValue.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsValue.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsValue.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsValueBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsValueBreakdown.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsValueBreakdown.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsValueBreakdown.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json
diff --git a/frontend/src/mocks/fixtures/api/projects/:team_id/insights/userPaths.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/userPaths.json
similarity index 100%
rename from frontend/src/mocks/fixtures/api/projects/:team_id/insights/userPaths.json
rename to frontend/src/mocks/fixtures/api/projects/team_id/insights/userPaths.json
diff --git a/frontend/src/models/actionsModel.ts b/frontend/src/models/actionsModel.ts
index 28644a1f07f15b..72735d29555b8d 100644
--- a/frontend/src/models/actionsModel.ts
+++ b/frontend/src/models/actionsModel.ts
@@ -4,6 +4,7 @@ import api from 'lib/api'
 import { ActionType } from '~/types'
 import type { actionsModelType } from './actionsModelType'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 export interface ActionsModelProps {
     params?: string
@@ -57,4 +58,5 @@ export const actionsModel = kea<actionsModelType>([
             }
         },
     })),
+    permanentlyMount(),
 ])
diff --git a/frontend/src/models/annotationsModel.ts b/frontend/src/models/annotationsModel.ts
index 4700faa73d1936..d193e56cee6b36 100644
--- a/frontend/src/models/annotationsModel.ts
+++ b/frontend/src/models/annotationsModel.ts
@@ -6,6 +6,7 @@ import { RawAnnotationType, AnnotationType } from '~/types'
 import { loaders } from 'kea-loaders'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
 import { dayjsUtcToTimezone } from 'lib/dayjs'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 export type AnnotationData = Pick<RawAnnotationType, 'date_marker' | 'scope' | 'content' | 'dashboard_item'>
 export type AnnotationDataWithoutInsight = Omit<AnnotationData, 'dashboard_item'>
@@ -125,4 +126,5 @@ export const annotationsModel = kea<annotationsModelType>([
             actions.loadAnnotations()
         }
     }),
+    permanentlyMount(),
 ])
diff --git a/frontend/src/models/cohortsModel.ts b/frontend/src/models/cohortsModel.ts
index 841bcad73f1a48..6e1d00525a766d 100644
--- a/frontend/src/models/cohortsModel.ts
+++ b/frontend/src/models/cohortsModel.ts
@@ -1,5 +1,5 @@
 import { loaders } from 'kea-loaders'
-import { kea, path, connect, actions, reducers, selectors, listeners, events } from 'kea'
+import { kea, path, connect, actions, reducers, selectors, listeners, beforeUnmount, afterMount } from 'kea'
 import api from 'lib/api'
 import type { cohortsModelType } from './cohortsModelType'
 import { CohortType, ExporterFormat } from '~/types'
@@ -7,6 +7,8 @@ import { personsLogic } from 'scenes/persons/personsLogic'
 import { deleteWithUndo, processCohort } from 'lib/utils'
 import { triggerExport } from 'lib/components/ExportButton/exporter'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
+import Fuse from 'fuse.js'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 const POLL_TIMEOUT = 5000
 
@@ -47,7 +49,7 @@ export const cohortsModel = kea<cohortsModelType>([
                 }
                 return [...state].map((existingCohort) => (existingCohort.id === cohort.id ? cohort : existingCohort))
             },
-            cohortCreated: (state = [], { cohort }) => {
+            cohortCreated: (state, { cohort }) => {
                 if (!cohort) {
                     return state
                 }
@@ -68,6 +70,18 @@ export const cohortsModel = kea<cohortsModelType>([
             (cohorts): Partial<Record<string | number, CohortType>> =>
                 Object.fromEntries(cohorts.map((cohort) => [cohort.id, cohort])),
         ],
+
+        cohortsSearch: [
+            (s) => [s.cohorts],
+            (cohorts): ((term: string) => CohortType[]) => {
+                const fuse = new Fuse<CohortType>(cohorts ?? [], {
+                    keys: ['name'],
+                    threshold: 0.3,
+                })
+
+                return (term) => fuse.search(term).map((result) => result.item)
+            },
+        ],
     }),
     listeners(({ actions }) => ({
         loadCohortsSuccess: async ({ cohorts }: { cohorts: CohortType[] }) => {
@@ -97,15 +111,15 @@ export const cohortsModel = kea<cohortsModelType>([
             })
         },
     })),
-    events(({ actions, values }) => ({
-        afterMount: () => {
-            if (isAuthenticatedTeam(values.currentTeam)) {
-                // Don't load on shared insights/dashboards
-                actions.loadCohorts()
-            }
-        },
-        beforeUnmount: () => {
-            clearTimeout(values.pollTimeout || undefined)
-        },
-    })),
+    beforeUnmount(({ values }) => {
+        clearTimeout(values.pollTimeout || undefined)
+    }),
+
+    afterMount(({ actions, values }) => {
+        if (isAuthenticatedTeam(values.currentTeam)) {
+            // Don't load on shared insights/dashboards
+            actions.loadCohorts()
+        }
+    }),
+    permanentlyMount(),
 ])
diff --git a/frontend/src/models/dashboardsModel.tsx b/frontend/src/models/dashboardsModel.tsx
index 6abe045e1cc0ae..55bf7adc27e7df 100644
--- a/frontend/src/models/dashboardsModel.tsx
+++ b/frontend/src/models/dashboardsModel.tsx
@@ -1,5 +1,5 @@
 import { loaders } from 'kea-loaders'
-import { kea, path, connect, actions, reducers, selectors, listeners, events } from 'kea'
+import { kea, path, connect, actions, reducers, selectors, listeners, afterMount } from 'kea'
 import { router, urlToAction } from 'kea-router'
 import api, { PaginatedResponse } from 'lib/api'
 import { idToKey, isUserLoggedIn } from 'lib/utils'
@@ -11,6 +11,7 @@ import { teamLogic } from 'scenes/teamLogic'
 import { lemonToast } from 'lib/lemon-ui/lemonToast'
 import { tagsModel } from '~/models/tagsModel'
 import { GENERATED_DASHBOARD_PREFIX } from 'lib/constants'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 export const dashboardsModel = kea<dashboardsModelType>([
     path(['models', 'dashboardsModel']),
@@ -321,11 +322,10 @@ export const dashboardsModel = kea<dashboardsModelType>([
             }
         },
     })),
-    events(({ actions }) => ({
-        afterMount: () => {
-            actions.loadDashboards()
-        },
-    })),
+    afterMount(({ actions }) => {
+        actions.loadDashboards()
+    }),
+    permanentlyMount(),
 ])
 
 export function nameCompareFunction(a: DashboardBasicType, b: DashboardBasicType): number {
diff --git a/frontend/src/models/groupsModel.ts b/frontend/src/models/groupsModel.ts
index 9f7cd247a88de0..1c5506f5c6c873 100644
--- a/frontend/src/models/groupsModel.ts
+++ b/frontend/src/models/groupsModel.ts
@@ -1,4 +1,4 @@
-import { kea, path, connect, selectors, events } from 'kea'
+import { kea, path, connect, selectors, afterMount } from 'kea'
 import api from 'lib/api'
 import { GroupType, GroupTypeIndex } from '~/types'
 import { teamLogic } from 'scenes/teamLogic'
@@ -105,7 +105,7 @@ export const groupsModel = kea<groupsModelType>([
             }
         },
     })),
-    events(({ actions }) => ({
-        afterMount: actions.loadAllGroupTypes,
-    })),
+    afterMount(({ actions }) => {
+        actions.loadAllGroupTypes()
+    }),
 ])
diff --git a/frontend/src/models/index.ts b/frontend/src/models/index.ts
deleted file mode 100644
index 31a15fb5802751..00000000000000
--- a/frontend/src/models/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { kea, path, connect } from 'kea'
-import { actionsModel } from './actionsModel'
-import { annotationsModel } from './annotationsModel'
-import { cohortsModel } from './cohortsModel'
-import { dashboardsModel } from './dashboardsModel'
-import { propertyDefinitionsModel } from './propertyDefinitionsModel'
-import type { modelsType } from './indexType'
-
-/** "Models" are logics that are persistently mounted (start with app) */
-export const models = kea<modelsType>([
-    path(['models', 'index']),
-    connect([actionsModel, annotationsModel, cohortsModel, dashboardsModel, propertyDefinitionsModel]),
-])
diff --git a/frontend/src/models/notebooksModel.ts b/frontend/src/models/notebooksModel.ts
index b30f62506d61ae..057d896c0ce41c 100644
--- a/frontend/src/models/notebooksModel.ts
+++ b/frontend/src/models/notebooksModel.ts
@@ -28,7 +28,7 @@ export const SCRATCHPAD_NOTEBOOK: NotebookListItemType = {
 
 export const openNotebook = async (
     notebookId: string,
-    target: NotebookTarget = NotebookTarget.Auto,
+    target: NotebookTarget,
     focus: EditorFocusPosition | undefined = undefined,
     // operations to run against the notebook once it has opened and the editor is ready
     onOpen: (logic: BuiltLogic<notebookLogicType>) => void = () => {}
@@ -60,8 +60,8 @@ export const notebooksModel = kea<notebooksModelType>([
     actions({
         setScratchpadNotebook: (notebook: NotebookListItemType) => ({ notebook }),
         createNotebook: (
+            location: NotebookTarget,
             title?: string,
-            location: NotebookTarget = NotebookTarget.Auto,
             content?: JSONContent[],
             onCreate?: (notebook: BuiltLogic<notebookLogicType>) => void
         ) => ({
@@ -186,7 +186,7 @@ export const notebooksModel = kea<notebooksModelType>([
                 },
             }))
 
-            await actions.createNotebook(dashboard.name + ' (copied)', NotebookTarget.Auto, resources)
+            await actions.createNotebook(NotebookTarget.Scene, dashboard.name + ' (copied)', resources)
         },
     })),
 ])
diff --git a/frontend/src/models/propertyDefinitionsModel.ts b/frontend/src/models/propertyDefinitionsModel.ts
index b9eb8016c00fdc..b2dcb6cc2952dc 100644
--- a/frontend/src/models/propertyDefinitionsModel.ts
+++ b/frontend/src/models/propertyDefinitionsModel.ts
@@ -14,6 +14,7 @@ import { TaxonomicFilterValue } from 'lib/components/TaxonomicFilter/types'
 import { colonDelimitedDuration } from 'lib/utils'
 import { captureTimeToSeeData } from 'lib/internalMetrics'
 import { teamLogic } from 'scenes/teamLogic'
+import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
 export type PropertyDefinitionStorage = Record<string, PropertyDefinition | PropertyDefinitionState>
 
@@ -367,4 +368,5 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
             },
         ],
     }),
+    permanentlyMount(),
 ])
diff --git a/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx b/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
index f3788bc9a87cbb..d7dc0683101118 100644
--- a/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
+++ b/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
@@ -36,7 +36,6 @@ export function EventPropertyFilters({ query, setQuery }: EventPropertyFiltersPr
                 }
             }}
             pageKey={`EventPropertyFilters.${id}`}
-            style={{ marginBottom: 0, marginTop: 0 }}
             eventNames={eventNames}
         />
     ) : (
diff --git a/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx b/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
index cdc12f01f7c6c6..e8e8c16035ea4f 100644
--- a/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
+++ b/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
@@ -238,25 +238,27 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
                             {'Save as View'}
                         </LemonButton>
                     ) : null}
-                    <LemonButtonWithDropdown
-                        className="ml-2"
-                        icon={<IconInfo />}
-                        type="secondary"
-                        size="small"
-                        dropdown={{
-                            overlay: (
-                                <div>
-                                    Save a query as a view that can be referenced in another query. This is useful for
-                                    modeling data and organizing large queries into readable chunks.{' '}
-                                    <Link to={'https://posthog.com/docs/data-warehouse'}>More Info</Link>{' '}
-                                </div>
-                            ),
-                            placement: 'right-start',
-                            fallbackPlacements: ['left-start'],
-                            actionable: true,
-                            closeParentPopoverOnClickInside: true,
-                        }}
-                    />
+                    {featureFlags[FEATURE_FLAGS.DATA_WAREHOUSE_VIEWS] && (
+                        <LemonButtonWithDropdown
+                            className="ml-2"
+                            icon={<IconInfo />}
+                            type="secondary"
+                            size="small"
+                            dropdown={{
+                                overlay: (
+                                    <div>
+                                        Save a query as a view that can be referenced in another query. This is useful
+                                        for modeling data and organizing large queries into readable chunks.{' '}
+                                        <Link to={'https://posthog.com/docs/data-warehouse'}>More Info</Link>{' '}
+                                    </div>
+                                ),
+                                placement: 'right-start',
+                                fallbackPlacements: ['left-start'],
+                                actionable: true,
+                                closeParentPopoverOnClickInside: true,
+                            }}
+                        />
+                    )}
                 </div>
             </div>
         </div>
diff --git a/frontend/src/queries/nodes/InsightViz/InsightContainer.tsx b/frontend/src/queries/nodes/InsightViz/InsightContainer.tsx
index f18ae2daf0c073..b7148df4b6b669 100644
--- a/frontend/src/queries/nodes/InsightViz/InsightContainer.tsx
+++ b/frontend/src/queries/nodes/InsightViz/InsightContainer.tsx
@@ -36,15 +36,6 @@ import { FunnelCorrelation } from 'scenes/insights/views/Funnels/FunnelCorrelati
 import { InsightResultMetadata } from './InsightResultMetadata'
 import { Link } from '@posthog/lemon-ui'
 
-const VIEW_MAP = {
-    [`${InsightType.TRENDS}`]: <TrendInsight view={InsightType.TRENDS} />,
-    [`${InsightType.STICKINESS}`]: <TrendInsight view={InsightType.STICKINESS} />,
-    [`${InsightType.LIFECYCLE}`]: <TrendInsight view={InsightType.LIFECYCLE} />,
-    [`${InsightType.FUNNELS}`]: <FunnelInsight />,
-    [`${InsightType.RETENTION}`]: <RetentionContainer />,
-    [`${InsightType.PATHS}`]: <Paths />,
-}
-
 export function InsightContainer({
     disableHeader,
     disableTable,
@@ -82,11 +73,11 @@ export function InsightContainer({
         trendsFilter,
         funnelsFilter,
         supportsDisplay,
-        isUsingSessionAnalysis,
         samplingFactor,
         insightDataLoading,
         erroredQueryId,
         timedOutQueryId,
+        shouldShowSessionAnalysisWarning,
     } = useValues(insightVizDataLogic(insightProps))
     const { exportContext } = useValues(insightDataLogic(insightProps))
 
@@ -135,6 +126,25 @@ export function InsightContainer({
         return null
     })()
 
+    function renderActiveView(): JSX.Element | null {
+        switch (activeView) {
+            case InsightType.TRENDS:
+                return <TrendInsight view={InsightType.TRENDS} context={context} />
+            case InsightType.STICKINESS:
+                return <TrendInsight view={InsightType.STICKINESS} context={context} />
+            case InsightType.LIFECYCLE:
+                return <TrendInsight view={InsightType.LIFECYCLE} context={context} />
+            case InsightType.FUNNELS:
+                return <FunnelInsight />
+            case InsightType.RETENTION:
+                return <RetentionContainer />
+            case InsightType.PATHS:
+                return <Paths />
+            default:
+                return null
+        }
+    }
+
     function renderTable(): JSX.Element | null {
         if (
             isFunnels &&
@@ -197,7 +207,7 @@ export function InsightContainer({
 
     return (
         <>
-            {isUsingSessionAnalysis ? (
+            {shouldShowSessionAnalysisWarning ? (
                 <div className="mb-4">
                     <LemonBanner type="info">
                         When using sessions and session properties, events without session IDs will be excluded from the
@@ -255,13 +265,13 @@ export function InsightContainer({
                             BlockingEmptyState
                         ) : supportsDisplay && showLegend ? (
                             <div className="insights-graph-container-row flex flex-nowrap">
-                                <div className="insights-graph-container-row-left">{VIEW_MAP[activeView]}</div>
+                                <div className="insights-graph-container-row-left">{renderActiveView()}</div>
                                 <div className="insights-graph-container-row-right">
                                     <InsightLegend />
                                 </div>
                             </div>
                         ) : (
-                            VIEW_MAP[activeView]
+                            renderActiveView()
                         )}
                     </div>
                 )}
diff --git a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.tsx b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.tsx
index a21ea23176bf94..ba0abd3be7b460 100644
--- a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.tsx
+++ b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.tsx
@@ -101,7 +101,6 @@ export function PropertyGroupFilters({
                                                             ? (group.values as AnyPropertyFilter[])
                                                             : null
                                                     }
-                                                    style={{ marginBottom: 0 }}
                                                     onChange={(properties) => {
                                                         setPropertyFilters(properties, propertyGroupIndex)
                                                     }}
diff --git a/frontend/src/queries/nodes/InsightViz/filters/TestAccountFilter.tsx b/frontend/src/queries/nodes/InsightViz/filters/TestAccountFilter.tsx
index 1b8c0464a25496..1aae07d9f5860b 100644
--- a/frontend/src/queries/nodes/InsightViz/filters/TestAccountFilter.tsx
+++ b/frontend/src/queries/nodes/InsightViz/filters/TestAccountFilter.tsx
@@ -4,7 +4,8 @@ import { teamLogic } from 'scenes/teamLogic'
 import { LemonButton, LemonSwitch } from '@posthog/lemon-ui'
 import { IconSettings } from 'lib/lemon-ui/icons'
 import { InsightQueryNode } from '~/queries/schema'
-import { filterTestAccountsDefaultsLogic } from 'scenes/project/Settings/filterTestAccountDefaultsLogic'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
+import { urls } from 'scenes/urls'
 
 type TestAccountFilterProps = {
     query: InsightQueryNode
@@ -29,7 +30,7 @@ export function TestAccountFilter({ query, setQuery }: TestAccountFilterProps):
                     <span>Filter out internal and test users</span>
                     <LemonButton
                         icon={<IconSettings />}
-                        to="/project/settings#internal-users-filtering"
+                        to={urls.settings('project', 'internal-user-filtering')}
                         status="stealth"
                         size="small"
                         noPadding
diff --git a/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx b/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
index e99c2c68b7ffde..f8ddaa48b44b18 100644
--- a/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
+++ b/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
@@ -33,7 +33,6 @@ export function PersonPropertyFilters({ query, setQuery }: PersonPropertyFilters
                     : [TaxonomicFilterGroupType.PersonProperties]
             }
             hogQLTable="persons"
-            style={{ marginBottom: 0, marginTop: 0 }}
         />
     ) : (
         <div>Error: property groups are not supported.</div>
diff --git a/frontend/src/queries/query.ts b/frontend/src/queries/query.ts
index 646cfc180feff2..df71c0b1cef4b4 100644
--- a/frontend/src/queries/query.ts
+++ b/frontend/src/queries/query.ts
@@ -12,6 +12,7 @@ import {
     isInsightVizNode,
     isQueryWithHogQLSupport,
     isPersonsQuery,
+    isLifecycleQuery,
 } from './utils'
 import api, { ApiMethodOptions } from 'lib/api'
 import { getCurrentTeamId } from 'lib/utils/logics'
@@ -25,7 +26,7 @@ import {
     isStickinessFilter,
     isTrendsFilter,
 } from 'scenes/insights/sharedUtils'
-import { toParams } from 'lib/utils'
+import { flattenObject, toParams } from 'lib/utils'
 import { queryNodeToFilter } from './nodes/InsightQuery/utils/queryNodeToFilter'
 import { now } from 'lib/dayjs'
 import { currentSessionId } from 'lib/internalMetrics'
@@ -108,25 +109,34 @@ export async function query<N extends DataNode = DataNode>(
     const hogQLInsightsFlagEnabled = Boolean(
         featureFlagLogic.findMounted()?.values.featureFlags?.[FEATURE_FLAGS.HOGQL_INSIGHTS]
     )
+    const hogQLInsightsLiveCompareEnabled = Boolean(
+        featureFlagLogic.findMounted()?.values.featureFlags?.[FEATURE_FLAGS.HOGQL_INSIGHT_LIVE_COMPARE]
+    )
+
+    async function fetchLegacyInsights(): Promise<Record<string, any>> {
+        if (!isInsightQueryNode(queryNode)) {
+            throw new Error('fetchLegacyInsights called with non-insight query. Should be unreachable.')
+        }
+        const filters = queryNodeToFilter(queryNode)
+        const params = {
+            ...filters,
+            ...(refresh ? { refresh: true } : {}),
+            client_query_id: queryId,
+            session_id: currentSessionId(),
+        }
+        const [resp] = await legacyInsightQuery({
+            filters: params,
+            currentTeamId: getCurrentTeamId(),
+            methodOptions,
+            refresh,
+        })
+        response = await resp.json()
+        return response
+    }
 
     try {
         if (isPersonsNode(queryNode)) {
             response = await api.get(getPersonsEndpoint(queryNode), methodOptions)
-        } else if (isInsightQueryNode(queryNode) && !(hogQLInsightsFlagEnabled && isQueryWithHogQLSupport(queryNode))) {
-            const filters = queryNodeToFilter(queryNode)
-            const params = {
-                ...filters,
-                ...(refresh ? { refresh: true } : {}),
-                client_query_id: queryId,
-                session_id: currentSessionId(),
-            }
-            const [resp] = await legacyInsightQuery({
-                filters: params,
-                currentTeamId: getCurrentTeamId(),
-                methodOptions,
-                refresh,
-            })
-            response = await resp.json()
         } else if (isTimeToSeeDataQuery(queryNode)) {
             response = await api.query(
                 {
@@ -138,6 +148,73 @@ export async function query<N extends DataNode = DataNode>(
                 },
                 methodOptions
             )
+        } else if (isInsightQueryNode(queryNode)) {
+            if (hogQLInsightsFlagEnabled && isQueryWithHogQLSupport(queryNode)) {
+                if (hogQLInsightsLiveCompareEnabled) {
+                    let legacyResponse
+                    ;[response, legacyResponse] = await Promise.all([
+                        api.query(queryNode, methodOptions, queryId, refresh),
+                        fetchLegacyInsights(),
+                    ])
+
+                    const res1 = response?.result || response?.results
+                    const res2 = legacyResponse?.result || legacyResponse?.results
+
+                    if (isLifecycleQuery(queryNode)) {
+                        // Results don't come back in a predetermined order for the legacy lifecycle insight
+                        const order = { new: 1, returning: 2, resurrecting: 3, dormant: 4 }
+                        res1.sort((a: any, b: any) => order[a.status] - order[b.status])
+                        res2.sort((a: any, b: any) => order[a.status] - order[b.status])
+                    }
+
+                    const results = flattenObject(res1)
+                    const legacyResults = flattenObject(res2)
+                    const sortedKeys = Array.from(new Set([...Object.keys(results), ...Object.keys(legacyResults)]))
+                        .filter((key) => !key.includes('.persons_urls.'))
+                        .sort()
+                    const tableData = [['', 'key', 'HOGQL', 'LEGACY']]
+                    let matchCount = 0
+                    let mismatchCount = 0
+                    for (const key of sortedKeys) {
+                        if (results[key] === legacyResults[key]) {
+                            matchCount++
+                        } else {
+                            mismatchCount++
+                        }
+                        tableData.push([
+                            results[key] === legacyResults[key] ? '✅' : '🚨',
+                            key,
+                            results[key],
+                            legacyResults[key],
+                        ])
+                    }
+                    const symbols = mismatchCount === 0 ? '🍀🍀🍀' : '🏎️🏎️🏎'
+                    // eslint-disable-next-line no-console
+                    console.log(`${symbols} Insight Race ${symbols}`, {
+                        query: queryNode,
+                        duration: performance.now() - startTime,
+                        hogqlResults: results,
+                        legacyResults: legacyResults,
+                        equal: mismatchCount === 0,
+                        response,
+                        legacyResponse,
+                    })
+                    // eslint-disable-next-line no-console
+                    console.groupCollapsed(
+                        `Results: ${mismatchCount === 0 ? '✅✅✅' : '✅'} ${matchCount}${
+                            mismatchCount > 0 ? ` 🚨🚨🚨${mismatchCount}` : ''
+                        }`
+                    )
+                    // eslint-disable-next-line no-console
+                    console.table(tableData)
+                    // eslint-disable-next-line no-console
+                    console.groupEnd()
+                } else {
+                    response = await api.query(queryNode, methodOptions, queryId, refresh)
+                }
+            } else {
+                response = await fetchLegacyInsights()
+            }
         } else {
             response = await api.query(queryNode, methodOptions, queryId, refresh)
             if (isHogQLQuery(queryNode) && response && typeof response === 'object') {
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
index fe6d72056e17a4..d1eed070437ff9 100644
--- a/frontend/src/queries/schema.json
+++ b/frontend/src/queries/schema.json
@@ -1541,38 +1541,51 @@
             "additionalProperties": false,
             "properties": {
                 "clickhouse": {
+                    "description": "Executed ClickHouse query",
                     "type": "string"
                 },
                 "columns": {
+                    "description": "Returned columns",
                     "items": {},
                     "type": "array"
                 },
+                "error": {
+                    "description": "Query error. Returned only if 'explain' is true. Throws an error otherwise.",
+                    "type": "string"
+                },
                 "explain": {
+                    "description": "Query explanation output",
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
                 "hogql": {
+                    "description": "Generated HogQL query",
                     "type": "string"
                 },
                 "modifiers": {
-                    "$ref": "#/definitions/HogQLQueryModifiers"
+                    "$ref": "#/definitions/HogQLQueryModifiers",
+                    "description": "Modifiers used when performing the query"
                 },
                 "query": {
+                    "description": "Input query string",
                     "type": "string"
                 },
                 "results": {
+                    "description": "Query results",
                     "items": {},
                     "type": "array"
                 },
                 "timings": {
+                    "description": "Measured timings for different parts of the query generation process",
                     "items": {
                         "$ref": "#/definitions/QueryTiming"
                     },
                     "type": "array"
                 },
                 "types": {
+                    "description": "Types of returned columns",
                     "items": {},
                     "type": "array"
                 }
@@ -1686,6 +1699,9 @@
                     "description": "Show with most visual options enabled. Used in insight scene.",
                     "type": "boolean"
                 },
+                "hidePersonsModal": {
+                    "type": "boolean"
+                },
                 "kind": {
                     "const": "InsightVizNode",
                     "type": "string"
@@ -1713,6 +1729,9 @@
                 },
                 "source": {
                     "$ref": "#/definitions/InsightQueryNode"
+                },
+                "suppressSessionAnalysisWarning": {
+                    "type": "boolean"
                 }
             },
             "required": ["kind", "source"],
@@ -2528,6 +2547,9 @@
                     "description": "Show with most visual options enabled. Used in insight scene.",
                     "type": "boolean"
                 },
+                "hidePersonsModal": {
+                    "type": "boolean"
+                },
                 "kind": {
                     "const": "SavedInsightNode",
                     "type": "string"
@@ -2619,6 +2641,9 @@
                 "showTimings": {
                     "description": "Show a detailed query timing breakdown",
                     "type": "boolean"
+                },
+                "suppressSessionAnalysisWarning": {
+                    "type": "boolean"
                 }
             },
             "required": ["kind", "shortId"],
@@ -3064,16 +3089,19 @@
             "required": ["results"],
             "type": "object"
         },
+        "WebAnalyticsPropertyFilter": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/EventPropertyFilter"
+                },
+                {
+                    "$ref": "#/definitions/PersonPropertyFilter"
+                }
+            ]
+        },
         "WebAnalyticsPropertyFilters": {
             "items": {
-                "anyOf": [
-                    {
-                        "$ref": "#/definitions/EventPropertyFilter"
-                    },
-                    {
-                        "$ref": "#/definitions/HogQLPropertyFilter"
-                    }
-                ]
+                "$ref": "#/definitions/WebAnalyticsPropertyFilter"
             },
             "type": "array"
         },
diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
index e3c0e792d11af5..fdba8908a3a711 100644
--- a/frontend/src/queries/schema.ts
+++ b/frontend/src/queries/schema.ts
@@ -11,12 +11,12 @@ import {
     FunnelsFilterType,
     GroupMathType,
     HogQLMathType,
-    HogQLPropertyFilter,
     InsightShortId,
     IntervalType,
     LifecycleFilterType,
     LifecycleToggle,
     PathsFilterType,
+    PersonPropertyFilter,
     PropertyGroupFilter,
     PropertyMathType,
     RetentionFilterType,
@@ -139,14 +139,25 @@ export interface HogQLQueryModifiers {
 }
 
 export interface HogQLQueryResponse {
+    /** Input query string */
     query?: string
+    /** Generated HogQL query */
     hogql?: string
+    /** Executed ClickHouse query */
     clickhouse?: string
+    /** Query results */
     results?: any[]
-    types?: any[]
+    /** Query error. Returned only if 'explain' is true. Throws an error otherwise. */
+    error?: string
+    /** Returned columns */
     columns?: any[]
+    /** Types of returned columns */
+    types?: any[]
+    /** Measured timings for different parts of the query generation process */
     timings?: QueryTiming[]
+    /** Query explanation output */
     explain?: string[]
+    /** Modifiers used when performing the query */
     modifiers?: HogQLQueryModifiers
 }
 
@@ -397,6 +408,8 @@ interface InsightVizNodeViewProps {
     showResults?: boolean
     /** Query is embedded inside another bordered component */
     embedded?: boolean
+    suppressSessionAnalysisWarning?: boolean
+    hidePersonsModal?: boolean
 }
 
 /** Base class for insight query nodes. Should not be used directly. */
@@ -575,8 +588,8 @@ export interface SessionsTimelineQuery extends DataNode {
     before?: string
     response?: SessionsTimelineQueryResponse
 }
-
-export type WebAnalyticsPropertyFilters = (EventPropertyFilter | HogQLPropertyFilter)[]
+export type WebAnalyticsPropertyFilter = EventPropertyFilter | PersonPropertyFilter
+export type WebAnalyticsPropertyFilters = WebAnalyticsPropertyFilter[]
 
 export interface WebAnalyticsQueryBase {
     dateRange?: DateRange
diff --git a/frontend/src/queries/types.ts b/frontend/src/queries/types.ts
index 1a77b7536d1e0f..f1e63d8f54549d 100644
--- a/frontend/src/queries/types.ts
+++ b/frontend/src/queries/types.ts
@@ -1,4 +1,4 @@
-import { InsightLogicProps } from '~/types'
+import { ChartDisplayType, InsightLogicProps, TrendResult } from '~/types'
 import { ComponentType, HTMLProps } from 'react'
 import { DataTableNode } from '~/queries/schema'
 
@@ -15,6 +15,15 @@ export interface QueryContext {
     emptyStateHeading?: string
     emptyStateDetail?: string
     rowProps?: (record: unknown) => Omit<HTMLProps<HTMLTableRowElement>, 'key'>
+    /** chart-specific rendering context **/
+    chartRenderingMetadata?: ChartRenderingMetadata
+}
+
+/** Pass custom rendering metadata to specific kinds of charts **/
+export interface ChartRenderingMetadata {
+    [ChartDisplayType.WorldMap]?: {
+        countryProps?: (countryCode: string, countryData: TrendResult | undefined) => Omit<HTMLProps<SVGElement>, 'key'>
+    }
 }
 
 export type QueryContextColumnTitleComponent = ComponentType<{
diff --git a/frontend/src/scenes/App.tsx b/frontend/src/scenes/App.tsx
index deecc672d59ec6..bfeb6836c9ef0f 100644
--- a/frontend/src/scenes/App.tsx
+++ b/frontend/src/scenes/App.tsx
@@ -3,10 +3,8 @@ import { ToastContainer, Slide } from 'react-toastify'
 import { preflightLogic } from './PreflightCheck/preflightLogic'
 import { userLogic } from 'scenes/userLogic'
 import { sceneLogic } from 'scenes/sceneLogic'
-import { UpgradeModal } from './UpgradeModal'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import type { appLogicType } from './AppType'
-import { models } from '~/models'
 import { teamLogic } from './teamLogic'
 import { LoadedScene } from 'scenes/sceneTypes'
 import { appScenes } from 'scenes/appScenes'
@@ -18,19 +16,17 @@ import { ToastCloseButton } from 'lib/lemon-ui/lemonToast'
 import { frontendAppsLogic } from 'scenes/apps/frontendAppsLogic'
 import { inAppPromptLogic } from 'lib/logic/inAppPrompt/inAppPromptLogic'
 import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
-import { LemonModal } from '@posthog/lemon-ui'
-import { Setup2FA } from './authentication/Setup2FA'
-import { membersLogic } from './organization/Settings/membersLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { Navigation as Navigation3000 } from '~/layout/navigation-3000/Navigation'
-import { Prompt } from 'lib/logic/newPrompt/Prompt'
 import { useEffect } from 'react'
 import { themeLogic } from '~/layout/navigation-3000/themeLogic'
-import { FeaturePreviewsModal } from '~/layout/FeaturePreviews'
+import { GlobalModals } from '~/layout/GlobalModals'
+import { actionsModel } from '~/models/actionsModel'
+import { cohortsModel } from '~/models/cohortsModel'
 
 export const appLogic = kea<appLogicType>([
     path(['scenes', 'App']),
-    connect([teamLogic, organizationLogic, frontendAppsLogic, inAppPromptLogic]),
+    connect([teamLogic, organizationLogic, frontendAppsLogic, inAppPromptLogic, actionsModel, cohortsModel]),
     actions({
         enableDelayedSpinner: true,
         ignoreFeatureFlags: true,
@@ -72,8 +68,6 @@ export const appLogic = kea<appLogicType>([
 
 export function App(): JSX.Element | null {
     const { showApp, showingDelayedSpinner } = useValues(appLogic)
-    const { user } = useValues(userLogic)
-    const { currentTeamId } = useValues(teamLogic)
     const { featureFlags } = useValues(featureFlagLogic)
     useMountedLogic(sceneLogic({ scenes: appScenes }))
 
@@ -88,7 +82,6 @@ export function App(): JSX.Element | null {
     if (showApp) {
         return (
             <>
-                {user && currentTeamId ? <Models /> : null}
                 <LoadedSceneLogics />
                 <AppScene />
             </>
@@ -119,12 +112,6 @@ function LoadedSceneLogics(): JSX.Element {
     )
 }
 
-/** Loads every logic in the "src/models" folder */
-function Models(): null {
-    useMountedLogic(models)
-    return null
-}
-
 function AppScene(): JSX.Element | null {
     useMountedLogic(breadcrumbsLogic)
     const { user } = useValues(userLogic)
@@ -182,27 +169,7 @@ function AppScene(): JSX.Element | null {
                 {wrappedSceneElement}
             </Navigation>
             {toastContainer}
-            <FeaturePreviewsModal />
-            <UpgradeModal />
-            {user.organization?.enforce_2fa && !user.is_2fa_enabled && (
-                <LemonModal title="Set up 2FA" closable={false}>
-                    <p>
-                        <b>Your organization requires you to set up 2FA.</b>
-                    </p>
-                    <p>
-                        <b>
-                            Use an authenticator app like Google Authenticator or 1Password to scan the QR code below.
-                        </b>
-                    </p>
-                    <Setup2FA
-                        onSuccess={() => {
-                            userLogic.actions.loadUser()
-                            membersLogic.actions.loadMembers()
-                        }}
-                    />
-                </LemonModal>
-            )}
-            {featureFlags[FEATURE_FLAGS.ENABLE_PROMPTS] && <Prompt />}
+            <GlobalModals />
         </>
     )
 }
diff --git a/frontend/src/scenes/IntegrationsRedirect/IntegrationsRedirect.tsx b/frontend/src/scenes/IntegrationsRedirect/IntegrationsRedirect.tsx
index f838ae29ea9a8c..df3757fcfcdf53 100644
--- a/frontend/src/scenes/IntegrationsRedirect/IntegrationsRedirect.tsx
+++ b/frontend/src/scenes/IntegrationsRedirect/IntegrationsRedirect.tsx
@@ -1,6 +1,6 @@
 import { SceneExport } from 'scenes/sceneTypes'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
-import { integrationsLogic } from 'scenes/project/Settings/integrationsLogic'
+import { integrationsLogic } from 'scenes/settings/project/integrationsLogic'
 
 export const scene: SceneExport = {
     component: IntegrationsRedirect,
diff --git a/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx b/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
index 0dc09b3607e8f0..dfbadfeb38a13e 100644
--- a/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
+++ b/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
@@ -1,5 +1,4 @@
 import { useValues, useActions } from 'kea'
-import { LoadingOutlined } from '@ant-design/icons'
 import { PreflightCheckStatus, PreflightItem, preflightLogic } from './preflightLogic'
 import './PreflightCheck.scss'
 import { capitalizeFirstLetter } from 'lib/utils'
@@ -18,7 +17,7 @@ import { LemonRow } from 'lib/lemon-ui/LemonRow'
 import { AnimatedCollapsible } from 'lib/components/AnimatedCollapsible'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
-import { Link } from '@posthog/lemon-ui'
+import { Link, Spinner } from '@posthog/lemon-ui'
 
 export const scene: SceneExport = {
     component: PreflightCheck,
@@ -27,7 +26,7 @@ export const scene: SceneExport = {
 
 function PreflightCheckIcon({ status, loading }: { status: PreflightCheckStatus; loading?: boolean }): JSX.Element {
     if (loading) {
-        return <LoadingOutlined style={{ color: 'var(--primary)' }} />
+        return <Spinner textColored className="text-primary" />
     }
     if (status === 'validated') {
         return <IconCheckCircleOutline />
diff --git a/frontend/src/scenes/PreflightCheck/preflightLogic.tsx b/frontend/src/scenes/PreflightCheck/preflightLogic.tsx
index 83dfe166591f28..ae958b00c996b1 100644
--- a/frontend/src/scenes/PreflightCheck/preflightLogic.tsx
+++ b/frontend/src/scenes/PreflightCheck/preflightLogic.tsx
@@ -259,6 +259,12 @@ export const preflightLogic = kea<preflightLogicType>([
                 return preflight?.cloud || preflight?.is_debug
             },
         ],
+        isDev: [
+            (s) => [s.preflight],
+            (preflight): boolean | undefined => {
+                return preflight?.is_debug
+            },
+        ],
     }),
     listeners(({ values, actions }) => ({
         handlePreflightFinished: () => {
diff --git a/frontend/src/scenes/ResourcePermissionModal.tsx b/frontend/src/scenes/ResourcePermissionModal.tsx
index de8706a13e2667..00dd60a0349566 100644
--- a/frontend/src/scenes/ResourcePermissionModal.tsx
+++ b/frontend/src/scenes/ResourcePermissionModal.tsx
@@ -12,8 +12,8 @@ import {
     FormattedResourceLevel,
     permissionsLogic,
     ResourcePermissionMapping,
-} from './organization/Settings/Permissions/permissionsLogic'
-import { rolesLogic } from './organization/Settings/Permissions/Roles/rolesLogic'
+} from './settings/organization/Permissions/permissionsLogic'
+import { rolesLogic } from './settings/organization/Permissions/Roles/rolesLogic'
 import { urls } from './urls'
 
 interface ResourcePermissionProps {
@@ -113,7 +113,7 @@ export function ResourcePermission({
                                 icon={
                                     <LemonButton
                                         icon={<IconSettings />}
-                                        to={`${urls.organizationSettings()}?tab=role_based_access`}
+                                        to={`${urls.settings('organization')}?tab=role_based_access`}
                                         status="stealth"
                                         targetBlank
                                         size="small"
@@ -181,12 +181,7 @@ export function ResourcePermission({
                 <>
                     <h5 className="mt-4">Roles</h5>
                     {roles.length > 0 ? (
-                        <div
-                            className="pb-2 rounded overflow-y-auto"
-                            style={{
-                                maxHeight: 300,
-                            }}
-                        >
+                        <div className="pb-2 rounded overflow-y-auto" style={{ maxHeight: 300 }}>
                             {roles.map((role) => {
                                 return (
                                     <RoleRow
@@ -246,7 +241,7 @@ function OrganizationResourcePermissionLabel({
                 icon={
                     <LemonButton
                         icon={<IconSettings />}
-                        to={`${urls.organizationSettings()}?tab=role_based_access`}
+                        to={`${urls.settings('organization')}?tab=role_based_access`}
                         status="stealth"
                         targetBlank
                         size="small"
diff --git a/frontend/src/scenes/actions/ActionEdit.tsx b/frontend/src/scenes/actions/ActionEdit.tsx
index 6126e9eacce857..e5453cb38e93bb 100644
--- a/frontend/src/scenes/actions/ActionEdit.tsx
+++ b/frontend/src/scenes/actions/ActionEdit.tsx
@@ -284,7 +284,7 @@ export function ActionEdit({ action: loadedAction, id, onSave, temporaryToken }:
                                     }
                                 />
                                 <div className="mt-1 pl-6">
-                                    <Link to="/project/settings#webhook">
+                                    <Link to={urls.settings('project-integrations', 'integration-webhooks')}>
                                         {slackEnabled ? 'Configure' : 'Enable'} webhooks in project settings.
                                     </Link>
                                 </div>
diff --git a/frontend/src/scenes/annotations/AnnotationModal.tsx b/frontend/src/scenes/annotations/AnnotationModal.tsx
index 25007ed7096e68..a697a84456ce0f 100644
--- a/frontend/src/scenes/annotations/AnnotationModal.tsx
+++ b/frontend/src/scenes/annotations/AnnotationModal.tsx
@@ -9,6 +9,15 @@ import { IconWarning } from 'lib/lemon-ui/icons'
 import { shortTimeZone } from 'lib/utils'
 import { urls } from 'scenes/urls'
 
+export function NewAnnotationButton(): JSX.Element {
+    const { openModalToCreateAnnotation } = useActions(annotationModalLogic)
+    return (
+        <LemonButton type="primary" data-attr="create-annotation" onClick={() => openModalToCreateAnnotation()}>
+            New annotation
+        </LemonButton>
+    )
+}
+
 export function AnnotationModal({
     overlayRef,
     contentRef,
@@ -75,7 +84,7 @@ export function AnnotationModal({
                         label={
                             <span>
                                 Date and time (
-                                <Link to={urls.projectSettings('timezone')} target="_blank">
+                                <Link to={urls.settings('project', 'date-and-time')} target="_blank">
                                     {shortTimeZone(timezone)}
                                 </Link>
                                 )
diff --git a/frontend/src/scenes/annotations/Annotations.tsx b/frontend/src/scenes/annotations/Annotations.tsx
index 89fe8259d792e0..b71b8969d08998 100644
--- a/frontend/src/scenes/annotations/Annotations.tsx
+++ b/frontend/src/scenes/annotations/Annotations.tsx
@@ -5,9 +5,7 @@ import {
     annotationModalLogic,
     ANNOTATION_DAYJS_FORMAT,
 } from './annotationModalLogic'
-import { PageHeader } from 'lib/components/PageHeader'
 import { AnnotationScope, InsightShortId, AnnotationType, ProductKey } from '~/types'
-import { SceneExport } from 'scenes/sceneTypes'
 import { LemonTable, LemonTableColumns, LemonTableColumn } from 'lib/lemon-ui/LemonTable'
 import { createdAtColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
@@ -24,11 +22,6 @@ import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
 import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
 import { MicrophoneHog } from 'lib/components/hedgehogs'
 
-export const scene: SceneExport = {
-    component: Annotations,
-    logic: annotationModalLogic,
-}
-
 export function Annotations(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
     const { currentOrganization } = useValues(organizationLogic)
@@ -135,26 +128,10 @@ export function Annotations(): JSX.Element {
 
     return (
         <>
-            <PageHeader
-                title="Annotations"
-                caption={
-                    !shouldShowEmptyState && !shouldShowProductIntroduction ? (
-                        <>
-                            Annotations allow you to mark when certain changes happened so you can easily see how they
-                            impacted your metrics.
-                        </>
-                    ) : null
-                }
-                buttons={
-                    <LemonButton
-                        type="primary"
-                        data-attr="create-annotation"
-                        onClick={() => openModalToCreateAnnotation()}
-                    >
-                        New annotation
-                    </LemonButton>
-                }
-            />
+            <p>
+                Annotations allow you to mark when certain changes happened so you can easily see how they impacted your
+                metrics.
+            </p>
             <div data-attr={'annotations-content'}>
                 {(shouldShowEmptyState || shouldShowProductIntroduction) && (
                     <div className="mt-4">
diff --git a/frontend/src/scenes/annotations/annotationModalLogic.ts b/frontend/src/scenes/annotations/annotationModalLogic.ts
index e8603925f52a86..d1dd40c68061e7 100644
--- a/frontend/src/scenes/annotations/annotationModalLogic.ts
+++ b/frontend/src/scenes/annotations/annotationModalLogic.ts
@@ -9,10 +9,8 @@ import { teamLogic } from 'scenes/teamLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { userLogic } from 'scenes/userLogic'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { actionToUrl, urlToAction } from 'kea-router'
-import { sceneLogic } from 'scenes/sceneLogic'
-import { urls } from '@posthog/apps-common'
-import { Scene } from 'scenes/sceneTypes'
+import { urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
 
 export const ANNOTATION_DAYJS_FORMAT = 'MMMM DD, YYYY h:mm A'
 
@@ -176,7 +174,7 @@ export const annotationModalLogic = kea<annotationModalLogicType>([
         },
     })),
     urlToAction(({ values, actions, cache }) => ({
-        '/annotations/:id': ({ id }) => {
+        [urls.annotation(':id')]: ({ id }) => {
             cache.annotationToShowId = parseInt(id as string)
             const annotation = values.annotations.find((a) => a.id === cache.annotationToShowId)
             if (!annotation) {
@@ -185,7 +183,4 @@ export const annotationModalLogic = kea<annotationModalLogicType>([
             actions.openModalToEditAnnotation(annotation)
         },
     })),
-    actionToUrl(() => ({
-        closeModal: () => (sceneLogic.values.scene === Scene.Annotations ? urls.annotations() : undefined),
-    })),
 ])
diff --git a/frontend/src/scenes/appScenes.ts b/frontend/src/scenes/appScenes.ts
index c1c1f9b35de01f..38bf3e1dedd7e6 100644
--- a/frontend/src/scenes/appScenes.ts
+++ b/frontend/src/scenes/appScenes.ts
@@ -9,27 +9,20 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.Dashboard]: () => import('./dashboard/Dashboard'),
     [Scene.Insight]: () => import('./insights/InsightScene'),
     [Scene.WebAnalytics]: () => import('./web-analytics/WebAnalyticsScene'),
-    [Scene.Cohorts]: () => import('./cohorts/Cohorts'),
     [Scene.Cohort]: () => import('./cohorts/Cohort'),
-    [Scene.DataManagement]: () => import('./data-management/events/EventDefinitionsTable'),
+    [Scene.DataManagement]: () => import('./data-management/DataManagementScene'),
     [Scene.Events]: () => import('./events/Events'),
     [Scene.BatchExports]: () => import('./batch_exports/BatchExportsListScene'),
     [Scene.BatchExportEdit]: () => import('./batch_exports/BatchExportEditScene'),
     [Scene.BatchExport]: () => import('./batch_exports/BatchExportScene'),
-    [Scene.Actions]: () => import('./actions/ActionsTable'),
-    [Scene.EventDefinitions]: () => import('./data-management/events/EventDefinitionsTable'),
     [Scene.EventDefinition]: () => import('./data-management/definition/DefinitionView'),
-    [Scene.PropertyDefinitions]: () => import('./data-management/properties/PropertyDefinitionsTable'),
     [Scene.PropertyDefinition]: () => import('./data-management/definition/DefinitionView'),
-    [Scene.DataManagementHistory]: () => import('./data-management/history/History'),
-    [Scene.Database]: () => import('./data-management/database/DatabaseScene'),
     [Scene.Replay]: () => import('./session-recordings/SessionRecordings'),
     [Scene.ReplaySingle]: () => import('./session-recordings/detail/SessionRecordingDetail'),
     [Scene.ReplayPlaylist]: () => import('./session-recordings/playlist/SessionRecordingsPlaylistScene'),
+    [Scene.PersonsManagement]: () => import('./persons-management/PersonsManagementScene'),
     [Scene.Person]: () => import('./persons/PersonScene'),
-    [Scene.Persons]: () => import('./persons/PersonsScene'),
     [Scene.Pipeline]: () => import('./pipeline/Pipeline'),
-    [Scene.Groups]: () => import('./groups/Groups'),
     [Scene.Group]: () => import('./groups/Group'),
     [Scene.Action]: () => import('./actions/Action'),
     [Scene.Experiments]: () => import('./experiments/Experiments'),
@@ -42,23 +35,20 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.Survey]: () => import('./surveys/Survey'),
     [Scene.SurveyTemplates]: () => import('./surveys/SurveyTemplates'),
     [Scene.DataWarehouse]: () => import('./data-warehouse/external/DataWarehouseExternalScene'),
+    [Scene.DataWarehouseTable]: () => import('./data-warehouse/new_table/DataWarehouseTableScene'),
     [Scene.DataWarehousePosthog]: () => import('./data-warehouse/posthog/DataWarehousePosthogScene'),
     [Scene.DataWarehouseExternal]: () => import('./data-warehouse/external/DataWarehouseExternalScene'),
     [Scene.DataWarehouseSavedQueries]: () => import('./data-warehouse/saved_queries/DataWarehouseSavedQueriesScene'),
     [Scene.DataWarehouseSettings]: () => import('./data-warehouse/settings/DataWarehouseSettingsScene'),
-    [Scene.OrganizationSettings]: () => import('./organization/Settings'),
     [Scene.OrganizationCreateFirst]: () => import('./organization/Create'),
     [Scene.OrganizationCreationConfirm]: () => import('./organization/ConfirmOrganization/ConfirmOrganization'),
     [Scene.ProjectHomepage]: () => import('./project-homepage/ProjectHomepage'),
-    [Scene.ProjectSettings]: () => import('./project/Settings'),
     [Scene.ProjectCreateFirst]: () => import('./project/Create'),
     [Scene.SystemStatus]: () => import('./instance/SystemStatus'),
     [Scene.ToolbarLaunch]: () => import('./toolbar-launch/ToolbarLaunch'),
     [Scene.Site]: () => import('./sites/Site'),
     [Scene.AsyncMigrations]: () => import('./instance/AsyncMigrations/AsyncMigrations'),
     [Scene.DeadLetterQueue]: () => import('./instance/DeadLetterQueue/DeadLetterQueue'),
-    [Scene.MySettings]: () => import('./me/Settings'),
-    [Scene.Annotations]: () => import('./annotations/Annotations'),
     [Scene.PreflightCheck]: () => import('./PreflightCheck/PreflightCheck'),
     [Scene.Signup]: () => import('./authentication/signup/SignupContainer'),
     [Scene.InviteSignup]: () => import('./authentication/InviteSignup'),
@@ -74,7 +64,6 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.PasswordResetComplete]: () => import('./authentication/PasswordResetComplete'),
     [Scene.Unsubscribe]: () => import('./Unsubscribe/Unsubscribe'),
     [Scene.IntegrationsRedirect]: () => import('./IntegrationsRedirect/IntegrationsRedirect'),
-    [Scene.IngestionWarnings]: () => import('./data-management/ingestion-warnings/IngestionWarningsView'),
     [Scene.DebugQuery]: () => import('./debug/DebugScene'),
     [Scene.VerifyEmail]: () => import('./authentication/signup/verify-email/VerifyEmail'),
     [Scene.Feedback]: () => import('./feedback/Feedback'),
@@ -83,4 +72,5 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.Canvas]: () => import('./notebooks/NotebookCanvasScene'),
     [Scene.Products]: () => import('./products/Products'),
     [Scene.Onboarding]: () => import('./onboarding/Onboarding'),
+    [Scene.Settings]: () => import('./settings/SettingsScene'),
 }
diff --git a/frontend/src/scenes/authentication/Login.stories.tsx b/frontend/src/scenes/authentication/Login.stories.tsx
index 909643db6200e2..f6ffca2742686a 100644
--- a/frontend/src/scenes/authentication/Login.stories.tsx
+++ b/frontend/src/scenes/authentication/Login.stories.tsx
@@ -1,5 +1,5 @@
 // Login.stories.tsx
-import { Meta } from '@storybook/react'
+import { Meta, StoryFn } from '@storybook/react'
 import { Login } from './Login'
 import { mswDecorator, useStorybookMocks } from '~/mocks/browser'
 import { useEffect } from 'react'
@@ -27,7 +27,8 @@ const meta: Meta = {
     ],
 }
 export default meta
-export const Cloud = (): JSX.Element => {
+
+export const Cloud: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': {
@@ -41,7 +42,8 @@ export const Cloud = (): JSX.Element => {
     })
     return <Login />
 }
-export const CloudEU = (): JSX.Element => {
+
+export const CloudEU: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': {
@@ -56,7 +58,8 @@ export const CloudEU = (): JSX.Element => {
     })
     return <Login />
 }
-export const CloudWithGoogleLoginEnforcement = (): JSX.Element => {
+
+export const CloudWithGoogleLoginEnforcement: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': {
@@ -78,7 +81,13 @@ export const CloudWithGoogleLoginEnforcement = (): JSX.Element => {
     }, [])
     return <Login />
 }
-export const SelfHosted = (): JSX.Element => {
+CloudWithGoogleLoginEnforcement.parameters = {
+    testOptions: {
+        waitForSelector: '[href^="/login/google-oauth2/"]',
+    },
+}
+
+export const SelfHosted: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': {
@@ -92,7 +101,7 @@ export const SelfHosted = (): JSX.Element => {
     return <Login />
 }
 
-export const SelfHostedWithSAML = (): JSX.Element => {
+export const SelfHostedWithSAML: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': {
@@ -105,8 +114,13 @@ export const SelfHostedWithSAML = (): JSX.Element => {
     })
     return <Login />
 }
+SelfHostedWithSAML.parameters = {
+    testOptions: {
+        waitForSelector: '[href^="/login/saml/"]',
+    },
+}
 
-export const SSOError = (): JSX.Element => {
+export const SSOError: StoryFn = () => {
     useStorybookMocks({
         get: {
             '/_preflight': preflightJson,
@@ -119,7 +133,7 @@ export const SSOError = (): JSX.Element => {
     return <Login />
 }
 
-export const SecondFactor = (): JSX.Element => {
+export const SecondFactor: StoryFn = () => {
     useEffect(() => {
         // Change the URL
         router.actions.push(urls.login2FA())
diff --git a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
index 1dbcff91d0be7a..c9a92bb9d1aa8e 100644
--- a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
@@ -7,7 +7,6 @@ import { Form } from 'kea-forms'
 import { Field } from 'lib/forms/Field'
 import { batchExportLogic } from './batchExportLogic'
 import { LemonCalendarSelectInput } from 'lib/lemon-ui/LemonCalendar/LemonCalendarSelect'
-import { LemonBanner } from '@posthog/lemon-ui'
 
 export function BatchExportBackfillModal(): JSX.Element {
     const { batchExportConfig, isBackfillModalOpen, isBackfillFormSubmitting } = useValues(batchExportLogic)
@@ -54,11 +53,6 @@ export function BatchExportBackfillModal(): JSX.Element {
                 enableFormOnSubmit
                 className="space-y-2"
             >
-                <LemonBanner type="warning">
-                    Exporting historical data beyond 1 month is not recommended. We are actively working on increasing
-                    this limit.
-                </LemonBanner>
-
                 <Field name="start_at" label="Start Date" className="flex-1">
                     {({ value, onChange }) => (
                         <LemonCalendarSelectInput value={value} onChange={onChange} placeholder="Select start date" />
diff --git a/frontend/src/scenes/batch_exports/BatchExportScene.tsx b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
index b386c14819d6eb..148297c77d3558 100644
--- a/frontend/src/scenes/batch_exports/BatchExportScene.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
@@ -272,6 +272,7 @@ function BatchExportLogEntryLevelDisplay(type: BatchExportLogEntryLevel): JSX.El
         default:
             break
     }
+    // eslint-disable-next-line react/forbid-dom-props
     return <span style={{ color }}>{type}</span>
 }
 
diff --git a/frontend/src/scenes/billing/BillingGauge.scss b/frontend/src/scenes/billing/BillingGauge.scss
index 3a2078442842df..37ebdc11bbd20b 100644
--- a/frontend/src/scenes/billing/BillingGauge.scss
+++ b/frontend/src/scenes/billing/BillingGauge.scss
@@ -1,8 +1,5 @@
-.BillingGauge {
-}
-
 .BillingGaugeItem {
-    transition: all 1000ms cubic-bezier(0.15, 0.15, 0.2, 1);
+    animation: billing-gauge-item-expand 800ms cubic-bezier(0.15, 0.15, 0.2, 1) forwards;
 
     .BillingGaugeItem__info {
         position: absolute;
@@ -28,3 +25,12 @@
         }
     }
 }
+
+@keyframes billing-gauge-item-expand {
+    0% {
+        width: 0%;
+    }
+    100% {
+        width: var(--billing-gauge-item-width);
+    }
+}
diff --git a/frontend/src/scenes/billing/BillingGauge.tsx b/frontend/src/scenes/billing/BillingGauge.tsx
index cce1c0b9663a46..bdc61e4437a0c0 100644
--- a/frontend/src/scenes/billing/BillingGauge.tsx
+++ b/frontend/src/scenes/billing/BillingGauge.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { compactNumber } from 'lib/utils'
-import { useEffect, useMemo, useState } from 'react'
+import { useMemo } from 'react'
 import './BillingGauge.scss'
 
 type BillingGaugeItemProps = {
@@ -16,9 +16,7 @@ const BillingGaugeItem = ({ width, className, tooltip, top, value }: BillingGaug
     return (
         <div
             className={`BillingGaugeItem absolute top-0 left-0 bottom-0 h-2 ${className}`}
-            style={{
-                width: width,
-            }}
+            style={{ '--billing-gauge-item-width': width } as React.CSSProperties}
         >
             <div className="absolute right-0 w-px h-full bg-bg-light" />
             <Tooltip title={value.toLocaleString()} placement={'right'}>
@@ -45,22 +43,16 @@ export type BillingGaugeProps = {
 }
 
 export function BillingGauge({ items }: BillingGaugeProps): JSX.Element {
-    const [expanded, setExpanded] = useState(false)
     const maxScale = useMemo(() => {
         return Math.max(100, ...items.map((item) => item.value)) * 1.3
     }, [items])
 
-    useEffect(() => {
-        // On mount, animate the gauge to full width
-        setExpanded(true)
-    }, [])
-
     return (
         <div className="relative h-2 bg-border-light my-16">
             {items.map((item, i) => (
                 <BillingGaugeItem
                     key={i}
-                    width={expanded ? `${(item.value / maxScale) * 100}%` : '0%'}
+                    width={`${(item.value / maxScale) * 100}%`}
                     className={`bg-${item.color}`}
                     tooltip={<b>{item.text}</b>}
                     top={item.top}
diff --git a/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx b/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
index 77e0936068b45d..9a3b65fa24c034 100644
--- a/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
+++ b/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
@@ -82,7 +82,9 @@ export const UnsubscribeSurveyModal = ({ product }: { product: BillingProductV2T
                             type={textAreaNotEmpty ? 'primary' : 'tertiary'}
                             status={textAreaNotEmpty ? 'primary' : 'muted'}
                             onClick={() => {
-                                reportSurveySent(surveyID, surveyResponse)
+                                textAreaNotEmpty
+                                    ? reportSurveySent(surveyID, surveyResponse)
+                                    : reportSurveyDismissed(surveyID)
                                 deactivateProduct(product.type)
                             }}
                         >
diff --git a/frontend/src/scenes/billing/billing-utils.spec.ts b/frontend/src/scenes/billing/billing-utils.spec.ts
index 9680f478867382..a28188ba901a37 100644
--- a/frontend/src/scenes/billing/billing-utils.spec.ts
+++ b/frontend/src/scenes/billing/billing-utils.spec.ts
@@ -8,6 +8,7 @@ import {
 import tk from 'timekeeper'
 import { dayjs } from 'lib/dayjs'
 import billingJson from '~/mocks/fixtures/_billing_v2.json'
+import billingJsonWithFlatFee from '~/mocks/fixtures/_billing_v2_with_flat_fee.json'
 
 describe('summarizeUsage', () => {
     it('should summarise usage', () => {
@@ -148,6 +149,34 @@ describe('convertUsageToAmountWithPercentDiscount', () => {
         }
     )
 })
+
+const amountToUsageMappingWithFirstTierFlatFee = [
+    { usage: 5_000_000, amount: '200.00' },
+    { usage: 10_000_000, amount: '575.00' },
+    { usage: 30_000_000, amount: '1725.00' },
+]
+describe('amountToUsageMappingWithFirstTierFlatFee', () => {
+    it.each(amountToUsageMappingWithFirstTierFlatFee)(
+        'should convert usage to an amount based on the tiers',
+        (mapping) => {
+            if (billingJsonWithFlatFee.products[0].tiers) {
+                expect(convertUsageToAmount(mapping.usage, [billingJsonWithFlatFee.products[0].tiers])).toEqual(
+                    mapping.amount
+                )
+            }
+        }
+    )
+    it.each(amountToUsageMappingWithFirstTierFlatFee)(
+        'should convert amount to a usage based on the tiers',
+        (mapping) => {
+            if (billingJsonWithFlatFee.products[0].tiers) {
+                expect(convertAmountToUsage(mapping.amount, [billingJsonWithFlatFee.products[0].tiers])).toEqual(
+                    mapping.usage
+                )
+            }
+        }
+    )
+})
 describe('convertAmountToUsageWithPercentDiscount', () => {
     it.each(amountToUsageMappingWithPercentDiscount)(
         'should convert amount to a usage based on the tiers',
diff --git a/frontend/src/scenes/billing/billing-utils.ts b/frontend/src/scenes/billing/billing-utils.ts
index fd4c0d25bcd565..4b55f893bf04e2 100644
--- a/frontend/src/scenes/billing/billing-utils.ts
+++ b/frontend/src/scenes/billing/billing-utils.ts
@@ -50,12 +50,15 @@ export const convertUsageToAmount = (
     const tiers = productAndAddonTiers[0].map((tier, index) => {
         const allAddonsTiers = productAndAddonTiers.slice(1)
         let totalAmount = parseFloat(tier.unit_amount_usd)
+        let flatFee = parseFloat(tier.flat_amount_usd || '0')
         for (const addonTiers of allAddonsTiers) {
             totalAmount += parseFloat(addonTiers[index].unit_amount_usd)
+            flatFee += parseFloat(addonTiers[index].flat_amount_usd || '0')
         }
         return {
             ...tier,
             unit_amount_usd: totalAmount.toString(),
+            flat_amount_usd: flatFee.toString(),
         }
     })
 
@@ -66,9 +69,13 @@ export const convertUsageToAmount = (
 
         const tierUsageMax = tier.up_to ? tier.up_to - (previousTier?.up_to || 0) : Infinity
         const amountFloatUsd = parseFloat(tier.unit_amount_usd)
+        const tierFlatFee = parseFloat(tier.flat_amount_usd || '0')
         const usageThisTier = Math.min(remainingUsage, tierUsageMax)
         remainingUsage -= usageThisTier
         amount += amountFloatUsd * usageThisTier
+        if (tierFlatFee) {
+            amount += tierFlatFee
+        }
         previousTier = tier
     }
 
@@ -95,12 +102,15 @@ export const convertAmountToUsage = (
     const tiers = productAndAddonTiers[0].map((tier, index) => {
         const allAddonsTiers = productAndAddonTiers.slice(1)
         let totalAmount = parseFloat(tier.unit_amount_usd)
+        let flatFee = parseFloat(tier.flat_amount_usd || '0')
         for (const addonTiers of allAddonsTiers) {
             totalAmount += parseFloat(addonTiers[index].unit_amount_usd)
+            flatFee += parseFloat(addonTiers[index].flat_amount_usd || '0')
         }
         return {
             ...tier,
             unit_amount_usd: totalAmount.toString(),
+            flat_amount_usd: flatFee.toString(),
         }
     })
 
@@ -134,10 +144,14 @@ export const convertAmountToUsage = (
 
         const tierUsageMax = tier.up_to ? tier.up_to - (previousTier?.up_to || 0) : Infinity
         const amountFloatUsd = parseFloat(tier.unit_amount_usd)
+        const tierFlatFee = parseFloat(tier.flat_amount_usd || '0')
         const usageThisTier = Math.min(remainingAmount / amountFloatUsd, tierUsageMax)
 
         usage += usageThisTier
         remainingAmount -= amountFloatUsd * usageThisTier
+        if (tierFlatFee) {
+            remainingAmount -= tierFlatFee
+        }
         previousTier = tier
     }
 
diff --git a/frontend/src/scenes/billing/billingLogic.ts b/frontend/src/scenes/billing/billingLogic.ts
index 920e524ced18e5..4e694d0d115b20 100644
--- a/frontend/src/scenes/billing/billingLogic.ts
+++ b/frontend/src/scenes/billing/billingLogic.ts
@@ -231,7 +231,7 @@ export const billingLogic = kea<billingLogicType>([
                 license: !license ? 'Please enter your license key' : undefined,
             }),
             submit: async ({ license }, breakpoint) => {
-                breakpoint(500)
+                await breakpoint(500)
                 try {
                     await api.update('api/billing-v2/license', {
                         license,
diff --git a/frontend/src/scenes/cohorts/CohortEdit.tsx b/frontend/src/scenes/cohorts/CohortEdit.tsx
index ed5f3767cbfd2a..b72a0f20a3a8b6 100644
--- a/frontend/src/scenes/cohorts/CohortEdit.tsx
+++ b/frontend/src/scenes/cohorts/CohortEdit.tsx
@@ -110,9 +110,7 @@ export function CohortEdit({ id }: CohortLogicProps): JSX.Element {
                                     type="secondary"
                                     resource={{
                                         type: NotebookNodeType.Cohort,
-                                        attrs: {
-                                            id,
-                                        },
+                                        attrs: { id },
                                     }}
                                 />
                             )}
diff --git a/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaGroups.tsx b/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaGroups.tsx
index 44c2c7e6a0bc50..1535f6974e5917 100644
--- a/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaGroups.tsx
+++ b/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaGroups.tsx
@@ -47,7 +47,7 @@ export function CohortCriteriaGroups(logicProps: CohortLogicProps): JSX.Element
                                                 onChange={(value) => setInnerGroupType(value, groupIndex)}
                                                 value={group.type}
                                             />
-                                            <div style={{ flex: 1, minWidth: '0.5rem' }} />
+                                            <div className="flex-1 min-w-2" />
                                             <LemonButton
                                                 icon={<IconCopy />}
                                                 status="primary-alt"
diff --git a/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaRowBuilder.tsx b/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaRowBuilder.tsx
index 83f133b41035b0..4f7209a7d55839 100644
--- a/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaRowBuilder.tsx
+++ b/frontend/src/scenes/cohorts/CohortFilters/CohortCriteriaRowBuilder.tsx
@@ -121,7 +121,7 @@ export function CohortCriteriaRowBuilder({
                             />
                         )}
                     </div>
-                    <div style={{ display: 'flex' }}>
+                    <div className="flex">
                         <div>
                             <span className="CohortCriteriaRow__Criteria__arrow">&#8627;</span>
                         </div>
diff --git a/frontend/src/scenes/cohorts/Cohorts.tsx b/frontend/src/scenes/cohorts/Cohorts.tsx
index 3915962270746d..5966ef782dfcd3 100644
--- a/frontend/src/scenes/cohorts/Cohorts.tsx
+++ b/frontend/src/scenes/cohorts/Cohorts.tsx
@@ -1,13 +1,10 @@
 import { useState } from 'react'
 import { cohortsModel } from '../../models/cohortsModel'
 import { useValues, useActions } from 'kea'
-import { PageHeader } from 'lib/components/PageHeader'
 import { AvailableFeature, CohortType, ProductKey } from '~/types'
 import './Cohorts.scss'
-import Fuse from 'fuse.js'
 import { createdAtColumn, createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { Link } from 'lib/lemon-ui/Link'
-import { SceneExport } from 'scenes/sceneTypes'
 import { dayjs } from 'lib/dayjs'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { urls } from 'scenes/urls'
@@ -23,24 +20,15 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { ListHog } from 'lib/components/hedgehogs'
 
-const searchCohorts = (sources: CohortType[], search: string): CohortType[] => {
-    return new Fuse(sources, {
-        keys: ['name'],
-        threshold: 0.3,
-    })
-        .search(search)
-        .map((result) => result.item)
-}
-
 export function Cohorts(): JSX.Element {
-    const { cohorts, cohortsLoading } = useValues(cohortsModel)
+    const { cohorts, cohortsSearch, cohortsLoading } = useValues(cohortsModel)
     const { deleteCohort, exportCohortPersons } = useActions(cohortsModel)
     const { hasAvailableFeature } = useValues(userLogic)
     const { searchParams } = useValues(router)
     const [searchTerm, setSearchTerm] = useState<string>('')
     const { user } = useValues(userLogic)
     const { featureFlags } = useValues(featureFlagLogic)
-    const shouldShowEmptyState = cohorts.length == 0 && !cohortsLoading
+    const shouldShowEmptyState = cohorts?.length == 0 && !cohortsLoading
     const shouldShowProductIntroduction =
         !user?.has_seen_product_intro_for?.[ProductKey.COHORTS] &&
         !!featureFlags[FEATURE_FLAGS.SHOW_PRODUCT_INTRO_EXISTING_PRODUCTS]
@@ -160,17 +148,13 @@ export function Cohorts(): JSX.Element {
 
     return (
         <div>
-            <PageHeader
-                title="Cohorts"
-                caption="Create lists of users who have something in common to use in analytics or feature flags."
-            />
             {(shouldShowProductIntroduction || shouldShowEmptyState) && (
                 <ProductIntroduction
                     productName="Cohorts"
                     productKey={ProductKey.COHORTS}
                     thingName="cohort"
                     description="Use cohorts to group people together, such as users who used your app in the last week, or people who viewed the signup page but didn’t convert."
-                    isEmpty={cohorts.length == 0}
+                    isEmpty={cohorts?.length == 0}
                     docsURL="https://posthog.com/docs/data/cohorts"
                     action={() => router.actions.push(urls.cohort('new'))}
                     customHog={ListHog}
@@ -185,20 +169,13 @@ export function Cohorts(): JSX.Element {
                             onChange={setSearchTerm}
                             value={searchTerm}
                         />
-                        <LemonButton
-                            type="primary"
-                            data-attr="create-cohort"
-                            onClick={() => router.actions.push(urls.cohort('new'))}
-                        >
-                            New Cohort
-                        </LemonButton>
                     </div>
                     <LemonTable
                         columns={columns}
                         loading={cohortsLoading}
                         rowKey="id"
                         pagination={{ pageSize: 100 }}
-                        dataSource={searchTerm ? searchCohorts(cohorts, searchTerm) : cohorts}
+                        dataSource={searchTerm ? cohortsSearch(searchTerm) : cohorts ?? []}
                         nouns={['cohort', 'cohorts']}
                         data-attr="cohorts-table"
                     />
@@ -207,8 +184,3 @@ export function Cohorts(): JSX.Element {
         </div>
     )
 }
-
-export const scene: SceneExport = {
-    component: Cohorts,
-    logic: cohortsModel,
-}
diff --git a/frontend/src/scenes/cohorts/cohortUtils.tsx b/frontend/src/scenes/cohorts/cohortUtils.tsx
index cc1648410507fc..6c13ba3e5adc6c 100644
--- a/frontend/src/scenes/cohorts/cohortUtils.tsx
+++ b/frontend/src/scenes/cohorts/cohortUtils.tsx
@@ -240,8 +240,8 @@ export function validateGroup(
                     BehavioralLifecycleType.StopPerformEvent,
                     BehavioralEventType.PerformSequenceEvents,
                 ].includes(c.value as BehavioralLifecycleType | BehavioralEventType)
-                    ? calculateDays(Number(c.seq_time_value) ?? 0, c.seq_time_interval ?? TimeUnitType.Day) >
-                      calculateDays(Number(c.time_value) ?? 0, c.time_interval ?? TimeUnitType.Day)
+                    ? calculateDays(Number(c.seq_time_value ?? 0), c.seq_time_interval ?? TimeUnitType.Day) >
+                      calculateDays(Number(c.time_value ?? 0), c.time_interval ?? TimeUnitType.Day)
                         ? {
                               id: CohortClientErrors.SequentialTimeMismatch,
                               seq_time_value: CohortClientErrors.SequentialTimeMismatch,
diff --git a/frontend/src/scenes/dashboard/Dashboard.tsx b/frontend/src/scenes/dashboard/Dashboard.tsx
index b91f23eba7cb04..03418ed2e140cf 100644
--- a/frontend/src/scenes/dashboard/Dashboard.tsx
+++ b/frontend/src/scenes/dashboard/Dashboard.tsx
@@ -3,7 +3,6 @@ import { BindLogic, useActions, useValues } from 'kea'
 import { dashboardLogic, DashboardLogicProps } from 'scenes/dashboard/dashboardLogic'
 import { DashboardItems } from 'scenes/dashboard/DashboardItems'
 import { DateFilter } from 'lib/components/DateFilter/DateFilter'
-import { CalendarOutlined } from '@ant-design/icons'
 import './Dashboard.scss'
 import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
 import { DashboardMode, DashboardPlacement, DashboardType } from '~/types'
@@ -21,6 +20,7 @@ import { groupsModel } from '../../models/groupsModel'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { urls } from 'scenes/urls'
+import { IconCalendar } from '@posthog/icons'
 
 interface DashboardProps {
     id?: string
@@ -128,7 +128,7 @@ function DashboardScene(): JSX.Element {
                                         disabled={!canEditDashboard}
                                         makeLabel={(key) => (
                                             <>
-                                                <CalendarOutlined />
+                                                <IconCalendar />
                                                 <span className="hide-when-small"> {key}</span>
                                             </>
                                         )}
diff --git a/frontend/src/scenes/dashboard/DashboardCollaborators.tsx b/frontend/src/scenes/dashboard/DashboardCollaborators.tsx
index 2c91d4ff3000c7..4f13b597f8fee9 100644
--- a/frontend/src/scenes/dashboard/DashboardCollaborators.tsx
+++ b/frontend/src/scenes/dashboard/DashboardCollaborators.tsx
@@ -88,12 +88,7 @@ export function DashboardCollaboration({ dashboardId }: { dashboardId: Dashboard
                                 </div>
                             )}
                             <h5 className="mt-4">Project members with access</h5>
-                            <div
-                                className="mt-2 pb-2 rounded overflow-y-auto"
-                                style={{
-                                    maxHeight: 300,
-                                }}
-                            >
+                            <div className="mt-2 pb-2 rounded overflow-y-auto" style={{ maxHeight: 300 }}>
                                 {allCollaborators.map((collaborator) => (
                                     <CollaboratorRow
                                         key={collaborator.user.uuid}
diff --git a/frontend/src/scenes/dashboard/dashboardCollaboratorsLogic.ts b/frontend/src/scenes/dashboard/dashboardCollaboratorsLogic.ts
index cc932e0138c123..1ff801b17ead30 100644
--- a/frontend/src/scenes/dashboard/dashboardCollaboratorsLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardCollaboratorsLogic.ts
@@ -2,7 +2,6 @@ import { loaders } from 'kea-loaders'
 import { kea, props, key, path, connect, actions, reducers, selectors, events } from 'kea'
 import api from 'lib/api'
 import { DashboardPrivilegeLevel, DashboardRestrictionLevel } from 'lib/constants'
-import { teamMembersLogic } from 'scenes/project/Settings/teamMembersLogic'
 import {
     DashboardType,
     DashboardCollaboratorType,
@@ -12,6 +11,7 @@ import {
 } from '~/types'
 import type { dashboardCollaboratorsLogicType } from './dashboardCollaboratorsLogicType'
 import { dashboardLogic } from './dashboardLogic'
+import { teamMembersLogic } from 'scenes/settings/project/teamMembersLogic'
 
 export interface DashboardCollaboratorsLogicProps {
     dashboardId: DashboardType['id']
diff --git a/frontend/src/scenes/dashboard/dashboards/DashboardsTable.tsx b/frontend/src/scenes/dashboard/dashboards/DashboardsTable.tsx
index 31e4eb0f8a471c..2f0fa2f4aa9264 100644
--- a/frontend/src/scenes/dashboard/dashboards/DashboardsTable.tsx
+++ b/frontend/src/scenes/dashboard/dashboards/DashboardsTable.tsx
@@ -22,7 +22,7 @@ import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { LemonRow } from 'lib/lemon-ui/LemonRow'
 import { DASHBOARD_CANNOT_EDIT_MESSAGE } from '../DashboardHeader'
 import { LemonInput, LemonSelect } from '@posthog/lemon-ui'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
 
 export function DashboardsTableContainer(): JSX.Element {
diff --git a/frontend/src/scenes/dashboard/dashboards/NoDashboards.tsx b/frontend/src/scenes/dashboard/dashboards/NoDashboards.tsx
index d238d6276f645b..0b3dc1735d610f 100644
--- a/frontend/src/scenes/dashboard/dashboards/NoDashboards.tsx
+++ b/frontend/src/scenes/dashboard/dashboards/NoDashboards.tsx
@@ -1,6 +1,7 @@
 import { useActions } from 'kea'
 import { newDashboardLogic } from 'scenes/dashboard/newDashboardLogic'
 import { Card } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { AppstoreAddOutlined } from '@ant-design/icons'
 
 export const NoDashboards = (): JSX.Element => {
@@ -21,7 +22,7 @@ export const NoDashboards = (): JSX.Element => {
                         })
                     }
                 >
-                    <div style={{ textAlign: 'center', fontSize: 40 }}>
+                    <div className="text-4xl text-center">
                         <AppstoreAddOutlined />
                     </div>
                 </Card>
@@ -36,7 +37,7 @@ export const NoDashboards = (): JSX.Element => {
                         })
                     }
                 >
-                    <div style={{ textAlign: 'center', fontSize: 40 }}>
+                    <div className="text-4xl text-center">
                         <AppstoreAddOutlined />
                     </div>
                 </Card>
diff --git a/frontend/src/scenes/data-management/DataManagementPageTabs.tsx b/frontend/src/scenes/data-management/DataManagementPageTabs.tsx
deleted file mode 100644
index f78c851a7f43bf..00000000000000
--- a/frontend/src/scenes/data-management/DataManagementPageTabs.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { actionToUrl, urlToAction } from 'kea-router'
-import { kea, useActions, useValues, path, connect, actions, reducers, selectors } from 'kea'
-import { urls } from 'scenes/urls'
-import type { eventsTabsLogicType } from './DataManagementPageTabsType'
-import { Tooltip } from 'lib/lemon-ui/Tooltip'
-import { IconInfo } from 'lib/lemon-ui/icons'
-import { TitleWithIcon } from 'lib/components/TitleWithIcon'
-import { FEATURE_FLAGS } from 'lib/constants'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
-import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
-
-export enum DataManagementTab {
-    Actions = 'actions',
-    EventDefinitions = 'events',
-    PropertyDefinitions = 'properties',
-    History = 'history',
-    IngestionWarnings = 'warnings',
-    Database = 'database',
-}
-
-const tabUrls = {
-    [DataManagementTab.PropertyDefinitions]: urls.propertyDefinitions(),
-    [DataManagementTab.EventDefinitions]: urls.eventDefinitions(),
-    [DataManagementTab.Actions]: urls.actions(),
-    [DataManagementTab.History]: urls.dataManagementHistory(),
-    [DataManagementTab.IngestionWarnings]: urls.ingestionWarnings(),
-    [DataManagementTab.Database]: urls.database(),
-}
-
-const eventsTabsLogic = kea<eventsTabsLogicType>([
-    path(['scenes', 'events', 'eventsTabsLogic']),
-    connect({
-        values: [featureFlagLogic, ['featureFlags']],
-    }),
-    actions({
-        setTab: (tab: DataManagementTab) => ({ tab }),
-    }),
-    reducers({
-        tab: [
-            DataManagementTab.EventDefinitions as DataManagementTab,
-            {
-                setTab: (_, { tab }) => tab,
-            },
-        ],
-    }),
-    selectors({
-        showWarningsTab: [
-            (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED],
-        ],
-    }),
-    actionToUrl(() => ({
-        setTab: ({ tab }) => tabUrls[tab as DataManagementTab] || urls.events(),
-    })),
-    urlToAction(({ actions, values }) => {
-        return Object.fromEntries(
-            Object.entries(tabUrls).map(([key, url]) => [
-                url,
-                () => {
-                    if (values.tab !== key) {
-                        actions.setTab(key as DataManagementTab)
-                    }
-                },
-            ])
-        )
-    }),
-])
-
-export function DataManagementPageTabs({ tab }: { tab: DataManagementTab }): JSX.Element {
-    const { showWarningsTab } = useValues(eventsTabsLogic)
-    const { setTab } = useActions(eventsTabsLogic)
-
-    return (
-        <>
-            <LemonTabs
-                activeKey={tab}
-                onChange={(t) => setTab(t)}
-                tabs={[
-                    {
-                        key: DataManagementTab.EventDefinitions,
-                        label: <span data-attr="data-management-events-tab">Events</span>,
-                    },
-                    {
-                        key: DataManagementTab.Actions,
-                        label: (
-                            <TitleWithIcon
-                                icon={
-                                    <Tooltip title="Actions consist of one or more events that you have decided to put into a deliberately-labeled bucket. They're used in insights and dashboards.">
-                                        <IconInfo />
-                                    </Tooltip>
-                                }
-                                data-attr="data-management-actions-tab"
-                            >
-                                Actions
-                            </TitleWithIcon>
-                        ),
-                    },
-                    {
-                        key: DataManagementTab.PropertyDefinitions,
-                        label: (
-                            <TitleWithIcon
-                                icon={
-                                    <Tooltip title="Properties are additional data sent along with an event capture. Use properties to understand additional information about events and the actors that generate them.">
-                                        <IconInfo />
-                                    </Tooltip>
-                                }
-                                data-attr="data-management-event-properties-tab"
-                            >
-                                Properties
-                            </TitleWithIcon>
-                        ),
-                    },
-                    {
-                        key: DataManagementTab.History,
-                        label: <span data-attr="data-management-history-tab">History</span>,
-                    },
-
-                    showWarningsTab && {
-                        key: DataManagementTab.IngestionWarnings,
-                        label: <span data-attr="data-management-warnings-tab">Ingestion Warnings</span>,
-                    },
-
-                    {
-                        key: DataManagementTab.Database,
-                        label: (
-                            <span data-attr="data-management-database-tab">
-                                Database
-                                <LemonTag type="warning" className="uppercase ml-2">
-                                    Beta
-                                </LemonTag>
-                            </span>
-                        ),
-                    },
-                ]}
-            />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/data-management/DataManagementScene.stories.tsx b/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
index e1c6f67232a9e4..9f2492a913ce45 100644
--- a/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
+++ b/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
@@ -1,4 +1,4 @@
-import { mswDecorator } from '~/mocks/browser'
+import { mswDecorator, setFeatureFlags } from '~/mocks/browser'
 import { Meta } from '@storybook/react'
 import { useAvailableFeatures } from '~/mocks/features'
 import { AvailableFeature } from '~/types'
@@ -9,6 +9,7 @@ import { App } from 'scenes/App'
 import { DatabaseSchemaQueryResponse } from '~/queries/schema'
 import { ingestionWarningsResponse } from './ingestion-warnings/__mocks__/ingestion-warnings-response'
 import { dayjs } from 'lib/dayjs'
+import { FEATURE_FLAGS } from 'lib/constants'
 
 const MOCK_DATABASE: DatabaseSchemaQueryResponse = {
     events: [
@@ -116,6 +117,7 @@ export function Database(): JSX.Element {
 }
 
 export function IngestionWarnings(): JSX.Element {
+    setFeatureFlags([FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED])
     useEffect(() => {
         router.actions.push(urls.ingestionWarnings())
     }, [])
diff --git a/frontend/src/scenes/data-management/DataManagementScene.tsx b/frontend/src/scenes/data-management/DataManagementScene.tsx
new file mode 100644
index 00000000000000..0513de6e11e5e3
--- /dev/null
+++ b/frontend/src/scenes/data-management/DataManagementScene.tsx
@@ -0,0 +1,207 @@
+import { actions, connect, kea, path, reducers, selectors, useActions, useValues } from 'kea'
+import { actionToUrl, urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { IconInfo } from 'lib/lemon-ui/icons'
+import { TitleWithIcon } from 'lib/components/TitleWithIcon'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
+import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
+import React from 'react'
+import { SceneExport } from 'scenes/sceneTypes'
+import { PageHeader } from 'lib/components/PageHeader'
+import { NewActionButton } from 'scenes/actions/NewActionButton'
+import { Annotations } from 'scenes/annotations'
+
+import type { dataManagementSceneLogicType } from './DataManagementSceneType'
+import { NewAnnotationButton } from 'scenes/annotations/AnnotationModal'
+import { EventDefinitionsTable } from './events/EventDefinitionsTable'
+import { ActionsTable } from './actions/ActionsTable'
+import { PropertyDefinitionsTable } from './properties/PropertyDefinitionsTable'
+import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
+import { ActivityScope } from 'lib/components/ActivityLog/humanizeActivity'
+import { IngestionWarningsView } from './ingestion-warnings/IngestionWarningsView'
+import { DatabaseTableList } from './database/DatabaseTableList'
+import { Breadcrumb } from '~/types'
+import { capitalizeFirstLetter } from 'lib/utils'
+
+export enum DataManagementTab {
+    Actions = 'actions',
+    EventDefinitions = 'events',
+    PropertyDefinitions = 'properties',
+    Annotations = 'annotations',
+    History = 'history',
+    IngestionWarnings = 'warnings',
+    Database = 'database',
+}
+
+const tabs: Record<
+    DataManagementTab,
+    { url: string; label: LemonTab<any>['label']; content: JSX.Element; buttons?: React.ReactNode }
+> = {
+    [DataManagementTab.EventDefinitions]: {
+        url: urls.eventDefinitions(),
+        label: 'Events',
+        content: <EventDefinitionsTable />,
+    },
+    [DataManagementTab.Actions]: {
+        url: urls.actions(),
+        label: (
+            <TitleWithIcon
+                icon={
+                    <Tooltip title="Actions consist of one or more events that you have decided to put into a deliberately-labeled bucket. They're used in insights and dashboards.">
+                        <IconInfo />
+                    </Tooltip>
+                }
+            >
+                Actions
+            </TitleWithIcon>
+        ),
+        buttons: <NewActionButton />,
+        content: <ActionsTable />,
+    },
+    [DataManagementTab.PropertyDefinitions]: {
+        url: urls.propertyDefinitions(),
+        label: (
+            <TitleWithIcon
+                icon={
+                    <Tooltip title="Properties are additional data sent along with an event capture. Use properties to understand additional information about events and the actors that generate them.">
+                        <IconInfo />
+                    </Tooltip>
+                }
+            >
+                Properties
+            </TitleWithIcon>
+        ),
+        content: <PropertyDefinitionsTable />,
+    },
+    [DataManagementTab.Annotations]: {
+        url: urls.annotations(),
+        content: <Annotations />,
+        label: 'Annotations',
+        buttons: <NewAnnotationButton />,
+    },
+    [DataManagementTab.History]: {
+        url: urls.dataManagementHistory(),
+        label: 'History',
+        content: (
+            <ActivityLog
+                scope={ActivityScope.DATA_MANAGEMENT}
+                caption={
+                    'Only actions taken in the UI are captured in History. Automatic creation of definitions by ingestion is not shown here.'
+                }
+            />
+        ),
+    },
+    [DataManagementTab.IngestionWarnings]: {
+        url: urls.ingestionWarnings(),
+        label: 'Ingestion Warnings',
+        content: <IngestionWarningsView />,
+    },
+    [DataManagementTab.Database]: {
+        url: urls.database(),
+        label: (
+            <>
+                Database
+                <LemonTag type="warning" className="uppercase ml-2">
+                    Beta
+                </LemonTag>
+            </>
+        ),
+        content: <DatabaseTableList />,
+    },
+}
+
+const dataManagementSceneLogic = kea<dataManagementSceneLogicType>([
+    path(['scenes', 'events', 'dataManagementSceneLogic']),
+    connect({
+        values: [featureFlagLogic, ['featureFlags']],
+    }),
+    actions({
+        setTab: (tab: DataManagementTab) => ({ tab }),
+    }),
+    reducers({
+        tab: [
+            DataManagementTab.EventDefinitions as DataManagementTab,
+            {
+                setTab: (_, { tab }) => tab,
+            },
+        ],
+    }),
+    selectors({
+        breadcrumbs: [
+            (s) => [s.tab],
+            (tab): Breadcrumb[] => {
+                return [
+                    {
+                        name: `Data Management`,
+                        path: tabs.events.url,
+                    },
+                    {
+                        name: capitalizeFirstLetter(tab),
+                        path: tabs[tab].url,
+                    },
+                ]
+            },
+        ],
+        showWarningsTab: [
+            (s) => [s.featureFlags],
+            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED],
+        ],
+        enabledTabs: [
+            (s) => [s.showWarningsTab],
+            (showWarningsTab): DataManagementTab[] => {
+                const allTabs = Object.keys(tabs)
+
+                return allTabs.filter((x) => {
+                    return x === DataManagementTab.IngestionWarnings ? showWarningsTab : true
+                }) as DataManagementTab[]
+            },
+        ],
+    }),
+    actionToUrl(() => ({
+        setTab: ({ tab }) => tabs[tab as DataManagementTab]?.url || tabs.events.url,
+    })),
+    urlToAction(({ actions, values }) => {
+        return Object.fromEntries(
+            Object.entries(tabs).map(([key, tab]) => [
+                tab.url,
+                () => {
+                    if (values.tab !== key) {
+                        actions.setTab(key as DataManagementTab)
+                    }
+                },
+            ])
+        )
+    }),
+])
+
+export function DataManagementScene(): JSX.Element {
+    const { enabledTabs, tab } = useValues(dataManagementSceneLogic)
+    const { setTab } = useActions(dataManagementSceneLogic)
+
+    const lemonTabs: LemonTab<DataManagementTab>[] = enabledTabs.map((key) => ({
+        key: key as DataManagementTab,
+        label: <span data-attr={`data-management-${key}-tab`}>{tabs[key].label}</span>,
+        content: tabs[key].content,
+    }))
+
+    return (
+        <>
+            <PageHeader
+                title="Data Management"
+                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
+                tabbedPage
+                buttons={<>{tabs[tab].buttons}</>}
+            />
+
+            <LemonTabs activeKey={tab} onChange={(t) => setTab(t)} tabs={lemonTabs} />
+        </>
+    )
+}
+
+export const scene: SceneExport = {
+    component: DataManagementScene,
+    logic: dataManagementSceneLogic,
+}
diff --git a/frontend/src/scenes/actions/ActionsTable.tsx b/frontend/src/scenes/data-management/actions/ActionsTable.tsx
similarity index 94%
rename from frontend/src/scenes/actions/ActionsTable.tsx
rename to frontend/src/scenes/data-management/actions/ActionsTable.tsx
index 38259efc8719aa..aa9bf6aad9876e 100644
--- a/frontend/src/scenes/actions/ActionsTable.tsx
+++ b/frontend/src/scenes/data-management/actions/ActionsTable.tsx
@@ -3,13 +3,12 @@ import { Radio } from 'antd'
 import { deleteWithUndo, stripHTTP } from 'lib/utils'
 import { useActions, useValues } from 'kea'
 import { actionsModel } from '~/models/actionsModel'
-import { NewActionButton } from './NewActionButton'
+import { NewActionButton } from '../../actions/NewActionButton'
 import { ActionType, AvailableFeature, ChartDisplayType, InsightType, ProductKey } from '~/types'
 import { userLogic } from 'scenes/userLogic'
-import { teamLogic } from '../teamLogic'
-import { SceneExport } from 'scenes/sceneTypes'
+import { teamLogic } from '../../teamLogic'
 import api from 'lib/api'
-import { urls } from '../urls'
+import { urls } from '../../urls'
 import { createdAtColumn, createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable/types'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
@@ -18,19 +17,12 @@ import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { combineUrl } from 'kea-router'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonInput } from '@posthog/lemon-ui'
 import { actionsLogic } from 'scenes/actions/actionsLogic'
 import { IconCheckmark, IconPlayCircle } from 'lib/lemon-ui/icons'
 import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
 
-export const scene: SceneExport = {
-    component: ActionsTable,
-    logic: actionsLogic,
-}
-
 export function ActionsTable(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
     const { actionsLoading } = useValues(actionsModel({ params: 'include_count=1' }))
@@ -230,13 +222,6 @@ export function ActionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-                buttons={<NewActionButton />}
-            />
-            <DataManagementPageTabs tab={DataManagementTab.Actions} />
             {(shouldShowEmptyState || shouldShowProductIntroduction) && (
                 <ProductIntroduction
                     productName="Actions"
diff --git a/frontend/src/scenes/data-management/database/DatabaseScene.tsx b/frontend/src/scenes/data-management/database/DatabaseScene.tsx
deleted file mode 100644
index adcca97e4bc956..00000000000000
--- a/frontend/src/scenes/data-management/database/DatabaseScene.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { SceneExport } from 'scenes/sceneTypes'
-import { databaseSceneLogic } from './databaseSceneLogic'
-import { useActions, useValues } from 'kea'
-import { LemonInput, Link } from '@posthog/lemon-ui'
-import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
-
-export function DatabaseScene(): JSX.Element {
-    const { searchTerm } = useValues(databaseSceneLogic)
-    const { setSearchTerm } = useActions(databaseSceneLogic)
-
-    return (
-        <div data-attr="database-scene">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.Database} />
-            <div className="flex items-center justify-between gap-2 mb-4">
-                <LemonInput type="search" placeholder="Search for tables" onChange={setSearchTerm} value={searchTerm} />
-            </div>
-            <div className="flex items-center justify-between gap-2 mb-4">
-                <div>
-                    These are the database tables you can query under SQL insights with{' '}
-                    <Link to="https://posthog.com/manual/hogql" target="_blank">
-                        HogQL
-                    </Link>
-                    .
-                </div>
-            </div>
-            <DatabaseTablesContainer />
-        </div>
-    )
-}
-
-export const scene: SceneExport = {
-    component: DatabaseScene,
-    logic: databaseSceneLogic,
-}
diff --git a/frontend/src/scenes/data-management/database/DatabaseTable.tsx b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
index 07a8d44f499cb0..1f330f8ad7f2db 100644
--- a/frontend/src/scenes/data-management/database/DatabaseTable.tsx
+++ b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
@@ -2,12 +2,12 @@ import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Link } from 'lib/lemon-ui/Link'
 import { ViewLinkDeleteButton } from 'scenes/data-warehouse/ViewLinkModal'
-import { DatabaseSceneRow } from 'scenes/data-warehouse/types'
+import { DatabaseTableListRow } from 'scenes/data-warehouse/types'
 import { urls } from 'scenes/urls'
 
 interface DatabaseTableProps {
     table: string
-    tables: DatabaseSceneRow[]
+    tables: DatabaseTableListRow[]
 }
 
 export function DatabaseTable({ table, tables }: DatabaseTableProps): JSX.Element {
diff --git a/frontend/src/scenes/data-management/database/DatabaseTableList.tsx b/frontend/src/scenes/data-management/database/DatabaseTableList.tsx
new file mode 100644
index 00000000000000..e9d41917e70315
--- /dev/null
+++ b/frontend/src/scenes/data-management/database/DatabaseTableList.tsx
@@ -0,0 +1,27 @@
+import { databaseTableListLogic } from './databaseTableListLogic'
+import { useActions, useValues } from 'kea'
+import { LemonInput, Link } from '@posthog/lemon-ui'
+import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
+
+export function DatabaseTableList(): JSX.Element {
+    const { searchTerm } = useValues(databaseTableListLogic)
+    const { setSearchTerm } = useActions(databaseTableListLogic)
+
+    return (
+        <div data-attr="database-list">
+            <div className="flex items-center justify-between gap-2 mb-4">
+                <LemonInput type="search" placeholder="Search for tables" onChange={setSearchTerm} value={searchTerm} />
+            </div>
+            <div className="flex items-center justify-between gap-2 mb-4">
+                <div>
+                    These are the database tables you can query under SQL insights with{' '}
+                    <Link to="https://posthog.com/manual/hogql" target="_blank">
+                        HogQL
+                    </Link>
+                    .
+                </div>
+            </div>
+            <DatabaseTablesContainer />
+        </div>
+    )
+}
diff --git a/frontend/src/scenes/data-management/database/DatabaseTables.tsx b/frontend/src/scenes/data-management/database/DatabaseTables.tsx
index 29f626f92286e9..2bad7c29098025 100644
--- a/frontend/src/scenes/data-management/database/DatabaseTables.tsx
+++ b/frontend/src/scenes/data-management/database/DatabaseTables.tsx
@@ -1,6 +1,6 @@
 import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { useActions, useValues } from 'kea'
-import { databaseSceneLogic, DatabaseSceneRow } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic, DatabaseTableListRow } from 'scenes/data-management/database/databaseTableListLogic'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { LemonButton, Link } from '@posthog/lemon-ui'
 import { urls } from 'scenes/urls'
@@ -12,7 +12,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 
 export function DatabaseTablesContainer(): JSX.Element {
-    const { filteredTables, databaseLoading } = useValues(databaseSceneLogic)
+    const { filteredTables, databaseLoading } = useValues(databaseTableListLogic)
     const { toggleFieldModal, selectTableName } = useActions(viewLinkLogic)
     const { featureFlags } = useValues(featureFlagLogic)
 
@@ -21,7 +21,7 @@ export function DatabaseTablesContainer(): JSX.Element {
             <DatabaseTables
                 tables={filteredTables}
                 loading={databaseLoading}
-                renderRow={(row: DatabaseSceneRow) => {
+                renderRow={(row: DatabaseTableListRow) => {
                     return (
                         <div className="px-4 py-3">
                             <div className="mt-2">
@@ -59,7 +59,7 @@ interface DatabaseTablesProps<T extends Record<string, any>> {
     extraColumns?: LemonTableColumns<T>
 }
 
-export function DatabaseTables<T extends DatabaseSceneRow>({
+export function DatabaseTables<T extends DatabaseTableListRow>({
     tables,
     loading,
     renderRow,
diff --git a/frontend/src/scenes/data-management/database/databaseSceneLogic.ts b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
similarity index 79%
rename from frontend/src/scenes/data-management/database/databaseSceneLogic.ts
rename to frontend/src/scenes/data-management/database/databaseTableListLogic.ts
index a3e53d53091fda..dcacee040b8485 100644
--- a/frontend/src/scenes/data-management/database/databaseSceneLogic.ts
+++ b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
@@ -2,16 +2,17 @@ import { actions, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { query } from '~/queries/query'
 
-import type { databaseSceneLogicType } from './databaseSceneLogicType'
 import { DatabaseSchemaQuery, DatabaseSchemaQueryResponseField, NodeKind } from '~/queries/schema'
 
-export interface DatabaseSceneRow {
+import type { databaseTableListLogicType } from './databaseTableListLogicType'
+
+export interface DatabaseTableListRow {
     name: string
     columns: DatabaseSchemaQueryResponseField[]
 }
 
-export const databaseSceneLogic = kea<databaseSceneLogicType>([
-    path(['scenes', 'data-management', 'database', 'databaseSceneLogic']),
+export const databaseTableListLogic = kea<databaseTableListLogicType>([
+    path(['scenes', 'data-management', 'database', 'databaseTableListLogic']),
     actions({
         setSearchTerm: (searchTerm: string) => ({ searchTerm }),
     }),
@@ -28,7 +29,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
     selectors({
         filteredTables: [
             (s) => [s.database, s.searchTerm],
-            (database, searchTerm): DatabaseSceneRow[] => {
+            (database, searchTerm): DatabaseTableListRow[] => {
                 if (!database) {
                     return []
                 }
@@ -39,7 +40,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
                             ({
                                 name: key,
                                 columns: value,
-                            } as DatabaseSceneRow)
+                            } as DatabaseTableListRow)
                     )
                     .filter(({ name }) => name.toLowerCase().includes(searchTerm.toLowerCase()))
                     .sort((a, b) => a.name.localeCompare(b.name))
@@ -47,7 +48,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
         ],
         tableOptions: [
             (s) => [s.filteredTables],
-            (filteredTables: DatabaseSceneRow[]) =>
+            (filteredTables: DatabaseTableListRow[]) =>
                 filteredTables.map((row) => ({
                     value: row.name,
                     label: row.name,
diff --git a/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx b/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
index fdc3adf810e0f9..7571d91bf57319 100644
--- a/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
+++ b/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
@@ -6,13 +6,10 @@ import {
     EVENT_DEFINITIONS_PER_PAGE,
     eventDefinitionsTableLogic,
 } from 'scenes/data-management/events/eventDefinitionsTableLogic'
-import { SceneExport } from 'scenes/sceneTypes'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { EventDefinitionHeader } from 'scenes/data-management/events/DefinitionHeader'
 import { EventDefinitionProperties } from 'scenes/data-management/events/EventDefinitionProperties'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonButton, LemonInput, LemonSelect, LemonSelectOptions, Link } from '@posthog/lemon-ui'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { urls } from 'scenes/urls'
@@ -35,12 +32,6 @@ const eventTypeOptions: LemonSelectOptions<EventDefinitionType> = [
     },
 ]
 
-export const scene: SceneExport = {
-    component: EventDefinitionsTable,
-    logic: eventDefinitionsTableLogic,
-    paramsToProps: () => ({ syncWithUrl: true }),
-}
-
 export function EventDefinitionsTable(): JSX.Element {
     const { eventDefinitions, eventDefinitionsLoading, filters } = useValues(eventDefinitionsTableLogic)
     const { loadEventDefinitions, setFilters } = useActions(eventDefinitionsTableLogic)
@@ -124,14 +115,6 @@ export function EventDefinitionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-
-            <DataManagementPageTabs tab={DataManagementTab.EventDefinitions} />
-
             <LemonBanner className="mb-4" type="info">
                 Looking for{' '}
                 {filters.event_type === 'event_custom'
diff --git a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
index 005f24f8722479..58ce1a766852c1 100644
--- a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
@@ -1,5 +1,5 @@
 import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
-import { AnyPropertyFilter, Breadcrumb, EventDefinitionType, EventDefinition, PropertyDefinition } from '~/types'
+import { AnyPropertyFilter, EventDefinitionType, EventDefinition, PropertyDefinition } from '~/types'
 import type { eventDefinitionsTableLogicType } from './eventDefinitionsTableLogicType'
 import api, { PaginatedResponse } from 'lib/api'
 import { keyMappingKeys } from 'lib/taxonomy'
@@ -7,7 +7,6 @@ import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import { convertPropertyGroupToProperties, objectsEqual } from 'lib/utils'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { loaders } from 'kea-loaders'
-import { urls } from 'scenes/urls'
 
 export interface EventDefinitionsPaginatedResponse extends PaginatedResponse<EventDefinition> {
     current?: string
@@ -280,21 +279,6 @@ export const eventDefinitionsTableLogic = kea<eventDefinitionsTableLogicType>([
     selectors(({ cache }) => ({
         // Expose for testing
         apiCache: [() => [], () => cache.apiCache],
-        breadcrumbs: [
-            () => [],
-            (): Breadcrumb[] => {
-                return [
-                    {
-                        name: `Data Management`,
-                        path: urls.eventDefinitions(),
-                    },
-                    {
-                        name: 'Events',
-                        path: urls.eventDefinitions(),
-                    },
-                ]
-            },
-        ],
     })),
     listeners(({ actions, values, cache }) => ({
         setFilters: async () => {
diff --git a/frontend/src/scenes/data-management/history/History.tsx b/frontend/src/scenes/data-management/history/History.tsx
deleted file mode 100644
index 1bc446992f594e..00000000000000
--- a/frontend/src/scenes/data-management/history/History.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
-import { ActivityScope } from 'lib/components/ActivityLog/humanizeActivity'
-import { SceneExport } from 'scenes/sceneTypes'
-
-export function History(): JSX.Element {
-    return (
-        <div data-attr="database-scene">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.History} />
-            <ActivityLog
-                scope={ActivityScope.DATA_MANAGEMENT}
-                caption={
-                    'Only actions taken in the UI are captured in History. Automatic creation of definitions by ingestion is not shown here.'
-                }
-            />
-        </div>
-    )
-}
-
-export const scene: SceneExport = {
-    component: History,
-}
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
index ba5690063c8aae..1150d65f52f36d 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
+++ b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
@@ -1,8 +1,5 @@
 import { useValues } from 'kea'
-import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
 import { IngestionWarning, ingestionWarningsLogic, IngestionWarningSummary } from './ingestionWarningsLogic'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { TZLabel } from 'lib/components/TZLabel'
@@ -12,11 +9,6 @@ import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductI
 import { ProductKey } from '~/types'
 import { ReadingHog } from 'lib/components/hedgehogs'
 
-export const scene: SceneExport = {
-    component: IngestionWarningsView,
-    logic: ingestionWarningsLogic,
-}
-
 const WARNING_TYPE_TO_DESCRIPTION = {
     cannot_merge_already_identified: 'Refused to merge an already identified user',
     cannot_merge_with_illegal_distinct_id: 'Refused to merge with an illegal distinct id',
@@ -147,12 +139,6 @@ export function IngestionWarningsView(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.IngestionWarnings} />
             {data.length > 0 || dataLoading ? (
                 <>
                     <div className="mb-4">Data ingestion related warnings from past 30 days.</div>
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
index ecc8faeba9f9eb..c3509561e1a42a 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
+++ b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
@@ -1,4 +1,4 @@
-import { kea, connect, path, selectors, events } from 'kea'
+import { kea, connect, path, selectors, afterMount } from 'kea'
 import { loaders } from 'kea-loaders'
 import { Breadcrumb } from '~/types'
 import { urls } from 'scenes/urls'
@@ -82,10 +82,7 @@ export const ingestionWarningsLogic = kea<ingestionWarningsLogicType>([
             },
         ],
     }),
-
-    events(({ actions }) => ({
-        afterMount: () => {
-            actions.loadData()
-        },
-    })),
+    afterMount(({ actions }) => {
+        actions.loadData()
+    }),
 ])
diff --git a/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx b/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
index 3af8c729b86426..19a9d8429a0dbe 100644
--- a/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
+++ b/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
@@ -2,7 +2,6 @@ import './PropertyDefinitionsTable.scss'
 import { useActions, useValues } from 'kea'
 import { LemonTable, LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { PropertyDefinition } from '~/types'
-import { SceneExport } from 'scenes/sceneTypes'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { PropertyDefinitionHeader } from 'scenes/data-management/events/DefinitionHeader'
@@ -10,18 +9,10 @@ import {
     EVENT_PROPERTY_DEFINITIONS_PER_PAGE,
     propertyDefinitionsTableLogic,
 } from 'scenes/data-management/properties/propertyDefinitionsTableLogic'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonInput, LemonSelect, LemonTag, Link } from '@posthog/lemon-ui'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { urls } from 'scenes/urls'
 
-export const scene: SceneExport = {
-    component: PropertyDefinitionsTable,
-    logic: propertyDefinitionsTableLogic,
-    paramsToProps: () => ({ syncWithUrl: true }),
-}
-
 export function PropertyDefinitionsTable(): JSX.Element {
     const { propertyDefinitions, propertyDefinitionsLoading, filters, propertyTypeOptions } =
         useValues(propertyDefinitionsTableLogic)
@@ -73,12 +64,6 @@ export function PropertyDefinitionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.PropertyDefinitions} />
             <LemonBanner className="mb-4" type="info">
                 Looking for {filters.type === 'person' ? 'person ' : ''}property usage statistics?{' '}
                 <Link
diff --git a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
index 933c08d6442fc0..f83419217e84b0 100644
--- a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
@@ -1,5 +1,5 @@
 import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
-import { Breadcrumb, PropertyDefinition } from '~/types'
+import { PropertyDefinition } from '~/types'
 import api from 'lib/api'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import {
@@ -82,21 +82,6 @@ export const propertyDefinitionsTableLogic = kea<propertyDefinitionsTableLogicTy
         ],
     }),
     selectors({
-        breadcrumbs: [
-            () => [],
-            (): Breadcrumb[] => {
-                return [
-                    {
-                        name: `Data Management`,
-                        path: urls.eventDefinitions(),
-                    },
-                    {
-                        name: 'Properties',
-                        path: urls.propertyDefinitions(),
-                    },
-                ]
-            },
-        ],
         propertyTypeOptions: [
             (s) => [s.groupTypes, s.aggregationLabel],
             (groupTypes, aggregationLabel) => {
diff --git a/frontend/src/scenes/data-warehouse/external/DataWarehouseExternalScene.tsx b/frontend/src/scenes/data-warehouse/external/DataWarehouseExternalScene.tsx
index bdbef3bfdbc605..4f7133fff9e4e4 100644
--- a/frontend/src/scenes/data-warehouse/external/DataWarehouseExternalScene.tsx
+++ b/frontend/src/scenes/data-warehouse/external/DataWarehouseExternalScene.tsx
@@ -1,4 +1,4 @@
-import { LemonTag, Link, LemonButtonWithSideAction } from '@posthog/lemon-ui'
+import { LemonTag, Link, LemonButtonWithSideAction, LemonButton } from '@posthog/lemon-ui'
 import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
@@ -47,10 +47,14 @@ export function DataWarehouseExternalScene(): JSX.Element {
                             }}
                             data-attr="new-data-warehouse-easy-link"
                             key={'new-data-warehouse-easy-link'}
-                            onClick={toggleSourceModal}
+                            onClick={() => toggleSourceModal()}
                         >
                             Link Source
                         </LemonButtonWithSideAction>
+                    ) : !(shouldShowProductIntroduction || shouldShowEmptyState) ? (
+                        <LemonButton type="primary" to={urls.dataWarehouseTable()} data-attr="new-data-warehouse-table">
+                            New Table
+                        </LemonButton>
                     ) : undefined
                 }
                 caption={
@@ -72,7 +76,11 @@ export function DataWarehouseExternalScene(): JSX.Element {
                     description={
                         'Bring your production database, revenue data, CRM contacts or any other data into PostHog.'
                     }
-                    action={() => toggleSourceModal()}
+                    action={() =>
+                        featureFlags[FEATURE_FLAGS.DATA_WAREHOUSE_EXTERNAL_LINK]
+                            ? toggleSourceModal()
+                            : router.actions.push(urls.dataWarehouseTable())
+                    }
                     isEmpty={shouldShowEmptyState}
                     docsURL="https://posthog.com/docs/data/data-warehouse"
                     productKey={ProductKey.DATA_WAREHOUSE}
diff --git a/frontend/src/scenes/data-warehouse/external/SourceModal.tsx b/frontend/src/scenes/data-warehouse/external/SourceModal.tsx
index 0c32f1c7889585..2308ec31b3140f 100644
--- a/frontend/src/scenes/data-warehouse/external/SourceModal.tsx
+++ b/frontend/src/scenes/data-warehouse/external/SourceModal.tsx
@@ -2,7 +2,7 @@ import { LemonButton, LemonDivider, LemonInput, LemonModal, LemonModalProps } fr
 import { Form } from 'kea-forms'
 import { ConnectorConfigType, sourceModalLogic } from './sourceModalLogic'
 import { useActions, useValues } from 'kea'
-import { DatawarehouseTableForm } from '../DataWarehouseTableForm'
+import { DatawarehouseTableForm } from '../new_table/DataWarehouseTableForm'
 import { Field } from 'lib/forms/Field'
 import stripeLogo from 'public/stripe-logo.svg'
 
diff --git a/frontend/src/scenes/data-warehouse/external/dataWarehouseSceneLogic.tsx b/frontend/src/scenes/data-warehouse/external/dataWarehouseSceneLogic.tsx
index 0706fa65b707ee..238945ac9f5b96 100644
--- a/frontend/src/scenes/data-warehouse/external/dataWarehouseSceneLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/external/dataWarehouseSceneLogic.tsx
@@ -13,13 +13,13 @@ export const dataWarehouseSceneLogic = kea<dataWarehouseSceneLogicType>([
         values: [userLogic, ['user']],
     })),
     actions({
-        toggleSourceModal: true,
+        toggleSourceModal: (isOpen?: boolean) => ({ isOpen }),
     }),
     reducers({
         isSourceModalOpen: [
             false,
             {
-                toggleSourceModal: (state) => !state,
+                toggleSourceModal: (state, { isOpen }) => (isOpen != undefined ? isOpen : !state),
             },
         ],
     }),
diff --git a/frontend/src/scenes/data-warehouse/external/sourceModalLogic.ts b/frontend/src/scenes/data-warehouse/external/sourceModalLogic.ts
index a902950180adc1..398db7f8247a32 100644
--- a/frontend/src/scenes/data-warehouse/external/sourceModalLogic.ts
+++ b/frontend/src/scenes/data-warehouse/external/sourceModalLogic.ts
@@ -5,7 +5,7 @@ import { forms } from 'kea-forms'
 import { ExternalDataStripeSourceCreatePayload } from '~/types'
 import api from 'lib/api'
 import { lemonToast } from '@posthog/lemon-ui'
-import { dataWarehouseTableLogic } from '../dataWarehouseTableLogic'
+import { dataWarehouseTableLogic } from '../new_table/dataWarehouseTableLogic'
 import { dataWarehouseSceneLogic } from './dataWarehouseSceneLogic'
 import { router } from 'kea-router'
 import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/data-warehouse/DataWarehouseTableForm.tsx b/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx
similarity index 100%
rename from frontend/src/scenes/data-warehouse/DataWarehouseTableForm.tsx
rename to frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx
diff --git a/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableScene.tsx b/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableScene.tsx
new file mode 100644
index 00000000000000..e7c2fbf15e94ae
--- /dev/null
+++ b/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableScene.tsx
@@ -0,0 +1,65 @@
+import { dataWarehouseTableLogic } from './dataWarehouseTableLogic'
+import { LemonButton, Link } from '@posthog/lemon-ui'
+import { SceneExport } from 'scenes/sceneTypes'
+import { PageHeader } from 'lib/components/PageHeader'
+import { useActions, useValues } from 'kea'
+import { router } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { DatawarehouseTableForm } from './DataWarehouseTableForm'
+
+export const scene: SceneExport = {
+    component: DataWarehouseTable,
+    logic: dataWarehouseTableLogic,
+}
+export function DataWarehouseTable(): JSX.Element {
+    const { isEditingTable, tableLoading, table } = useValues(dataWarehouseTableLogic)
+    const { editingTable, loadTable, createTable } = useActions(dataWarehouseTableLogic)
+    return (
+        <>
+            <PageHeader
+                title={'New table'}
+                buttons={
+                    <div className="flex items-center gap-2">
+                        <LemonButton
+                            data-attr="cancel-table"
+                            type="secondary"
+                            loading={tableLoading}
+                            onClick={() => {
+                                if (isEditingTable) {
+                                    editingTable(false)
+                                    loadTable()
+                                } else {
+                                    router.actions.push(urls.dataWarehouse())
+                                }
+                            }}
+                        >
+                            Cancel
+                        </LemonButton>
+                        <LemonButton
+                            type="primary"
+                            data-attr="save-data-warehouse-table"
+                            onClick={() => {
+                                createTable(table)
+                            }}
+                            loading={tableLoading}
+                        >
+                            Save
+                        </LemonButton>
+                    </div>
+                }
+                caption={
+                    <div>
+                        External tables are supported through object storage systems like S3.{' '}
+                        <Link
+                            to="https://posthog.com/docs/data/data-warehouse#step-1-creating-a-bucket-in-s3"
+                            target="_blank"
+                        >
+                            Learn how to set up your data
+                        </Link>
+                    </div>
+                }
+            />
+            <DatawarehouseTableForm />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/data-warehouse/dataWarehouseTableLogic.tsx b/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
similarity index 89%
rename from frontend/src/scenes/data-warehouse/dataWarehouseTableLogic.tsx
rename to frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
index a3cacb9edc810b..910336cef0de69 100644
--- a/frontend/src/scenes/data-warehouse/dataWarehouseTableLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
@@ -7,9 +7,9 @@ import api from 'lib/api'
 import { urls } from 'scenes/urls'
 import { AnyPropertyFilter, Breadcrumb, DataWarehouseTable } from '~/types'
 import { DataTableNode } from '~/queries/schema'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import type { dataWarehouseTableLogicType } from './dataWarehouseTableLogicType'
-import { dataWarehouseSceneLogic } from './external/dataWarehouseSceneLogic'
+import { dataWarehouseSceneLogic } from '../external/dataWarehouseSceneLogic'
 
 export interface TableLogicProps {
     id: string | 'new'
@@ -32,7 +32,7 @@ export const dataWarehouseTableLogic = kea<dataWarehouseTableLogicType>([
     props({} as TableLogicProps),
     connect(() => ({
         actions: [
-            databaseSceneLogic,
+            databaseTableListLogic,
             ['loadDatabase'],
             dataWarehouseSceneLogic,
             ['loadDataWarehouse', 'toggleSourceModal'],
@@ -71,7 +71,7 @@ export const dataWarehouseTableLogic = kea<dataWarehouseTableLogicType>([
             lemonToast.success(<>Table {table.name} created</>)
             actions.loadDatabase()
             actions.loadDataWarehouse()
-            actions.toggleSourceModal()
+            actions.toggleSourceModal(false)
             router.actions.replace(urls.dataWarehouse())
         },
         updateTableSuccess: async ({ table }) => {
@@ -96,13 +96,15 @@ export const dataWarehouseTableLogic = kea<dataWarehouseTableLogicType>([
     }),
     selectors({
         breadcrumbs: [
-            (s) => [s.table],
-            (table: DataWarehouseTable): Breadcrumb[] => [
+            () => [],
+            (): Breadcrumb[] => [
                 {
-                    name: 'Tables',
-                    path: urls.dataWarehouse(),
+                    name: `Data Warehouse`,
+                    path: urls.dataWarehouseExternal(),
+                },
+                {
+                    name: 'New',
                 },
-                ...(table?.name ? [{ name: table.name }] : []),
             ],
         ],
     }),
diff --git a/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx b/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
index b6ae6d9a975aff..6e91637178af10 100644
--- a/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
+++ b/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
@@ -1,7 +1,7 @@
 import { LemonButton, LemonTag, Link } from '@posthog/lemon-ui'
 import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import { DataWarehousePageTabs, DataWarehouseTab } from '../DataWarehousePageTabs'
 import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
 import { ViewLinkModal } from '../ViewLinkModal'
@@ -12,7 +12,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
 
 export const scene: SceneExport = {
     component: DataWarehousePosthogScene,
-    logic: databaseSceneLogic,
+    logic: databaseTableListLogic,
 }
 
 export function DataWarehousePosthogScene(): JSX.Element {
diff --git a/frontend/src/scenes/data-warehouse/settings/DataWarehouseSettingsScene.tsx b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSettingsScene.tsx
index 93d475512c20dc..eb158c2f97c527 100644
--- a/frontend/src/scenes/data-warehouse/settings/DataWarehouseSettingsScene.tsx
+++ b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSettingsScene.tsx
@@ -1,4 +1,4 @@
-import { LemonButton, LemonTable, LemonTag } from '@posthog/lemon-ui'
+import { LemonButton, LemonTable, LemonTag, Spinner } from '@posthog/lemon-ui'
 import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
 import { dataWarehouseSettingsLogic } from './dataWarehouseSettingsLogic'
@@ -8,7 +8,6 @@ import SourceModal from '../external/SourceModal'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { More } from 'lib/lemon-ui/LemonButton/More'
-import { LoadingOutlined } from '@ant-design/icons'
 
 export const scene: SceneExport = {
     component: DataWarehouseSettingsScene,
@@ -46,7 +45,7 @@ export function DataWarehouseSettingsScene(): JSX.Element {
                             type="primary"
                             data-attr="new-data-warehouse-easy-link"
                             key={'new-data-warehouse-easy-link'}
-                            onClick={toggleSourceModal}
+                            onClick={() => toggleSourceModal()}
                         >
                             Link Source
                         </LemonButton>
@@ -89,7 +88,7 @@ export function DataWarehouseSettingsScene(): JSX.Element {
                                 <div className="flex flex-row justify-end">
                                     {sourceReloadingById[source.id] ? (
                                         <div>
-                                            <LoadingOutlined />
+                                            <Spinner />
                                         </div>
                                     ) : (
                                         <div>
diff --git a/frontend/src/scenes/data-warehouse/types.ts b/frontend/src/scenes/data-warehouse/types.ts
index 01db9119dd9eec..6da8ea535c24a4 100644
--- a/frontend/src/scenes/data-warehouse/types.ts
+++ b/frontend/src/scenes/data-warehouse/types.ts
@@ -1,11 +1,11 @@
 import { DatabaseSchemaQueryResponseField, HogQLQuery } from '~/queries/schema'
 
-export interface DatabaseSceneRow {
+export interface DatabaseTableListRow {
     name: string
     columns: DatabaseSchemaQueryResponseField[]
 }
 
-export interface DataWarehouseSceneRow extends DatabaseSceneRow {
+export interface DataWarehouseSceneRow extends DatabaseTableListRow {
     id: string
     url_pattern?: string
     format?: string
diff --git a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
index 634c44b2013d09..9e867642eed899 100644
--- a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
@@ -4,7 +4,7 @@ import { DataWarehouseSceneRow } from './types'
 import { DataWarehouseViewLink } from '~/types'
 import { forms } from 'kea-forms'
 import api from 'lib/api'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import { loaders } from 'kea-loaders'
 import { lemonToast } from 'lib/lemon-ui/lemonToast'
 import type { viewLinkLogicType } from './viewLinkLogicType'
@@ -26,8 +26,8 @@ export interface KeySelectOption {
 export const viewLinkLogic = kea<viewLinkLogicType>([
     path(['scenes', 'data-warehouse', 'viewLinkLogic']),
     connect({
-        values: [dataWarehouseSavedQueriesLogic, ['savedQueries'], databaseSceneLogic, ['tableOptions']],
-        actions: [databaseSceneLogic, ['loadDatabase']],
+        values: [dataWarehouseSavedQueriesLogic, ['savedQueries'], databaseTableListLogic, ['tableOptions']],
+        actions: [databaseTableListLogic, ['loadDatabase']],
     }),
     actions({
         selectView: (selectedView) => ({ selectedView }),
diff --git a/frontend/src/scenes/debug/HogQLDebug.tsx b/frontend/src/scenes/debug/HogQLDebug.tsx
index cf5b662a3f8f18..21cc7b0b13104f 100644
--- a/frontend/src/scenes/debug/HogQLDebug.tsx
+++ b/frontend/src/scenes/debug/HogQLDebug.tsx
@@ -91,6 +91,14 @@ export function HogQLDebug({ query, setQuery, queryKey }: HogQLDebugProps): JSX.
                     </>
                 ) : (
                     <>
+                        {response?.error ? (
+                            <>
+                                <h2 className="text-danger">Error Running Query!</h2>
+                                <CodeSnippet language={Language.Text} wrap>
+                                    {response.error}
+                                </CodeSnippet>
+                            </>
+                        ) : null}
                         {response?.hogql ? (
                             <>
                                 <h2>Executed HogQL</h2>
diff --git a/frontend/src/scenes/events/Owner.tsx b/frontend/src/scenes/events/Owner.tsx
index 1417abc6378312..600be23efbe120 100644
--- a/frontend/src/scenes/events/Owner.tsx
+++ b/frontend/src/scenes/events/Owner.tsx
@@ -6,12 +6,14 @@ export function Owner({ user, style = {} }: { user?: UserBasicType | null; style
     return (
         <>
             {user?.uuid ? (
-                <div style={{ display: 'flex', alignItems: 'center', flexDirection: 'row' }}>
+                <div className="flex items-center flex-row">
                     <ProfilePicture name={user.first_name} email={user.email} size="sm" />
-                    <span style={{ paddingLeft: 8, ...style }}>{user.first_name}</span>
+                    <span className="pl-2" style={style}>
+                        {user.first_name}
+                    </span>
                 </div>
             ) : (
-                <span className="text-muted" style={{ fontStyle: 'italic', ...style }}>
+                <span className="text-muted italic" style={style}>
                     No owner
                 </span>
             )}
diff --git a/frontend/src/scenes/experiments/Experiment.scss b/frontend/src/scenes/experiments/Experiment.scss
index 57258ee1a0b14c..dd965da7de5510 100644
--- a/frontend/src/scenes/experiments/Experiment.scss
+++ b/frontend/src/scenes/experiments/Experiment.scss
@@ -67,7 +67,7 @@
             }
 
             .ant-slider-rail {
-                background-color: #e5ebff;
+                background-color: var(--primary-highlight);
             }
         }
     }
@@ -174,32 +174,6 @@
         padding-top: 1rem;
     }
 
-    .significant-results {
-        padding: 0.5rem;
-        width: 100%;
-        background: rgba(119, 185, 108, 0.1);
-        border-radius: 4px;
-        text-align: center;
-        margin-bottom: 1rem;
-    }
-
-    .not-significant-results {
-        padding: 0.5rem;
-        width: 100%;
-        background: rgba(83, 117, 255, 0.1);
-        border-radius: 4px;
-        margin-bottom: 1rem;
-    }
-
-    .feature-flag-mods {
-        padding: 0.5rem;
-        width: 100%;
-        background: #f6ebf8;
-        color: var(--bg-charcoal);
-        border-radius: 4px;
-        margin-bottom: 1rem;
-    }
-
     .ant-collapse-content-box {
         display: flex;
         flex-flow: column;
@@ -271,28 +245,3 @@
     margin-left: 0.5rem;
     flex: 1;
 }
-
-.experiment-implementation-details,
-.experiment-workflow {
-    .ant-card-head {
-        padding-left: 1rem;
-        padding-right: 1rem;
-        border: none;
-    }
-
-    .ant-card-head-title {
-        border-bottom: 1px solid var(--border);
-    }
-    .exp-workflow-step {
-        margin-bottom: 0.5rem;
-        padding: 0.5rem;
-        border-radius: 4px;
-        &:hover {
-            cursor: pointer;
-        }
-    }
-
-    .step-completed {
-        background-color: #e5ebff;
-    }
-}
diff --git a/frontend/src/scenes/experiments/Experiment.stories.tsx b/frontend/src/scenes/experiments/Experiment.stories.tsx
index f4befaccc04feb..a80c329c6e478e 100644
--- a/frontend/src/scenes/experiments/Experiment.stories.tsx
+++ b/frontend/src/scenes/experiments/Experiment.stories.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { Meta } from '@storybook/react'
+import { Meta, StoryFn } from '@storybook/react'
 import { router } from 'kea-router'
 import { urls } from 'scenes/urls'
 import { App } from 'scenes/App'
@@ -454,7 +454,7 @@ const MOCK_TREND_EXPERIMENT_RESULTS: TrendsExperimentResults = {
                 },
                 aggregated_value: 0,
                 label: '$pageview - control',
-                count: 11.421053, // eslint-disable-line no-loss-of-precision
+                count: 11.421053,
                 data: [
                     2.4210526315789473, 1.4210526315789473, 3.4210526315789473, 0.4210526315789473, 3.4210526315789473,
                 ],
@@ -598,7 +598,7 @@ const meta: Meta = {
     ],
 }
 export default meta
-export function ExperimentsList(): JSX.Element {
+export const ExperimentsList: StoryFn = () => {
     useAvailableFeatures([AvailableFeature.EXPERIMENTATION])
     useEffect(() => {
         router.actions.push(urls.experiments())
@@ -606,15 +606,20 @@ export function ExperimentsList(): JSX.Element {
     return <App />
 }
 
-export function CompleteFunnelExperiment(): JSX.Element {
+export const CompleteFunnelExperiment: StoryFn = () => {
     useAvailableFeatures([AvailableFeature.EXPERIMENTATION])
     useEffect(() => {
         router.actions.push(urls.experiment(MOCK_FUNNEL_EXPERIMENT.id))
     }, [])
     return <App />
 }
+CompleteFunnelExperiment.parameters = {
+    testOptions: {
+        waitForSelector: '.card-secondary',
+    },
+}
 
-export function RunningTrendExperiment(): JSX.Element {
+export const RunningTrendExperiment: StoryFn = () => {
     useAvailableFeatures([AvailableFeature.EXPERIMENTATION])
     useEffect(() => {
         router.actions.push(urls.experiment(MOCK_TREND_EXPERIMENT.id))
@@ -622,22 +627,27 @@ export function RunningTrendExperiment(): JSX.Element {
 
     return <App />
 }
+RunningTrendExperiment.parameters = {
+    testOptions: {
+        waitForSelector: '.card-secondary',
+    },
+}
 
-export function ExperimentsListPayGate(): JSX.Element {
+export const ExperimentsListPayGate: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.experiments())
     }, [])
     return <App />
 }
 
-export function ViewExperimentPayGate(): JSX.Element {
+export const ViewExperimentPayGate: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.experiment(MOCK_FUNNEL_EXPERIMENT.id))
     }, [])
     return <App />
 }
 
-export function ExperimentNotFound(): JSX.Element {
+export const ExperimentNotFound: StoryFn = () => {
     useAvailableFeatures([AvailableFeature.EXPERIMENTATION])
     useEffect(() => {
         router.actions.push(urls.experiment('1200000'))
diff --git a/frontend/src/scenes/experiments/Experiment.tsx b/frontend/src/scenes/experiments/Experiment.tsx
index dd1646ad8dfb74..9954b1fe06a962 100644
--- a/frontend/src/scenes/experiments/Experiment.tsx
+++ b/frontend/src/scenes/experiments/Experiment.tsx
@@ -1,14 +1,13 @@
-import { Card, Col, Popconfirm, Progress, Row, Skeleton, Tag, Tooltip } from 'antd'
+import { Popconfirm, Progress, Tooltip } from 'antd'
 import { BindLogic, useActions, useValues } from 'kea'
 import { PageHeader } from 'lib/components/PageHeader'
 import { useEffect, useState } from 'react'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { SceneExport } from 'scenes/sceneTypes'
-import { AvailableFeature, FunnelStep, InsightType } from '~/types'
+import { AvailableFeature, Experiment as ExperimentType, FunnelStep, InsightType } from '~/types'
 import './Experiment.scss'
 import { experimentLogic, ExperimentLogicProps } from './experimentLogic'
 import { IconDelete, IconPlusMini } from 'lib/lemon-ui/icons'
-import { CloseOutlined } from '@ant-design/icons'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
 import { dayjs } from 'lib/dayjs'
 import { capitalizeFirstLetter, humanFriendlyNumber } from 'lib/utils'
@@ -20,7 +19,15 @@ import { ExperimentPreview } from './ExperimentPreview'
 import { ExperimentImplementationDetails } from './ExperimentImplementationDetails'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { router } from 'kea-router'
-import { LemonDivider, LemonInput, LemonSelect, LemonTextArea } from '@posthog/lemon-ui'
+import {
+    LemonDivider,
+    LemonInput,
+    LemonSelect,
+    LemonSkeleton,
+    LemonTag,
+    LemonTagType,
+    LemonTextArea,
+} from '@posthog/lemon-ui'
 import { NotFound } from 'lib/components/NotFound'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { Form, Group } from 'kea-forms'
@@ -36,6 +43,8 @@ import { trendsDataLogic } from 'scenes/trends/trendsDataLogic'
 import { ExperimentInsightCreator } from './MetricSelector'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { ExperimentResult } from './ExperimentResult'
+import clsx from 'clsx'
+import { getExperimentStatus, getExperimentStatusColor } from './experimentsLogic'
 
 export const scene: SceneExport = {
     component: Experiment,
@@ -144,7 +153,7 @@ export function Experiment(): JSX.Element {
     }
 
     if (experimentLoading) {
-        return <Skeleton active />
+        return <LoadingState />
     }
 
     if (experimentMissing) {
@@ -198,8 +207,7 @@ export function Experiment(): JSX.Element {
 
                         <BindLogic logic={insightLogic} props={insightProps}>
                             <>
-                                {/* eslint-disable-next-line react/forbid-dom-props */}
-                                <div className="flex flex-col gap-2" style={{ maxWidth: '50%' }}>
+                                <div className="flex flex-col gap-2 max-w-1/2">
                                     <Field name="name" label="Name">
                                         <LemonInput data-attr="experiment-name" />
                                     </Field>
@@ -224,7 +232,7 @@ export function Experiment(): JSX.Element {
                                         />
                                     </Field>
                                     {experiment.parameters.feature_flag_variants && (
-                                        <Col>
+                                        <div>
                                             <label>
                                                 <b>Experiment variants</b>
                                             </label>
@@ -234,21 +242,22 @@ export function Experiment(): JSX.Element {
                                                 may have at most 9 test groups. Variant names can only contain letters,
                                                 numbers, hyphens, and underscores.
                                             </div>
-                                            <Col className="variants">
+                                            <div className="variants">
                                                 {experiment.parameters.feature_flag_variants?.map((variant, index) => (
                                                     <Group
                                                         key={index}
                                                         name={['parameters', 'feature_flag_variants', index]}
                                                     >
-                                                        <Row
+                                                        <div
                                                             key={`${variant}-${index}`}
-                                                            className={`feature-flag-variant ${
+                                                            className={clsx(
+                                                                'feature-flag-variant',
                                                                 index === 0
                                                                     ? 'border-t'
                                                                     : index >= maxVariants
                                                                     ? 'border-b'
                                                                     : ''
-                                                            }`}
+                                                            )}
                                                         >
                                                             <div
                                                                 className="variant-label"
@@ -296,7 +305,7 @@ export function Experiment(): JSX.Element {
                                                                         </Tooltip>
                                                                     )}
                                                             </div>
-                                                        </Row>
+                                                        </div>
                                                     </Group>
                                                 ))}
 
@@ -312,12 +321,12 @@ export function Experiment(): JSX.Element {
                                                             </LemonButton>
                                                         </div>
                                                     )}
-                                            </Col>
-                                        </Col>
+                                            </div>
+                                        </div>
                                     )}
                                 </div>
-                                <Row className="person-selection">
-                                    <Col span={12}>
+                                <div className="person-selection">
+                                    <div className="max-w-1/2">
                                         <div>
                                             <strong>Select participants</strong>
                                         </div>
@@ -382,11 +391,11 @@ export function Experiment(): JSX.Element {
                                                 />
                                             </>
                                         )}
-                                    </Col>
-                                </Row>
+                                    </div>
+                                </div>
 
-                                <Row className="metrics-selection">
-                                    <Col span={12}>
+                                <div className="flex metrics-selection gap-4">
+                                    <div className="flex-1">
                                         <div className="mb-2" data-attr="experiment-goal-type">
                                             <b>Goal type</b>
                                             <div className="text-muted">
@@ -436,19 +445,19 @@ export function Experiment(): JSX.Element {
                                         )}
 
                                         <ExperimentInsightCreator insightProps={insightProps} />
-                                    </Col>
-                                    <Col span={12} className="pl-4">
+                                    </div>
+                                    <div className="flex-1">
                                         <div className="card-secondary mb-4" data-attr="experiment-preview">
                                             Goal preview
                                         </div>
                                         <BindLogic logic={insightLogic} props={insightProps}>
                                             <Query query={query} context={{ insightProps }} readOnly />
                                         </BindLogic>
-                                    </Col>
-                                </Row>
+                                    </div>
+                                </div>
                                 <Field name="secondary_metrics">
                                     {({ value, onChange }) => (
-                                        <Row className="secondary-metrics">
+                                        <div className="secondary-metrics">
                                             <div className="flex flex-col">
                                                 <div>
                                                     <b>Secondary metrics</b>
@@ -467,10 +476,10 @@ export function Experiment(): JSX.Element {
                                                     }
                                                 />
                                             </div>
-                                        </Row>
+                                        </div>
                                     )}
                                 </Field>
-                                <Card className="experiment-preview">
+                                <div className="bg-bg-light border rounded experiment-preview p-4">
                                     <ExperimentPreview
                                         experimentId={experiment.id}
                                         trendCount={trendCount}
@@ -479,8 +488,7 @@ export function Experiment(): JSX.Element {
                                         funnelEntrants={entrants}
                                         funnelConversionRate={conversionRate}
                                     />
-                                </Card>
-                                <Row />
+                                </div>
                             </>
                         </BindLogic>
                         <div className="flex items-center gap-2 justify-end">
@@ -513,27 +521,25 @@ export function Experiment(): JSX.Element {
                 </>
             ) : experiment ? (
                 <div className="view-experiment">
-                    <Row className="draft-header">
-                        <Row justify="space-between" align="middle" className="w-full" wrap={false}>
-                            <Col>
-                                <PageHeader
-                                    style={{ paddingRight: 8 }}
-                                    title={`${experiment?.name}`}
-                                    buttons={
-                                        <>
-                                            <CopyToClipboardInline
-                                                explicitValue={experiment.feature_flag?.key}
-                                                iconStyle={{ color: 'var(--muted-alt)' }}
-                                            >
-                                                <span className="text-muted">{experiment.feature_flag?.key}</span>
-                                            </CopyToClipboardInline>
-                                            <StatusTag />
-                                            <ResultsTag />
-                                        </>
-                                    }
-                                />
-                            </Col>
-                            <Col className="page-title-row">
+                    <div className="draft-header">
+                        <div className="flex w-full justify-between align-center flex-nowrap">
+                            <PageHeader
+                                style={{ paddingRight: 8 }}
+                                title={`${experiment?.name}`}
+                                buttons={
+                                    <>
+                                        <CopyToClipboardInline
+                                            explicitValue={experiment.feature_flag?.key}
+                                            iconStyle={{ color: 'var(--muted-alt)' }}
+                                        >
+                                            <span className="text-muted">{experiment.feature_flag?.key}</span>
+                                        </CopyToClipboardInline>
+                                        <StatusTag experiment={experiment} />
+                                        <ResultsTag />
+                                    </>
+                                }
+                            />
+                            <div className="page-title-row">
                                 {experiment && !isExperimentRunning && (
                                     <div className="flex items-center">
                                         <LemonButton
@@ -610,9 +616,9 @@ export function Experiment(): JSX.Element {
                                             )}
                                     </div>
                                 )}
-                            </Col>
-                        </Row>
-                        <Row className="w-full pb-4">
+                            </div>
+                        </div>
+                        <div className="w-full pb-4">
                             <span className="exp-description">
                                 {isExperimentRunning ? (
                                     <EditableField
@@ -630,71 +636,62 @@ export function Experiment(): JSX.Element {
                                     <>{experiment.description || 'There is no description for this experiment.'}</>
                                 )}
                             </span>
-                        </Row>
-                    </Row>
-                    <Row>
+                        </div>
+                    </div>
+                    <div className="mb-4">
                         {showWarning && experimentResults && areResultsSignificant && !experiment.end_date && (
-                            <Row align="middle" className="significant-results">
-                                <Col span={20} style={{ fontWeight: 500, color: '#497342' }}>
-                                    <div>
-                                        Experiment results are significant.{' '}
-                                        {experiment.end_date
-                                            ? ''
-                                            : 'You can end your experiment now or let it run until complete.'}
-                                    </div>
-                                </Col>
-                                <Col span={4}>
-                                    {experiment.end_date ? (
-                                        <CloseOutlined className="close-button" onClick={() => setShowWarning(false)} />
-                                    ) : (
-                                        <LemonButton type="primary" onClick={() => endExperiment()}>
-                                            End experiment
-                                        </LemonButton>
-                                    )}
-                                </Col>
-                            </Row>
+                            <LemonBanner
+                                className="w-full"
+                                type="success"
+                                onClose={experiment.end_date ? () => setShowWarning(false) : undefined}
+                                action={
+                                    !experiment.end_date
+                                        ? {
+                                              onClick: () => endExperiment(),
+                                              type: 'primary',
+                                              children: 'End experiment',
+                                          }
+                                        : undefined
+                                }
+                            >
+                                <div>
+                                    Experiment results are significant.{' '}
+                                    {experiment.end_date
+                                        ? ''
+                                        : 'You can end your experiment now or let it run until complete.'}
+                                </div>
+                            </LemonBanner>
                         )}
                         {showWarning && experimentResults && !areResultsSignificant && !experiment.end_date && (
-                            <Row align="top" className="not-significant-results">
-                                <Col span={23} style={{ fontWeight: 500, color: 'var(--bg-charcoal)' }}>
-                                    <strong>Your results are not statistically significant</strong>.{' '}
-                                    {significanceBannerDetails}{' '}
-                                    {experiment?.end_date ? '' : "We don't recommend ending this experiment yet."} See
-                                    our{' '}
-                                    <Link to="https://posthog.com/docs/user-guides/experimentation#funnel-experiment-calculations">
-                                        {' '}
-                                        experimentation guide{' '}
-                                    </Link>
-                                    for more information.{' '}
-                                </Col>
-                                <Col span={1}>
-                                    <CloseOutlined className="close-button" onClick={() => setShowWarning(false)} />
-                                </Col>
-                            </Row>
+                            <LemonBanner type="warning" onClose={() => setShowWarning(false)}>
+                                <strong>Your results are not statistically significant</strong>.{' '}
+                                {significanceBannerDetails}{' '}
+                                {experiment?.end_date ? '' : "We don't recommend ending this experiment yet."} See our{' '}
+                                <Link to="https://posthog.com/docs/user-guides/experimentation#funnel-experiment-calculations">
+                                    {' '}
+                                    experimentation guide{' '}
+                                </Link>
+                                for more information.{' '}
+                            </LemonBanner>
                         )}
                         {showWarning && experiment.end_date && (
-                            <Row align="top" className="feature-flag-mods">
-                                <Col span={23} style={{ fontWeight: 500 }}>
-                                    <strong>Your experiment is complete, but the feature flag is still enabled.</strong>{' '}
-                                    We recommend removing the feature flag from your code completely, instead of relying
-                                    on this distribution.{' '}
-                                    <Link
-                                        to={
-                                            experiment.feature_flag
-                                                ? urls.featureFlag(experiment.feature_flag.id)
-                                                : undefined
-                                        }
-                                    >
-                                        <b>Adjust feature flag distribution</b>
-                                    </Link>
-                                </Col>
-                                <Col span={1}>
-                                    <CloseOutlined className="close-button" onClick={() => setShowWarning(false)} />
-                                </Col>
-                            </Row>
+                            <LemonBanner type="info" onClose={() => setShowWarning(false)}>
+                                <strong>Your experiment is complete, but the feature flag is still enabled.</strong> We
+                                recommend removing the feature flag from your code completely, instead of relying on
+                                this distribution.{' '}
+                                <Link
+                                    to={
+                                        experiment.feature_flag
+                                            ? urls.featureFlag(experiment.feature_flag.id)
+                                            : undefined
+                                    }
+                                >
+                                    <b>Adjust feature flag distribution</b>
+                                </Link>
+                            </LemonBanner>
                         )}
-                    </Row>
-                    <Row>
+                    </div>
+                    <div>
                         <LemonCollapse
                             className="w-full"
                             defaultActiveKey="experiment-details"
@@ -703,8 +700,8 @@ export function Experiment(): JSX.Element {
                                     key: 'experiment-details',
                                     header: 'Experiment details',
                                     content: (
-                                        <Row>
-                                            <Col span={isExperimentRunning ? 12 : 24}>
+                                        <div>
+                                            <div className={isExperimentRunning ? 'w-1/2' : 'w-full'}>
                                                 <ExperimentPreview
                                                     experimentId={experiment.id}
                                                     trendCount={trendCount}
@@ -715,14 +712,14 @@ export function Experiment(): JSX.Element {
                                                         isExperimentRunning ? funnelResultsPersonsTotal : entrants
                                                     }
                                                 />
-                                            </Col>
+                                            </div>
                                             {!experimentResultsLoading && !experimentResults && isExperimentRunning && (
-                                                <Col span={12}>
+                                                <div className="w-1/2">
                                                     <ExperimentImplementationDetails experiment={experiment} />
-                                                </Col>
+                                                </div>
                                             )}
                                             {experimentResults && (
-                                                <Col span={12} className="mt-4">
+                                                <div className="w-1/2 mt-4">
                                                     <div className="mb-2">
                                                         <b>Experiment progress</b>
                                                     </div>
@@ -734,7 +731,7 @@ export function Experiment(): JSX.Element {
                                                     />
                                                     {experimentInsightType === InsightType.TRENDS &&
                                                         experiment.start_date && (
-                                                            <Row justify="space-between" className="mt-2">
+                                                            <div className="flex justify-between mt-2">
                                                                 {experiment.end_date ? (
                                                                     <div>
                                                                         Ran for{' '}
@@ -762,10 +759,10 @@ export function Experiment(): JSX.Element {
                                                                     </b>{' '}
                                                                     days
                                                                 </div>
-                                                            </Row>
+                                                            </div>
                                                         )}
                                                     {experimentInsightType === InsightType.FUNNELS && (
-                                                        <Row justify="space-between" className="mt-2">
+                                                        <div className="flex justify-between mt-2">
                                                             {experiment.end_date ? (
                                                                 <div>
                                                                     Saw{' '}
@@ -792,11 +789,11 @@ export function Experiment(): JSX.Element {
                                                                 </b>{' '}
                                                                 participants
                                                             </div>
-                                                        </Row>
+                                                        </div>
                                                     )}
-                                                </Col>
+                                                </div>
                                             )}
-                                            <Col>
+                                            <div>
                                                 <SecondaryMetrics
                                                     experimentId={experiment.id}
                                                     onMetricsChange={(metrics) =>
@@ -807,8 +804,8 @@ export function Experiment(): JSX.Element {
                                                         experiment.parameters?.aggregation_group_type_index
                                                     }
                                                 />
-                                            </Col>
-                                        </Row>
+                                            </div>
+                                        </div>
                                     ),
                                 },
                             ]}
@@ -818,44 +815,49 @@ export function Experiment(): JSX.Element {
                                 <ExperimentImplementationDetails experiment={experiment} />
                             </div>
                         )}
-                    </Row>
+                    </div>
                     <ExperimentResult />
                 </div>
             ) : (
-                <Skeleton active />
+                <LoadingState />
             )}
         </>
     )
 }
 
-export function StatusTag(): JSX.Element {
-    const { experiment, isExperimentRunning } = useValues(experimentLogic)
-    const statusColors = { running: 'green', draft: 'default', complete: 'purple' }
-    const status = (): string => {
-        if (!isExperimentRunning) {
-            return 'draft'
-        } else if (!experiment?.end_date) {
-            return 'running'
-        }
-        return 'complete'
-    }
-
+export function StatusTag({ experiment }: { experiment: ExperimentType }): JSX.Element {
+    const status = getExperimentStatus(experiment)
     return (
-        <Tag style={{ alignSelf: 'center' }} color={statusColors[status()]}>
-            <b className="uppercase">{status()}</b>
-        </Tag>
+        <LemonTag type={getExperimentStatusColor(status)}>
+            <b className="uppercase">{status}</b>
+        </LemonTag>
     )
 }
 
 export function ResultsTag(): JSX.Element {
     const { experiment, experimentResults, areResultsSignificant } = useValues(experimentLogic)
     if (experimentResults && experiment.end_date) {
+        const result: { color: LemonTagType; label: string } = areResultsSignificant
+            ? { color: 'success', label: 'Significant Results' }
+            : { color: 'primary', label: 'Results not significant' }
+
         return (
-            <Tag style={{ alignSelf: 'center' }} color={areResultsSignificant ? 'green' : 'geekblue'}>
-                <b className="uppercase">{areResultsSignificant ? 'Significant Results' : 'Results not significant'}</b>
-            </Tag>
+            <LemonTag type={result.color}>
+                <b className="uppercase">{result.label}</b>
+            </LemonTag>
         )
     }
 
     return <></>
 }
+
+export function LoadingState(): JSX.Element {
+    return (
+        <div className="space-y-4">
+            <LemonSkeleton className="w-1/3" />
+            <LemonSkeleton />
+            <LemonSkeleton />
+            <LemonSkeleton className="w-2/3" />
+        </div>
+    )
+}
diff --git a/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx b/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx
index 9653d430b16821..65c0651a651598 100644
--- a/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx
+++ b/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx
@@ -1,8 +1,6 @@
-import { Card, Select } from 'antd'
 import { IconGolang, IconJavascript, IconNodeJS, IconPHP, IconPython, IconRuby } from 'lib/lemon-ui/icons'
 import { useState } from 'react'
 import { Experiment, MultivariateFlagVariant } from '~/types'
-import { CaretDownOutlined } from '@ant-design/icons'
 import {
     GolangSnippet,
     JSSnippet,
@@ -12,7 +10,7 @@ import {
     RNSnippet,
     RubySnippet,
 } from './ExperimentCodeSnippets'
-import { Link } from '@posthog/lemon-ui'
+import { LemonSelect, Link } from '@posthog/lemon-ui'
 
 interface ExperimentImplementationDetailsProps {
     experiment: Partial<Experiment> | null
@@ -75,20 +73,22 @@ export function CodeLanguageSelect({
     selectOption: (selectedValue: string) => void
 }): JSX.Element {
     return (
-        <Select
+        <LemonSelect
+            size="small"
+            className="min-w-30"
+            onSelect={selectOption}
             value={selectedOptionValue}
-            onChange={selectOption}
-            style={{ minWidth: 120 }}
-            suffixIcon={<CaretDownOutlined />}
-        >
-            {OPTIONS.map(({ value, Icon }, index) => (
-                <Select.Option data-attr={'experiment-instructions-select-option-' + value} key={index} value={value}>
-                    <div className="flex items-center">
-                        <Icon className="mr-1" /> {value}
+            options={OPTIONS.map(({ value, Icon }) => ({
+                value,
+                label: value,
+                labelInMenu: (
+                    <div className="flex items-center space-x-2">
+                        <Icon />
+                        <span>{value}</span>
                     </div>
-                </Select.Option>
-            ))}
-        </Select>
+                ),
+            }))}
+        />
     )
 }
 
@@ -107,38 +107,36 @@ export function ExperimentImplementationDetails({ experiment }: ExperimentImplem
     }
 
     return (
-        <Card
-            title={<span className="card-secondary">Feature flag usage and implementation</span>}
-            className="experiment-implementation-details"
-        >
-            <div style={{ justifyContent: 'space-between' }} className="flex mb-2">
-                <div>
-                    <span className="mr-2">Variant group</span>
-                    <Select
-                        onChange={setCurrentVariant}
-                        value={currentVariant}
-                        style={{ minWidth: 80 }}
-                        suffixIcon={<CaretDownOutlined />}
-                    >
-                        {experiment?.parameters?.feature_flag_variants?.map(
-                            (variant: MultivariateFlagVariant, idx: number) => (
-                                <Select.Option key={idx} value={variant.key}>
-                                    {variant.key}
-                                </Select.Option>
-                            )
-                        )}
-                    </Select>
-                </div>
-                <div>
-                    <CodeLanguageSelect selectOption={selectOption} selectedOptionValue={selectedOption.value} />
+        <div className="border rounded bg-bg-light">
+            <div className="card-secondary p-4 border-b">Feature flag usage and implementation</div>
+            <div className="p-6">
+                <div className="flex mb-2 justify-between">
+                    <div className="flex items-center">
+                        <span className="mr-2">Variant group</span>
+                        <LemonSelect
+                            size="small"
+                            className="min-w-20"
+                            onSelect={setCurrentVariant}
+                            value={currentVariant}
+                            options={(experiment?.parameters?.feature_flag_variants || []).map(
+                                (variant: MultivariateFlagVariant) => ({
+                                    value: variant.key,
+                                    label: variant.key,
+                                })
+                            )}
+                        />
+                    </div>
+                    <div>
+                        <CodeLanguageSelect selectOption={selectOption} selectedOptionValue={selectedOption.value} />
+                    </div>
                 </div>
-            </div>
-            <b>Implement your experiment in code</b>
-            <selectedOption.Snippet variant={currentVariant} flagKey={experiment?.feature_flag?.key ?? ''} />
+                <b>Implement your experiment in code</b>
+                <selectedOption.Snippet variant={currentVariant} flagKey={experiment?.feature_flag?.key ?? ''} />
 
-            <Link to={selectedOption.documentationLink} target="_blank">
-                See the docs for more implementation information.
-            </Link>
-        </Card>
+                <Link to={selectedOption.documentationLink} target="_blank">
+                    See the docs for more implementation information.
+                </Link>
+            </div>
+        </div>
     )
 }
diff --git a/frontend/src/scenes/experiments/ExperimentPreview.tsx b/frontend/src/scenes/experiments/ExperimentPreview.tsx
index 928d4e6d3a97f9..b713568b859f46 100644
--- a/frontend/src/scenes/experiments/ExperimentPreview.tsx
+++ b/frontend/src/scenes/experiments/ExperimentPreview.tsx
@@ -1,4 +1,4 @@
-import { Col, InputNumber, Row, Slider, Tooltip } from 'antd'
+import { InputNumber, Slider, Tooltip } from 'antd'
 import { useValues, useActions } from 'kea'
 import { InsightLabel } from 'lib/components/InsightLabel'
 import { PropertyFilterButton } from 'lib/components/PropertyFilters/components/PropertyFilterButton'
@@ -13,7 +13,7 @@ import {
 import { experimentLogic } from './experimentLogic'
 import { ExperimentWorkflow } from './ExperimentWorkflow'
 import { humanFriendlyNumber } from 'lib/utils'
-import { LemonButton, LemonModal } from '@posthog/lemon-ui'
+import { LemonButton, LemonDivider, LemonModal } from '@posthog/lemon-ui'
 import { Field, Form } from 'kea-forms'
 import { MetricSelector } from './MetricSelector'
 import { IconInfo } from 'lib/lemon-ui/icons'
@@ -84,85 +84,85 @@ export function ExperimentPreview({
     const targetingProperties = experiment.feature_flag?.filters
 
     return (
-        <Row>
-            <Col span={!experiment?.start_date && experimentId !== 'new' && !editingExistingExperiment ? 12 : 24}>
+        <div className="flex">
+            <div
+                className={
+                    !experiment?.start_date && experimentId !== 'new' && !editingExistingExperiment ? 'w-1/2' : 'w-full'
+                }
+            >
                 {experimentId === 'new' && (
-                    <Row className="experiment-preview-row">
+                    <div>
                         <div>
-                            <div>
-                                <b>Experiment preview</b>
-                            </div>
-                            <div className="text-muted">
-                                Here are the baseline metrics for your experiment. Adjust your minimum detectible
-                                threshold to adjust for the smallest conversion value you'll accept, and the experiment
-                                duration.{' '}
-                            </div>
+                            <b>Experiment preview</b>
+                        </div>
+                        <div className="text-muted">
+                            Here are the baseline metrics for your experiment. Adjust your minimum detectible threshold
+                            to adjust for the smallest conversion value you'll accept, and the experiment duration.{' '}
                         </div>
-                    </Row>
+                        <LemonDivider className="my-4" />
+                    </div>
                 )}
                 {(experimentId === 'new' || editingExistingExperiment) && (
-                    <Row className="mb-4">
-                        <Col span={24}>
-                            <div>
-                                <b>Minimum acceptable improvement</b>
-                                <Tooltip
-                                    title={
-                                        'Minimum acceptable improvement is a calculation that estimates the smallest significant improvement you are willing to accept.'
-                                    }
-                                >
-                                    <IconInfo className="ml-1 text-muted text-xl" />
-                                </Tooltip>
-                            </div>
-                            <Row className="mde-slider">
-                                <Col span={8}>
-                                    <Slider
-                                        defaultValue={5}
-                                        value={minimumDetectableChange}
-                                        min={1}
-                                        max={sliderMaxValue}
-                                        trackStyle={{ background: 'var(--primary)' }}
-                                        handleStyle={{ background: 'var(--primary)' }}
-                                        onChange={(value) => {
-                                            setExperiment({
-                                                parameters: {
-                                                    ...experiment.parameters,
-                                                    minimum_detectable_effect: value,
-                                                },
-                                            })
-                                        }}
-                                        tipFormatter={(value) => `${value}%`}
-                                    />
-                                </Col>
-                                <InputNumber
-                                    min={1}
-                                    max={sliderMaxValue}
+                    <div className="mb-4 experiment-preview-row">
+                        <div className="flex items-center">
+                            <b>Minimum acceptable improvement</b>
+                            <Tooltip
+                                title={
+                                    'Minimum acceptable improvement is a calculation that estimates the smallest significant improvement you are willing to accept.'
+                                }
+                            >
+                                <IconInfo className="ml-1 text-muted text-xl" />
+                            </Tooltip>
+                        </div>
+                        <div className="flex mde-slider">
+                            <div className="w-1/3">
+                                <Slider
                                     defaultValue={5}
-                                    formatter={(value) => `${value}%`}
-                                    style={{ margin: '0 16px' }}
                                     value={minimumDetectableChange}
+                                    min={1}
+                                    max={sliderMaxValue}
+                                    trackStyle={{ background: 'var(--primary)' }}
+                                    handleStyle={{ background: 'var(--primary)' }}
                                     onChange={(value) => {
                                         setExperiment({
                                             parameters: {
                                                 ...experiment.parameters,
-                                                minimum_detectable_effect: value ?? undefined,
+                                                minimum_detectable_effect: value,
                                             },
                                         })
                                     }}
+                                    tipFormatter={(value) => `${value}%`}
                                 />
-                            </Row>
-                        </Col>
-                    </Row>
+                            </div>
+                            <InputNumber
+                                min={1}
+                                max={sliderMaxValue}
+                                defaultValue={5}
+                                formatter={(value) => `${value}%`}
+                                style={{ margin: '0 16px' }}
+                                value={minimumDetectableChange}
+                                onChange={(value) => {
+                                    setExperiment({
+                                        parameters: {
+                                            ...experiment.parameters,
+                                            minimum_detectable_effect: value ?? undefined,
+                                        },
+                                    })
+                                }}
+                            />
+                        </div>
+                    </div>
                 )}
-                <Row className={`experiment-preview-row ${experiment?.start_date ? 'mr' : ''}`}>
+                <div className="flex flex-col experiment-preview-row">
                     {experimentInsightType === InsightType.TRENDS ? (
-                        <>
+                        <div className="flex">
                             {!experiment?.start_date && (
                                 <>
-                                    <Col span={6}>
+                                    <div className="w-1/4">
                                         <div className="card-secondary">Baseline Count</div>
                                         <div className="l4">{humanFriendlyNumber(trendCount || 0)}</div>
-                                    </Col>
-                                    <Col span={6}>
+                                    </div>
+                                    <div className="w-1/4">
                                         <div className="card-secondary">Minimum Acceptable Count</div>
                                         <div className="l4">
                                             {humanFriendlyNumber(
@@ -170,50 +170,50 @@ export function ExperimentPreview({
                                                     0
                                             )}
                                         </div>
-                                    </Col>
+                                    </div>
                                 </>
                             )}
-                            <Col span={12}>
+                            <div className="w-1/2">
                                 <div className="card-secondary">Recommended running time</div>
                                 <div>
                                     <span className="l4">~{humanFriendlyNumber(trendExposure || 0)}</span> days
                                 </div>
-                            </Col>
-                        </>
+                            </div>
+                        </div>
                     ) : (
-                        <>
+                        <div className="flex flex-wrap">
                             {!experiment?.start_date && (
                                 <>
-                                    <Col span={12}>
+                                    <div className="w-1/2">
                                         <div className="card-secondary">Baseline Conversion Rate</div>
                                         <div className="l4">{funnelConversionRate.toFixed(1)}%</div>
-                                    </Col>
-                                    <Col span={12}>
+                                    </div>
+                                    <div className="w-1/2">
                                         <div className="card-secondary">Minimum Acceptable Conversion Rate</div>
                                         <div className="l4">
                                             {(funnelConversionRate + minimumDetectableChange).toFixed(1)}%
                                         </div>
-                                    </Col>
+                                    </div>
                                 </>
                             )}
-                            <Col span={12}>
+                            <div className="w-1/2">
                                 <div className="card-secondary">Recommended Sample Size</div>
                                 <div className="pb-4">
                                     <span className="l4">~{humanFriendlyNumber(funnelSampleSize || 0)}</span> persons
                                 </div>
-                            </Col>
+                            </div>
                             {!experiment?.start_date && (
-                                <Col span={12}>
+                                <div className="w-1/2">
                                     <div className="card-secondary">Recommended running time</div>
                                     <div>
                                         <span className="l4">~{humanFriendlyNumber(runningTime || 0)}</span> days
                                     </div>
-                                </Col>
+                                </div>
                             )}
-                        </>
+                        </div>
                     )}
-                    <Row className="w-full mt-4">
-                        <Col span={12}>
+                    <div className="flex w-full mt-4">
+                        <div className="flex-1">
                             <div className="card-secondary">Experiment variants</div>
                             <ul className="variants-list">
                                 {experiment?.parameters?.feature_flag_variants?.map(
@@ -222,10 +222,10 @@ export function ExperimentPreview({
                                     )
                                 )}
                             </ul>
-                        </Col>
-                        <Col span={12}>
+                        </div>
+                        <div className="flex-1">
                             <div className="card-secondary">Participants</div>
-                            <div style={{ display: 'inline-block' }}>
+                            <div className="inline-block">
                                 {targetingProperties ? (
                                     <>
                                         {groupFilters(targetingProperties, undefined, aggregationLabel)}
@@ -247,108 +247,104 @@ export function ExperimentPreview({
                                     '100% of all users'
                                 )}
                             </div>
-                        </Col>
-                    </Row>
-                    <Row className="w-full">
+                        </div>
+                    </div>
+                    <div className="flex w-full">
                         {experimentId !== 'new' && !editingExistingExperiment && (
-                            <Col span={12}>
+                            <div className="w-1/2">
                                 <div className="card-secondary mt-4">Start date</div>
                                 {experiment?.start_date ? (
                                     <TZLabel time={experiment?.start_date} />
                                 ) : (
                                     <span className="description">Not started yet</span>
                                 )}
-                            </Col>
+                            </div>
                         )}
                         {experimentInsightType === InsightType.FUNNELS && showEndDate ? (
-                            <Col span={12}>
+                            <div className="w-1/2">
                                 <div className="card-secondary mt-4">Expected end date</div>
                                 <span>
                                     {expectedEndDate.isAfter(dayjs())
                                         ? expectedEndDate.format('D MMM YYYY')
                                         : dayjs().format('D MMM YYYY')}
                                 </span>
-                            </Col>
+                            </div>
                         ) : null}
                         {/* The null prevents showing a 0 while loading */}
                         {experiment?.end_date && (
-                            <Col span={12}>
+                            <div className="w-1/2">
                                 <div className="card-secondary mt-4">Completed date</div>
                                 <TZLabel time={experiment?.end_date} />
-                            </Col>
+                            </div>
                         )}
-                    </Row>
-                </Row>
+                    </div>
+                </div>
                 {experimentId !== 'new' && !editingExistingExperiment && (
-                    <Row className="experiment-preview-row">
-                        <Col>
-                            <div className="card-secondary mb-2">
-                                {experimentInsightType === InsightType.FUNNELS ? 'Conversion goal steps' : 'Trend goal'}
-                            </div>
-                            <MetricDisplay filters={experiment.filters} />
-                            {experiment?.start_date && (
-                                <>
-                                    <div className="mb-2 mt-4">
-                                        <LemonButton type="secondary" onClick={openExperimentGoalModal}>
-                                            Change experiment goal
-                                        </LemonButton>
-                                    </div>
-                                    {experimentInsightType === InsightType.TRENDS &&
-                                        !experimentMathAggregationForTrends && (
-                                            <>
-                                                <div className="card-secondary mb-2 mt-4">
-                                                    Exposure metric
-                                                    <Tooltip
-                                                        title={`This metric determines how we calculate exposure for the experiment. Only users who have this event alongside the property '$feature/${experiment.feature_flag_key}' are included in exposure calculations.`}
+                    <div className="experiment-preview-row">
+                        <div className="card-secondary mb-2">
+                            {experimentInsightType === InsightType.FUNNELS ? 'Conversion goal steps' : 'Trend goal'}
+                        </div>
+                        <MetricDisplay filters={experiment.filters} />
+                        {experiment?.start_date && (
+                            <>
+                                <div className="mb-2 mt-4">
+                                    <LemonButton type="secondary" onClick={openExperimentGoalModal}>
+                                        Change experiment goal
+                                    </LemonButton>
+                                </div>
+                                {experimentInsightType === InsightType.TRENDS &&
+                                    !experimentMathAggregationForTrends && (
+                                        <>
+                                            <div className="card-secondary mb-2 mt-4">
+                                                Exposure metric
+                                                <Tooltip
+                                                    title={`This metric determines how we calculate exposure for the experiment. Only users who have this event alongside the property '$feature/${experiment.feature_flag_key}' are included in exposure calculations.`}
+                                                >
+                                                    <IconInfo className="ml-1 text-muted text-sm" />
+                                                </Tooltip>
+                                            </div>
+                                            {experiment.parameters?.custom_exposure_filter ? (
+                                                <MetricDisplay filters={experiment.parameters.custom_exposure_filter} />
+                                            ) : (
+                                                <span className="description">
+                                                    Default via $feature_flag_called events
+                                                </span>
+                                            )}
+                                            <div className="mb-2 mt-2">
+                                                <span className="flex">
+                                                    <LemonButton
+                                                        type="secondary"
+                                                        size="small"
+                                                        onClick={openExperimentExposureModal}
+                                                        className="mr-2"
                                                     >
-                                                        <IconInfo className="ml-1 text-muted text-sm" />
-                                                    </Tooltip>
-                                                </div>
-                                                {experiment.parameters?.custom_exposure_filter ? (
-                                                    <MetricDisplay
-                                                        filters={experiment.parameters.custom_exposure_filter}
-                                                    />
-                                                ) : (
-                                                    <span className="description">
-                                                        Default via $feature_flag_called events
-                                                    </span>
-                                                )}
-                                                <div className="mb-2 mt-2">
-                                                    <span className="flex">
+                                                        Change exposure metric
+                                                    </LemonButton>
+                                                    {experiment.parameters?.custom_exposure_filter && (
                                                         <LemonButton
                                                             type="secondary"
                                                             size="small"
-                                                            onClick={openExperimentExposureModal}
+                                                            status="danger"
                                                             className="mr-2"
+                                                            onClick={() => updateExperimentExposure(null)}
                                                         >
-                                                            Change exposure metric
+                                                            Reset exposure
                                                         </LemonButton>
-                                                        {experiment.parameters?.custom_exposure_filter && (
-                                                            <LemonButton
-                                                                type="secondary"
-                                                                size="small"
-                                                                status="danger"
-                                                                className="mr-2"
-                                                                onClick={() => updateExperimentExposure(null)}
-                                                            >
-                                                                Reset exposure
-                                                            </LemonButton>
-                                                        )}
-                                                    </span>
-                                                </div>
-                                            </>
-                                        )}
-                                </>
-                            )}
-                        </Col>
-                    </Row>
+                                                    )}
+                                                </span>
+                                            </div>
+                                        </>
+                                    )}
+                            </>
+                        )}
+                    </div>
                 )}
-            </Col>
+            </div>
 
             {experimentId !== 'new' && !editingExistingExperiment && !experiment?.start_date && (
-                <Col span={12} className="pl-4">
+                <div className="w-1/2 pl-4">
                     <ExperimentWorkflow />
-                </Col>
+                </div>
             )}
             <LemonModal
                 isOpen={isExperimentGoalModalOpen}
@@ -439,7 +435,7 @@ export function ExperimentPreview({
                     </Field>
                 </Form>
             </LemonModal>
-        </Row>
+        </div>
     )
 }
 
@@ -451,8 +447,8 @@ export function MetricDisplay({ filters }: { filters?: FilterType }): JSX.Elemen
             {([...(filters?.events || []), ...(filters?.actions || [])] as ActionFilterType[])
                 .sort((a, b) => (a.order || 0) - (b.order || 0))
                 .map((event: ActionFilterType, idx: number) => (
-                    <Col key={idx} className="mb-2">
-                        <Row style={{ marginBottom: 4 }}>
+                    <div key={idx} className="mb-2">
+                        <div className="flex mb-1">
                             <div className="preview-conversion-goal-num">
                                 {experimentInsightType === InsightType.FUNNELS ? (event.order || 0) + 1 : idx + 1}
                             </div>
@@ -464,11 +460,11 @@ export function MetricDisplay({ filters }: { filters?: FilterType }): JSX.Elemen
                                     showEventName
                                 />
                             </b>
-                        </Row>
+                        </div>
                         {event.properties?.map((prop: AnyPropertyFilter) => (
                             <PropertyFilterButton key={prop.key} item={prop} />
                         ))}
-                    </Col>
+                    </div>
                 ))}
         </>
     )
diff --git a/frontend/src/scenes/experiments/ExperimentResult.tsx b/frontend/src/scenes/experiments/ExperimentResult.tsx
index 25777a70230c00..b5a311f815f5b7 100644
--- a/frontend/src/scenes/experiments/ExperimentResult.tsx
+++ b/frontend/src/scenes/experiments/ExperimentResult.tsx
@@ -1,9 +1,8 @@
-import { Col, Progress, Row, Skeleton, Tooltip } from 'antd'
+import { Col, Progress, Tooltip } from 'antd'
 import { useValues } from 'kea'
 import { ChartDisplayType, FilterType, FunnelVizType, InsightShortId, InsightType } from '~/types'
 import './Experiment.scss'
 import { experimentLogic } from './experimentLogic'
-import { InfoCircleOutlined } from '@ant-design/icons'
 import { FunnelLayout } from 'lib/constants'
 import { capitalizeFirstLetter } from 'lib/utils'
 import { getSeriesColor } from 'lib/colors'
@@ -11,6 +10,8 @@ import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
 import { NodeKind } from '~/queries/schema'
 import { filtersToQueryNode } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
 import { Query } from '~/queries/Query/Query'
+import { IconInfo } from '@posthog/icons'
+import { LoadingState } from './Experiment'
 
 export function ExperimentResult(): JSX.Element {
     const {
@@ -34,14 +35,7 @@ export function ExperimentResult(): JSX.Element {
             {experimentResults ? (
                 (experiment?.parameters?.feature_flag_variants?.length || 0) > 4 ? (
                     <>
-                        <Row
-                            className="border-t"
-                            justify="space-between"
-                            style={{
-                                paddingTop: 8,
-                                paddingBottom: 8,
-                            }}
-                        >
+                        <div className="flex justify-between py-2 border-t">
                             <Col span={2 * secondaryColumnSpan}>Variant</Col>
                             {sortedExperimentResultVariants.map((variant, idx) => (
                                 <Col
@@ -54,15 +48,8 @@ export function ExperimentResult(): JSX.Element {
                                     <b>{capitalizeFirstLetter(variant)}</b>
                                 </Col>
                             ))}
-                        </Row>
-                        <Row
-                            className="border-t"
-                            justify="space-between"
-                            style={{
-                                paddingTop: 8,
-                                paddingBottom: 8,
-                            }}
-                        >
+                        </div>
+                        <div className="flex justify-between py-2 border-t">
                             <Col span={2 * secondaryColumnSpan}>
                                 {experimentInsightType === InsightType.TRENDS ? 'Count' : 'Conversion Rate'}
                             </Col>
@@ -73,15 +60,8 @@ export function ExperimentResult(): JSX.Element {
                                         : `${conversionRateForVariant(variant)}%`}
                                 </Col>
                             ))}
-                        </Row>
-                        <Row
-                            className="border-t"
-                            justify="space-between"
-                            style={{
-                                paddingTop: 8,
-                                paddingBottom: 8,
-                            }}
-                        >
+                        </div>
+                        <div className="flex justify-between py-2 border-t">
                             <Col span={2 * secondaryColumnSpan}>Probability to be the best</Col>
                             {sortedExperimentResultVariants.map((variant, idx) => (
                                 <Col key={idx} span={secondaryColumnSpan}>
@@ -92,24 +72,24 @@ export function ExperimentResult(): JSX.Element {
                                     </b>
                                 </Col>
                             ))}
-                        </Row>
+                        </div>
                     </>
                 ) : (
-                    <Row justify="space-around" style={{ flexFlow: 'nowrap' }}>
+                    <div className="flex justify-around flex-nowrap">
                         {
                             //sort by decreasing probability
                             Object.keys(experimentResults.probability)
                                 .sort((a, b) => experimentResults.probability[b] - experimentResults.probability[a])
                                 .map((variant, idx) => (
-                                    <Col key={idx} className="pr-4">
+                                    <div key={idx} className="pr-4">
                                         <div>
                                             <b>{capitalizeFirstLetter(variant)}</b>
                                         </div>
                                         {experimentInsightType === InsightType.TRENDS ? (
                                             <>
-                                                <Row>
+                                                <div className="flex">
                                                     <b className="pr-1">
-                                                        <Row>
+                                                        <div className="flex">
                                                             {'action' in experimentResults.insight[0] && (
                                                                 <EntityFilterInfo
                                                                     filter={experimentResults.insight[0].action}
@@ -121,7 +101,7 @@ export function ExperimentResult(): JSX.Element {
                                                                     : 'count'}
                                                                 :
                                                             </span>
-                                                        </Row>
+                                                        </div>
                                                     </b>{' '}
                                                     {countDataForVariant(variant)}{' '}
                                                     {areTrendResultsConfusing && idx === 0 && (
@@ -129,20 +109,22 @@ export function ExperimentResult(): JSX.Element {
                                                             placement="right"
                                                             title="It might seem confusing that the best variant has lower absolute count, but this can happen when fewer people are exposed to this variant, so its relative count is higher."
                                                         >
-                                                            <InfoCircleOutlined className="py-1 px-0.5" />
+                                                            <IconInfo className="py-1 px-0.5" />
                                                         </Tooltip>
                                                     )}
-                                                </Row>
+                                                </div>
                                                 <div className="flex">
                                                     <b className="pr-1">Exposure:</b>{' '}
                                                     {exposureCountDataForVariant(variant)}
                                                 </div>
                                             </>
                                         ) : (
-                                            <Row>
-                                                <b className="pr-1">Conversion rate:</b>{' '}
-                                                {conversionRateForVariant(variant)}%
-                                            </Row>
+                                            <div className="space-x-1">
+                                                <span>
+                                                    <b>Conversion rate:</b>{' '}
+                                                </span>
+                                                <span>{conversionRateForVariant(variant)}%</span>
+                                            </div>
                                         )}
                                         <Progress
                                             percent={Number((experimentResults.probability[variant] * 100).toFixed(1))}
@@ -156,17 +138,13 @@ export function ExperimentResult(): JSX.Element {
                                             Probability that this variant is the best:{' '}
                                             <b>{(experimentResults.probability[variant] * 100).toFixed(1)}%</b>
                                         </div>
-                                    </Col>
+                                    </div>
                                 ))
                         }
-                    </Row>
-                )
-            ) : (
-                experimentResultsLoading && (
-                    <div className="text-center">
-                        <Skeleton active />
                     </div>
                 )
+            ) : (
+                experimentResultsLoading && <LoadingState />
             )}
             {experimentResults ? (
                 // :KLUDGE: using `insights-page` for proper styling, should rather adapt styles
@@ -198,7 +176,7 @@ export function ExperimentResult(): JSX.Element {
             ) : (
                 experiment.start_date && (
                     <>
-                        <div className="no-experiment-results">
+                        <div className="no-experiment-results p-4">
                             {!experimentResultsLoading && (
                                 <div className="text-center">
                                     <b>There are no results for this experiment yet.</b>
diff --git a/frontend/src/scenes/experiments/ExperimentWorkflow.tsx b/frontend/src/scenes/experiments/ExperimentWorkflow.tsx
index 359e07cd0f7f5c..430ab7f0624b90 100644
--- a/frontend/src/scenes/experiments/ExperimentWorkflow.tsx
+++ b/frontend/src/scenes/experiments/ExperimentWorkflow.tsx
@@ -1,60 +1,71 @@
-import { Card, Col, Row } from 'antd'
 import { IconCheckmark, IconRadioButtonUnchecked } from 'lib/lemon-ui/icons'
 import { useState } from 'react'
 import './Experiment.scss'
+import clsx from 'clsx'
 
 export function ExperimentWorkflow(): JSX.Element {
     const [workflowValidateStepCompleted, setWorkflowValidateStepCompleted] = useState(false)
     const [workflowLaunchStepCompleted, setWorkflowLaunchStepCompleted] = useState(false)
 
     return (
-        <Card className="experiment-workflow" title={<span className="card-secondary">Experiment workflow</span>}>
-            <Row>
-                <Col className="exp-workflow-step step-completed w-full">
-                    <Row align="middle">
-                        <IconCheckmark style={{ color: 'var(--primary)', fontSize: 24 }} />
-                        <b className="ml-2">Create experiment</b>
-                    </Row>
-                    <div className="ml-8">Set variants, select participants, and add secondary metrics</div>
-                </Col>
-            </Row>
-            <Row>
-                <Col
-                    className={`w-full exp-workflow-step ${workflowValidateStepCompleted ? 'step-completed' : ''}`}
-                    onClick={() => setWorkflowValidateStepCompleted(!workflowValidateStepCompleted)}
-                >
-                    <Row align="middle">
-                        {workflowValidateStepCompleted ? (
-                            <IconCheckmark style={{ color: 'var(--primary)', fontSize: 24 }} />
-                        ) : (
-                            <IconRadioButtonUnchecked />
-                        )}
-                        <b className="ml-2">Validate experiment</b>
-                    </Row>
-                    <div className="ml-8">
-                        Once you've written your code, it's a good idea to test that each variant behaves as you'd
-                        expect.
+        <>
+            <div className="border rounded">
+                <div className="card-secondary p-4 border-b">Experiment workflow</div>
+                <div className="p-6 space-y-1.5">
+                    <div className="flex">
+                        <div className="exp-workflow-step rounded p-2 bg-primary-highlight w-full">
+                            <div className="flex items-center">
+                                <IconCheckmark className="text-xl text-primary" />
+                                <b className="ml-2">Create experiment</b>
+                            </div>
+                            <div className="ml-8">Set variants, select participants, and add secondary metrics</div>
+                        </div>
                     </div>
-                </Col>
-            </Row>
-            <Row>
-                <Col
-                    className={`w-full exp-workflow-step ${workflowLaunchStepCompleted ? 'step-completed' : ''}`}
-                    onClick={() => setWorkflowLaunchStepCompleted(!workflowLaunchStepCompleted)}
-                >
-                    <Row align="middle">
-                        {workflowLaunchStepCompleted ? (
-                            <IconCheckmark style={{ color: 'var(--primary)', fontSize: 24 }} />
-                        ) : (
-                            <IconRadioButtonUnchecked />
-                        )}
-                        <b className="ml-2">Launch experiment</b>
-                    </Row>
-                    <div className="ml-8">
-                        Run your experiment, monitor results, and decide when to terminate your experiment.
+                    <div className="flex">
+                        <div
+                            className={clsx(
+                                'w-full exp-workflow-step rounded p-2 cursor-pointer',
+                                workflowValidateStepCompleted && 'bg-primary-highlight'
+                            )}
+                            onClick={() => setWorkflowValidateStepCompleted(!workflowValidateStepCompleted)}
+                        >
+                            <div className="flex items-center">
+                                {workflowValidateStepCompleted ? (
+                                    <IconCheckmark className="text-xl text-primary" />
+                                ) : (
+                                    <IconRadioButtonUnchecked className="text-xl" />
+                                )}
+                                <b className="ml-2">Validate experiment</b>
+                            </div>
+                            <div className="ml-8">
+                                Once you've written your code, it's a good idea to test that each variant behaves as
+                                you'd expect.
+                            </div>
+                        </div>
                     </div>
-                </Col>
-            </Row>
-        </Card>
+                    <div className="flex">
+                        <div
+                            className={clsx(
+                                'w-full exp-workflow-step rounded p-2 cursor-pointer',
+                                workflowLaunchStepCompleted && 'bg-primary-highlight'
+                            )}
+                            onClick={() => setWorkflowLaunchStepCompleted(!workflowLaunchStepCompleted)}
+                        >
+                            <div className="flex items-center">
+                                {workflowLaunchStepCompleted ? (
+                                    <IconCheckmark className="text-xl text-primary" />
+                                ) : (
+                                    <IconRadioButtonUnchecked className="text-xl" />
+                                )}
+                                <b className="ml-2">Launch experiment</b>
+                            </div>
+                            <div className="ml-8">
+                                Run your experiment, monitor results, and decide when to terminate your experiment.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </>
     )
 }
diff --git a/frontend/src/scenes/experiments/Experiments.tsx b/frontend/src/scenes/experiments/Experiments.tsx
index 9bc342dcffb2d9..5595ba60f5bca0 100644
--- a/frontend/src/scenes/experiments/Experiments.tsx
+++ b/frontend/src/scenes/experiments/Experiments.tsx
@@ -10,7 +10,6 @@ import { urls } from 'scenes/urls'
 import stringWithWBR from 'lib/utils/stringWithWBR'
 import { Link } from 'lib/lemon-ui/Link'
 import { dayjs } from 'lib/dayjs'
-import { Tag } from 'antd'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
@@ -22,6 +21,7 @@ import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductI
 import { router } from 'kea-router'
 import { ExperimentsHog } from 'lib/components/hedgehogs'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
+import { StatusTag } from './Experiment'
 
 export const scene: SceneExport = {
     component: Experiments,
@@ -94,13 +94,7 @@ export function Experiments(): JSX.Element {
             title: 'Status',
             key: 'status',
             render: function Render(_, experiment: Experiment) {
-                const statusColors = { running: 'green', draft: 'default', complete: 'purple' }
-                const status = getExperimentStatus(experiment)
-                return (
-                    <Tag color={statusColors[status]} style={{ fontWeight: 600 }}>
-                        {status.toUpperCase()}
-                    </Tag>
-                )
+                return <StatusTag experiment={experiment} />
             },
             align: 'center',
             sorter: (a, b) => {
diff --git a/frontend/src/scenes/experiments/MetricSelector.tsx b/frontend/src/scenes/experiments/MetricSelector.tsx
index 7e199bbbeb9eb1..7ac3b5e84d8d92 100644
--- a/frontend/src/scenes/experiments/MetricSelector.tsx
+++ b/frontend/src/scenes/experiments/MetricSelector.tsx
@@ -16,7 +16,6 @@ import { Query } from '~/queries/Query/Query'
 import { FunnelsQuery, InsightQueryNode, TrendsQuery } from '~/queries/schema'
 import { AggregationSelect } from 'scenes/insights/filters/AggregationSelect'
 import { FunnelConversionWindowFilter } from 'scenes/insights/views/Funnels/FunnelConversionWindowFilter'
-import { InfoCircleOutlined } from '@ant-design/icons'
 
 import './Experiment.scss'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
@@ -24,6 +23,7 @@ import { Attribution } from 'scenes/insights/EditorFilters/AttributionFilter'
 import { TestAccountFilter } from '~/queries/nodes/InsightViz/filters/TestAccountFilter'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { DEFAULT_DURATION } from './experimentLogic'
+import { IconInfo } from '@posthog/icons'
 
 export interface MetricSelectorProps {
     dashboardItemId: InsightShortId
@@ -145,8 +145,8 @@ export function ExperimentInsightCreator({ insightProps }: { insightProps: Insig
 export function AttributionSelect({ insightProps }: EditorFilterProps): JSX.Element {
     return (
         <div className="flex items-center w-full gap-2">
-            <span>
-                Attribution type
+            <div className="flex">
+                <span>Attribution type</span>
                 <Tooltip
                     title={
                         <div>
@@ -163,9 +163,9 @@ export function AttributionSelect({ insightProps }: EditorFilterProps): JSX.Elem
                         </div>
                     }
                 >
-                    <InfoCircleOutlined className="info-indicator" />
+                    <IconInfo className="w-4 info-indicator" />
                 </Tooltip>
-            </span>
+            </div>
             <Attribution insightProps={insightProps} />
         </div>
     )
diff --git a/frontend/src/scenes/experiments/experimentsLogic.ts b/frontend/src/scenes/experiments/experimentsLogic.ts
index 6a160c6a0a8c36..f76151f5e5b95d 100644
--- a/frontend/src/scenes/experiments/experimentsLogic.ts
+++ b/frontend/src/scenes/experiments/experimentsLogic.ts
@@ -10,6 +10,7 @@ import { subscriptions } from 'kea-subscriptions'
 import { loaders } from 'kea-loaders'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
+import { LemonTagType } from '@posthog/lemon-ui'
 
 export function getExperimentStatus(experiment: Experiment): ProgressStatus {
     if (!experiment.start_date) {
@@ -20,6 +21,17 @@ export function getExperimentStatus(experiment: Experiment): ProgressStatus {
     return ProgressStatus.Complete
 }
 
+export function getExperimentStatusColor(status: ProgressStatus): LemonTagType {
+    switch (status) {
+        case ProgressStatus.Draft:
+            return 'default'
+        case ProgressStatus.Running:
+            return 'success'
+        case ProgressStatus.Complete:
+            return 'completion'
+    }
+}
+
 export const experimentsLogic = kea<experimentsLogicType>([
     path(['scenes', 'experiments', 'experimentsLogic']),
     connect({
diff --git a/frontend/src/scenes/feature-flags/FeatureFlag.tsx b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
index 4f12c9f925bedd..40b48cf07c94ab 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlag.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
@@ -3,12 +3,11 @@ import { Form, Group } from 'kea-forms'
 import { Row, Col, Radio, Popconfirm, Skeleton, Card } from 'antd'
 import { useActions, useValues } from 'kea'
 import { alphabet, capitalizeFirstLetter } from 'lib/utils'
-import { LockOutlined } from '@ant-design/icons'
 import { featureFlagLogic } from './featureFlagLogic'
 import { featureFlagLogic as enabledFeaturesLogic } from 'lib/logic/featureFlagLogic'
 import { PageHeader } from 'lib/components/PageHeader'
 import './FeatureFlag.scss'
-import { IconDelete, IconPlus, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
+import { IconDelete, IconLock, IconPlus, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { SceneExport } from 'scenes/sceneTypes'
 import { UTM_TAGS } from 'scenes/feature-flags/FeatureFlagSnippets'
@@ -156,6 +155,15 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
         })
     }
 
+    const hasMultipleProjects = (currentOrganization?.teams?.length ?? 0) > 1
+    if (featureFlags[FEATURE_FLAGS.MULTI_PROJECT_FEATURE_FLAGS] && hasMultipleProjects) {
+        tabs.push({
+            label: 'Projects',
+            key: FeatureFlagsTab.PROJECTS,
+            content: <FeatureFlagProjects />,
+        })
+    }
+
     if (featureFlags[FEATURE_FLAGS.FF_DASHBOARD_TEMPLATES] && featureFlag.key && id) {
         tabs.push({
             label: (
@@ -206,15 +214,6 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
         })
     }
 
-    const hasMultipleProjects = (currentOrganization?.teams?.length ?? 0) > 1
-    if (featureFlags[FEATURE_FLAGS.MULTI_PROJECT_FEATURE_FLAGS] && hasMultipleProjects) {
-        tabs.push({
-            label: 'Projects',
-            key: FeatureFlagsTab.PROJECTS,
-            content: <FeatureFlagProjects />,
-        })
-    }
-
     return (
         <>
             <div className="feature-flag">
@@ -555,6 +554,8 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                                             ? "You have only 'View' access for this feature flag. To make changes, please contact the flag's creator."
                                                             : (featureFlag.features?.length || 0) > 0
                                                             ? 'This feature flag is in use with an early access feature. Delete the early access feature to delete this flag'
+                                                            : (featureFlag.experiment_set?.length || 0) > 0
+                                                            ? 'This feature flag is linked to an experiment. Delete the experiment to delete this flag'
                                                             : null
                                                     }
                                                 >
@@ -817,7 +818,7 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                                 <div>
                                                     {!hasAvailableFeature(AvailableFeature.MULTIVARIATE_FLAGS) && (
                                                         <Link to={upgradeLink} target="_blank">
-                                                            <LockOutlined
+                                                            <IconLock
                                                                 style={{
                                                                     marginRight: 4,
                                                                     color: 'var(--warning)',
@@ -903,7 +904,7 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                             <Col span={4}>Variant key</Col>
                             <Col span={6}>Description</Col>
                             <Col span={8}>
-                                <div style={{ display: 'flex', flexDirection: 'column', fontWeight: 'normal' }}>
+                                <div className="flex flex-col" style={{ fontWeight: 'normal' }}>
                                     <b>Payload</b>
                                     <span className="text-muted">
                                         Specify return payload when the variant key matches
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagProjects.tsx b/frontend/src/scenes/feature-flags/FeatureFlagProjects.tsx
index cdf57d7e06aaa2..d7410b7f20e84b 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagProjects.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagProjects.tsx
@@ -1,36 +1,63 @@
 import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
-import { LemonButton, LemonSelect } from '@posthog/lemon-ui'
+import { LemonButton, LemonSelect, LemonTag, Link } from '@posthog/lemon-ui'
 import { IconArrowRight, IconSync } from 'lib/lemon-ui/icons'
 import { useActions, useValues } from 'kea'
-import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { featureFlagLogic } from './featureFlagLogic'
 import { organizationLogic } from '../organizationLogic'
 import { teamLogic } from 'scenes/teamLogic'
+import { userLogic } from 'scenes/userLogic'
 import { useEffect } from 'react'
 
 const getColumns = (): LemonTableColumns<Record<string, string>> => {
     const { currentTeamId } = useValues(teamLogic)
+    const { currentOrganization } = useValues(organizationLogic)
+    const { updateCurrentTeam } = useActions(userLogic)
 
     return [
         {
             title: 'Project',
-            dataIndex: 'project_name',
-            render: (dataValue, record) =>
-                Number(record.project_id) === currentTeamId ? `${dataValue} (current)` : dataValue,
+            dataIndex: 'team_id',
+            render: (dataValue, record) => {
+                const team = currentOrganization?.teams?.find((t) => t.id === Number(dataValue))
+                if (!team) {
+                    return '(project does not exist)'
+                }
+                const linkText = team.id === currentTeamId ? `${team.name} (current)` : team.name
+
+                return (
+                    <Link
+                        className="row-name"
+                        onClick={() => {
+                            updateCurrentTeam(team.id, `/feature_flags/${record.flag_id}`)
+                        }}
+                    >
+                        {linkText}
+                    </Link>
+                )
+            },
         },
         {
             title: 'Flag status',
             dataIndex: 'active',
             render: (dataValue) => {
-                return dataValue ? 'active' : 'disabled'
+                return dataValue ? (
+                    <LemonTag type="success" className="uppercase">
+                        Enabled
+                    </LemonTag>
+                ) : (
+                    <LemonTag type="default" className="uppercase">
+                        Disabled
+                    </LemonTag>
+                )
             },
         },
     ]
 }
 
 export default function FeatureFlagProjects(): JSX.Element {
-    const { featureFlag, copyDestinationProject, projectsWithCurrentFlag } = useValues(featureFlagLogic)
-    const { setCopyDestinationProject, loadProjectsWithCurrentFlag } = useActions(featureFlagLogic)
+    const { featureFlag, copyDestinationProject, projectsWithCurrentFlag, featureFlagCopyLoading } =
+        useValues(featureFlagLogic)
+    const { setCopyDestinationProject, loadProjectsWithCurrentFlag, copyFlag } = useActions(featureFlagLogic)
     const { currentOrganization } = useValues(organizationLogic)
     const { currentTeam } = useValues(teamLogic)
 
@@ -56,6 +83,7 @@ export default function FeatureFlagProjects(): JSX.Element {
                 <div>
                     <div className="font-semibold leading-6 h-6">Destination project</div>
                     <LemonSelect
+                        dropdownMatchSelectWidth={false}
                         value={copyDestinationProject}
                         onChange={(id) => setCopyDestinationProject(id)}
                         options={
@@ -68,14 +96,20 @@ export default function FeatureFlagProjects(): JSX.Element {
                 </div>
                 <div>
                     <div className="h-6" />
-                    <LemonButton type="primary" icon={<IconSync />}>
-                        Copy
+                    <LemonButton
+                        disabledReason={!copyDestinationProject && 'Select destination project'}
+                        loading={featureFlagCopyLoading}
+                        type="primary"
+                        icon={<IconSync />}
+                        onClick={() => copyFlag()}
+                        className="w-28 max-w-28"
+                    >
+                        {projectsWithCurrentFlag.find((p) => Number(p.team_id) === copyDestinationProject)
+                            ? 'Update'
+                            : 'Copy'}
                     </LemonButton>
                 </div>
             </div>
-            <LemonBanner type="warning" className="mb-6">
-                By performing the copy, you may overwrite your existing Feature Flag configuration in another project.
-            </LemonBanner>
             <LemonTable
                 loading={false}
                 dataSource={projectsWithCurrentFlag}
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx b/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
index 49107f8a6bbd3d..2178b250c9dbc9 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
@@ -323,6 +323,9 @@ export function FeatureFlagReleaseConditions({
             return <></>
         }
 
+        // TODO: EarlyAccessFeatureType is not the correct type for featureFlag.features, hence bypassing TS check
+        const hasMatchingEarlyAccessFeature = featureFlag.features?.find((f: any) => f.flagKey === featureFlag.key)
+
         return (
             <Col span={24} md={24} key={`${index}-${filterGroups.length}`}>
                 {index > 0 && <div className="condition-set-separator">OR</div>}
@@ -365,6 +368,10 @@ export function FeatureFlagReleaseConditions({
                     <div className="flex items-center justify-between">
                         <div />
                         <LemonButton
+                            disabledReason={
+                                !hasMatchingEarlyAccessFeature &&
+                                'The matching Early Access Feature was not found. You can create it in the Early Access Management tab.'
+                            }
                             aria-label="more"
                             data-attr={'feature-flag-feature-list-button'}
                             status="primary"
@@ -375,7 +382,7 @@ export function FeatureFlagReleaseConditions({
                                 router.actions.push(urls.earlyAccessFeature(featureFlag.features[0].id))
                             }
                         >
-                            View Early Access Feature
+                            {hasMatchingEarlyAccessFeature ? 'View Early Access Feature' : 'No Early Access Feature'}
                         </LemonButton>
                     </div>
                 </div>
diff --git a/frontend/src/scenes/feature-flags/FeatureFlags.tsx b/frontend/src/scenes/feature-flags/FeatureFlags.tsx
index 3768568688784f..b021107a843791 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlags.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlags.tsx
@@ -216,7 +216,15 @@ export function OverViewTab({
                                                 callback: loadFeatureFlags,
                                             })
                                         }}
-                                        disabled={!featureFlag.can_edit}
+                                        disabledReason={
+                                            !featureFlag.can_edit
+                                                ? "You have only 'View' access for this feature flag. To make changes, please contact the flag's creator."
+                                                : (featureFlag.features?.length || 0) > 0
+                                                ? 'This feature flag is in use with an early access feature. Delete the early access feature to delete this flag'
+                                                : (featureFlag.experiment_set?.length || 0) > 0
+                                                ? 'This feature flag is linked to an experiment. Delete the experiment to delete this flag'
+                                                : null
+                                        }
                                         fullWidth
                                     >
                                         Delete feature flag
@@ -426,10 +434,7 @@ export function groupFilters(
             ) : (
                 <div className="flex items-center">
                     <span className="shrink-0 mr-2">{rollout_percentage ?? 100}% of</span>
-                    <PropertyFiltersDisplay
-                        filters={properties as AnyPropertyFilter[]}
-                        style={{ margin: 0, flexDirection: 'column' }}
-                    />
+                    <PropertyFiltersDisplay filters={properties as AnyPropertyFilter[]} />
                 </div>
             )
         } else if (rollout_percentage !== null) {
diff --git a/frontend/src/scenes/feature-flags/RecentFeatureFlagInsightsCard.tsx b/frontend/src/scenes/feature-flags/RecentFeatureFlagInsightsCard.tsx
index 5145689f520851..5fdf19a9a4cb62 100644
--- a/frontend/src/scenes/feature-flags/RecentFeatureFlagInsightsCard.tsx
+++ b/frontend/src/scenes/feature-flags/RecentFeatureFlagInsightsCard.tsx
@@ -6,11 +6,11 @@ import { InsightModel } from '~/types'
 import { featureFlagLogic } from './featureFlagLogic'
 
 export function RecentFeatureFlagInsights(): JSX.Element {
-    const { recentInsights, recentInsightsLoading, featureFlag } = useValues(featureFlagLogic)
+    const { relatedInsights, relatedInsightsLoading, featureFlag } = useValues(featureFlagLogic)
     return (
         <CompactList
             title="Insights that use this feature flag"
-            loading={recentInsightsLoading}
+            loading={relatedInsightsLoading}
             emptyMessage={{
                 title: 'You have no insights that use this feature flag',
                 description: "Explore this feature flag's insights by creating one below.",
@@ -21,7 +21,7 @@ export function RecentFeatureFlagInsights(): JSX.Element {
                     breakdown: `$feature/${featureFlag.key}`,
                 }),
             }}
-            items={recentInsights.slice(0, 5)}
+            items={relatedInsights.slice(0, 5)}
             renderRow={(insight: InsightModel, index) => <InsightRow key={index} insight={insight} />}
         />
     )
diff --git a/frontend/src/scenes/feature-flags/featureFlagLogic.ts b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
index 77eec5c2ab461a..19544d46770432 100644
--- a/frontend/src/scenes/feature-flags/featureFlagLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
@@ -110,6 +110,12 @@ export interface FeatureFlagLogicProps {
     id: number | 'new' | 'link'
 }
 
+export type ProjectsWithCurrentFlagResponse = {
+    flag_id: number
+    team_id: number
+    active: boolean
+}[]
+
 // KLUDGE: Payloads are returned in a <variant-key>: <payload> mapping.
 // This doesn't work for forms because variant-keys can be updated too which would invalidate the dictionary entry.
 // If a multivariant flag is returned, the payload dictionary will be transformed to be <variant-key-index>: <payload>
@@ -518,10 +524,10 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
                 }
             },
         },
-        recentInsights: [
+        relatedInsights: [
             [] as InsightModel[],
             {
-                loadRecentInsights: async () => {
+                loadRelatedInsights: async () => {
                     if (props.id && props.id !== 'new' && values.featureFlag.key) {
                         const response = await api.get(
                             `api/projects/${values.currentTeamId}/insights/?feature_flag=${values.featureFlag.key}&order=-created_at`
@@ -579,7 +585,34 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         projectsWithCurrentFlag: {
             __default: [] as Record<string, string>[],
             loadProjectsWithCurrentFlag: async () => {
-                return []
+                const orgId = values.currentOrganization?.id
+                const flagKey = values.featureFlag.key
+
+                const projects = await api.organizationFeatureFlags.get(orgId, flagKey)
+
+                // Put current project first
+                const currentProjectIdx = projects.findIndex((p) => p.team_id === values.currentTeamId)
+                if (currentProjectIdx) {
+                    const [currentProject] = projects.splice(currentProjectIdx, 1)
+                    const sortedProjects = [currentProject, ...projects]
+                    return sortedProjects
+                }
+                return projects
+            },
+        },
+        featureFlagCopy: {
+            copyFlag: async () => {
+                const orgId = values.currentOrganization?.id
+                const featureFlagKey = values.featureFlag.key
+                const { copyDestinationProject, currentTeamId } = values
+
+                if (currentTeamId && copyDestinationProject) {
+                    return await api.organizationFeatureFlags.copy(orgId, {
+                        feature_flag_key: featureFlagKey,
+                        from_project: currentTeamId,
+                        target_project_ids: [copyDestinationProject],
+                    })
+                }
             },
         },
     })),
@@ -628,7 +661,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
             }
         },
         loadFeatureFlagSuccess: async () => {
-            actions.loadRecentInsights()
+            actions.loadRelatedInsights()
             actions.loadAllInsightsForFlag()
         },
         loadInsightAtIndex: async ({ index, filters }) => {
@@ -742,6 +775,21 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
                 featureFlagsLogic.findMounted()?.actions.updateFlag(updatedFlag)
             }
         },
+        copyFlagSuccess: ({ featureFlagCopy }) => {
+            if (featureFlagCopy?.success.length) {
+                const operation = values.projectsWithCurrentFlag.find(
+                    (p) => Number(p.team_id) === values.copyDestinationProject
+                )
+                    ? 'updated'
+                    : 'copied'
+                lemonToast.success(`Feature flag ${operation} successfully!`)
+            } else {
+                lemonToast.error(`Error while saving feature flag: ${featureFlagCopy?.failed || featureFlagCopy}`)
+            }
+
+            actions.loadProjectsWithCurrentFlag()
+            actions.setCopyDestinationProject(null)
+        },
     })),
     selectors({
         sentryErrorCount: [(s) => [s.sentryStats], (stats) => stats.total_count],
@@ -962,7 +1010,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         if (foundFlag) {
             const formatPayloads = variantKeyToIndexFeatureFlagPayloads(foundFlag)
             actions.setFeatureFlag(formatPayloads)
-            actions.loadRecentInsights()
+            actions.loadRelatedInsights()
             actions.loadAllInsightsForFlag()
         } else if (props.id !== 'new') {
             actions.loadFeatureFlag()
diff --git a/frontend/src/scenes/feature-flags/featureFlagPermissionsLogic.tsx b/frontend/src/scenes/feature-flags/featureFlagPermissionsLogic.tsx
index 56d20fa28d25de..43c0733e877e7d 100644
--- a/frontend/src/scenes/feature-flags/featureFlagPermissionsLogic.tsx
+++ b/frontend/src/scenes/feature-flags/featureFlagPermissionsLogic.tsx
@@ -2,7 +2,7 @@ import { actions, afterMount, connect, kea, key, path, props, reducers, selector
 import { loaders } from 'kea-loaders'
 import api from 'lib/api'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { rolesLogic } from 'scenes/organization/Settings/Permissions/Roles/rolesLogic'
+import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
 import { AccessLevel, FeatureFlagAssociatedRoleType, Resource, RoleType } from '~/types'
 
 import type { featureFlagPermissionsLogicType } from './featureFlagPermissionsLogicType'
diff --git a/frontend/src/scenes/funnels/FunnelBarGraph/MetricRow.tsx b/frontend/src/scenes/funnels/FunnelBarGraph/MetricRow.tsx
index c99395631187e6..7863e7770d3b3e 100644
--- a/frontend/src/scenes/funnels/FunnelBarGraph/MetricRow.tsx
+++ b/frontend/src/scenes/funnels/FunnelBarGraph/MetricRow.tsx
@@ -1,6 +1,6 @@
 export function MetricRow({ title, value }: { title: string; value: string | number }): JSX.Element {
     return (
-        <div style={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
+        <div className="flex justify-between w-full">
             <div>{title}</div>
             <div>
                 <strong style={{ paddingLeft: 6 }}>{value}</strong>
diff --git a/frontend/src/scenes/groups/Groups.tsx b/frontend/src/scenes/groups/Groups.tsx
index f6fc1d48a090c6..ec50e9950543ce 100644
--- a/frontend/src/scenes/groups/Groups.tsx
+++ b/frontend/src/scenes/groups/Groups.tsx
@@ -2,13 +2,11 @@ import { useActions, useValues } from 'kea'
 import { Group, PropertyDefinitionType } from '~/types'
 import { groupsListLogic } from './groupsListLogic'
 import { PropertiesTable } from 'lib/components/PropertiesTable'
-import { PersonPageHeader } from 'scenes/persons/PersonPageHeader'
 import { LemonTableColumns } from 'lib/lemon-ui/LemonTable/types'
 import { TZLabel } from 'lib/components/TZLabel'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { Link } from 'lib/lemon-ui/Link'
 import { urls } from 'scenes/urls'
-import { SceneExport } from 'scenes/sceneTypes'
 import { GroupsIntroduction } from 'scenes/groups/GroupsIntroduction'
 import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
 import { groupDisplayId } from 'scenes/persons/GroupActorDisplay'
@@ -18,22 +16,14 @@ import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { capitalizeFirstLetter } from 'lib/utils'
 
-export const scene: SceneExport = {
-    component: Groups,
-    logic: groupsListLogic,
-    paramsToProps: ({ params: { groupTypeIndex } }) => ({
-        groupTypeIndex: parseInt(groupTypeIndex),
-    }),
-}
-
-export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JSX.Element {
+export function Groups({ groupTypeIndex }: { groupTypeIndex: number }): JSX.Element {
     const {
         groupTypeName: { singular, plural },
         groups,
         groupsLoading,
         search,
-    } = useValues(groupsListLogic)
-    const { loadGroups, setSearch } = useActions(groupsListLogic)
+    } = useValues(groupsListLogic({ groupTypeIndex }))
+    const { loadGroups, setSearch } = useActions(groupsListLogic({ groupTypeIndex }))
     const { groupsAccessStatus } = useValues(groupsAccessLogic)
 
     if (groupTypeIndex === undefined) {
@@ -47,7 +37,6 @@ export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JS
     ) {
         return (
             <>
-                <PersonPageHeader activeGroupTypeIndex={parseInt(groupTypeIndex)} />
                 <GroupsIntroduction access={groupsAccessStatus} />
             </>
         )
@@ -76,7 +65,6 @@ export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JS
 
     return (
         <>
-            <PersonPageHeader activeGroupTypeIndex={parseInt(groupTypeIndex)} />
             <LemonInput
                 type="search"
                 placeholder={`Search for ${plural}`}
diff --git a/frontend/src/scenes/groups/GroupsTabs.tsx b/frontend/src/scenes/groups/GroupsTabs.tsx
deleted file mode 100644
index 89900d80544801..00000000000000
--- a/frontend/src/scenes/groups/GroupsTabs.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useValues } from 'kea'
-import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
-import { capitalizeFirstLetter } from 'lib/utils'
-import { groupsModel } from '~/models/groupsModel'
-import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
-import { urls } from 'scenes/urls'
-
-export function GroupsTabs({ activeGroupTypeIndex }: { activeGroupTypeIndex: number }): JSX.Element {
-    const { groupTypes, aggregationLabel } = useValues(groupsModel)
-    const { groupsAccessStatus } = useValues(groupsAccessLogic)
-
-    const showGroupsIntroductionPage = [
-        GroupsAccessStatus.HasAccess,
-        GroupsAccessStatus.HasGroupTypes,
-        GroupsAccessStatus.NoAccess,
-    ].includes(groupsAccessStatus)
-
-    return (
-        <LemonTabs
-            activeKey={activeGroupTypeIndex}
-            tabs={[
-                {
-                    key: -1,
-                    label: 'Persons',
-                    link: urls.persons(),
-                },
-                ...(showGroupsIntroductionPage
-                    ? [
-                          {
-                              key: 0,
-                              label: 'Groups',
-                              link: urls.groups(0),
-                          },
-                      ]
-                    : Array.from(groupTypes.values()).map(
-                          (groupType) =>
-                              ({
-                                  label: capitalizeFirstLetter(aggregationLabel(groupType.group_type_index).plural),
-                                  key: groupType.group_type_index,
-                                  link: urls.groups(groupType.group_type_index),
-                              } as LemonTab<number>)
-                      )),
-            ]}
-        />
-    )
-}
diff --git a/frontend/src/scenes/groups/RelatedGroups.tsx b/frontend/src/scenes/groups/RelatedGroups.tsx
index da77d147a845ed..396ff4150be9f8 100644
--- a/frontend/src/scenes/groups/RelatedGroups.tsx
+++ b/frontend/src/scenes/groups/RelatedGroups.tsx
@@ -2,11 +2,11 @@ import { useValues } from 'kea'
 import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { ActorType } from '~/types'
 import { groupsModel } from '~/models/groupsModel'
-import UserOutlined from '@ant-design/icons/lib/icons/UserOutlined'
 import { capitalizeFirstLetter } from 'lib/utils'
 import { PersonDisplay } from 'scenes/persons/PersonDisplay'
 import { relatedGroupsLogic } from 'scenes/groups/relatedGroupsLogic'
 import { GroupActorDisplay } from 'scenes/persons/GroupActorDisplay'
+import { IconPerson } from '@posthog/icons'
 
 interface Props {
     groupTypeIndex: number | null
@@ -27,7 +27,7 @@ export function RelatedGroups({ groupTypeIndex, id }: Props): JSX.Element {
                 } else {
                     return (
                         <>
-                            <UserOutlined /> Person
+                            <IconPerson /> Person
                         </>
                     )
                 }
diff --git a/frontend/src/scenes/groups/groupsListLogic.ts b/frontend/src/scenes/groups/groupsListLogic.ts
index 07a7d0c4b77b96..639aecd2ee007b 100644
--- a/frontend/src/scenes/groups/groupsListLogic.ts
+++ b/frontend/src/scenes/groups/groupsListLogic.ts
@@ -1,13 +1,11 @@
 import { loaders } from 'kea-loaders'
-import { kea, props, key, path, connect, actions, reducers, selectors, listeners, events } from 'kea'
+import { kea, props, key, path, connect, actions, reducers, selectors, listeners, afterMount } from 'kea'
 import api from 'lib/api'
 import { groupsAccessLogic } from 'lib/introductions/groupsAccessLogic'
 import { teamLogic } from 'scenes/teamLogic'
-import { urls } from 'scenes/urls'
 import { Noun, groupsModel } from '~/models/groupsModel'
-import { Breadcrumb, Group } from '~/types'
+import { Group } from '~/types'
 import type { groupsListLogicType } from './groupsListLogicType'
-import { capitalizeFirstLetter } from 'lib/utils'
 
 export interface GroupsPaginatedResponse {
     next: string | null
@@ -69,15 +67,6 @@ export const groupsListLogic = kea<groupsListLogicType>([
             (groupTypeIndex, aggregationLabel): Noun =>
                 groupTypeIndex === -1 ? { singular: 'person', plural: 'persons' } : aggregationLabel(groupTypeIndex),
         ],
-        breadcrumbs: [
-            (s, p) => [s.groupTypeName, p.groupTypeIndex],
-            (groupTypeName, groupTypeIndex): Breadcrumb[] => [
-                {
-                    name: capitalizeFirstLetter(groupTypeName.plural),
-                    path: urls.groups(groupTypeIndex),
-                },
-            ],
-        ],
     }),
     listeners(({ actions }) => ({
         setSearch: async ({ debounce }, breakpoint) => {
@@ -87,9 +76,7 @@ export const groupsListLogic = kea<groupsListLogicType>([
             actions.loadGroups()
         },
     })),
-    events(({ actions }) => ({
-        afterMount: () => {
-            actions.loadGroups()
-        },
-    })),
+    afterMount(({ actions }) => {
+        actions.loadGroups()
+    }),
 ])
diff --git a/frontend/src/scenes/ingestion/IngestionInviteMembersButton.tsx b/frontend/src/scenes/ingestion/IngestionInviteMembersButton.tsx
index 43370a7d7f86c4..439390bd83164f 100644
--- a/frontend/src/scenes/ingestion/IngestionInviteMembersButton.tsx
+++ b/frontend/src/scenes/ingestion/IngestionInviteMembersButton.tsx
@@ -2,7 +2,7 @@ import { LemonButton } from '@posthog/lemon-ui'
 import { useActions } from 'kea'
 import { IconArrowRight } from 'lib/lemon-ui/icons'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 
 export function IngestionInviteMembersButton(): JSX.Element {
     const { showInviteModal } = useActions(inviteLogic)
diff --git a/frontend/src/scenes/ingestion/IngestionWizard.tsx b/frontend/src/scenes/ingestion/IngestionWizard.tsx
index 9c5e22cb38794a..80c8d8c8690a2f 100644
--- a/frontend/src/scenes/ingestion/IngestionWizard.tsx
+++ b/frontend/src/scenes/ingestion/IngestionWizard.tsx
@@ -12,8 +12,8 @@ import { GeneratingDemoDataPanel } from './panels/GeneratingDemoDataPanel'
 import { ThirdPartyPanel } from './panels/ThirdPartyPanel'
 import { BillingPanel } from './panels/BillingPanel'
 import { Sidebar } from './Sidebar'
-import { InviteModal } from 'scenes/organization/Settings/InviteModal'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { InviteModal } from 'scenes/settings/organization/InviteModal'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { Logo } from '~/toolbar/assets/Logo'
 import { SitePopover } from '~/layout/navigation/TopBar/SitePopover'
 import { HelpButton } from 'lib/components/HelpButton/HelpButton'
diff --git a/frontend/src/scenes/ingestion/ingestionLogic.ts b/frontend/src/scenes/ingestion/ingestionLogic.ts
index 224949320e52bb..cf64522b8e27e5 100644
--- a/frontend/src/scenes/ingestion/ingestionLogic.ts
+++ b/frontend/src/scenes/ingestion/ingestionLogic.ts
@@ -11,7 +11,7 @@ import { windowValues } from 'kea-window-values'
 import { subscriptions } from 'kea-subscriptions'
 import { TeamType } from '~/types'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import api from 'lib/api'
 import { loaders } from 'kea-loaders'
 import type { ingestionLogicType } from './ingestionLogicType'
diff --git a/frontend/src/scenes/ingestion/panels/InviteTeamPanel.tsx b/frontend/src/scenes/ingestion/panels/InviteTeamPanel.tsx
index a8ded3f51bd97a..c6a30c5cf484f2 100644
--- a/frontend/src/scenes/ingestion/panels/InviteTeamPanel.tsx
+++ b/frontend/src/scenes/ingestion/panels/InviteTeamPanel.tsx
@@ -4,7 +4,7 @@ import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import './Panels.scss'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { IconChevronRight } from 'lib/lemon-ui/icons'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { DemoProjectButton } from './PanelComponents'
 
diff --git a/frontend/src/scenes/insights/EditorFilters/PathsAdvanced.tsx b/frontend/src/scenes/insights/EditorFilters/PathsAdvanced.tsx
index 2118f0202c060f..150222f6a00130 100644
--- a/frontend/src/scenes/insights/EditorFilters/PathsAdvanced.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/PathsAdvanced.tsx
@@ -12,6 +12,7 @@ import { IconSettings } from 'lib/lemon-ui/icons'
 
 import { PathCleaningFilter } from '../filters/PathCleaningFilter'
 import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
+import { urls } from 'scenes/urls'
 
 export function PathsAdvanced({ insightProps, ...rest }: EditorFilterProps): JSX.Element {
     const { pathsFilter } = useValues(pathsDataLogic(insightProps))
@@ -104,7 +105,10 @@ export function PathsAdvanced({ insightProps, ...rest }: EditorFilterProps): JSX
                         >
                             Path Cleaning Rules
                         </LemonLabel>
-                        <Link className="flex items-center ml-2" to="/project/settings#path_cleaning_filtering">
+                        <Link
+                            className="flex items-center ml-2"
+                            to={urls.settings('project-product-analytics', 'path-cleaning')}
+                        >
                             <IconSettings fontSize="16" className="mr-0.5" />
                             Configure Project Rules
                         </Link>
diff --git a/frontend/src/scenes/insights/EditorFilters/RetentionSummary.tsx b/frontend/src/scenes/insights/EditorFilters/RetentionSummary.tsx
index 187c1744951ded..6690f3e142e2f8 100644
--- a/frontend/src/scenes/insights/EditorFilters/RetentionSummary.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/RetentionSummary.tsx
@@ -1,5 +1,4 @@
 import { useActions, useValues } from 'kea'
-import { InfoCircleOutlined } from '@ant-design/icons'
 import {
     dateOptionPlurals,
     dateOptions,
@@ -15,6 +14,7 @@ import { MathAvailability } from '../filters/ActionFilter/ActionFilterRow/Action
 import { Link } from 'lib/lemon-ui/Link'
 import { LemonInput, LemonSelect } from '@posthog/lemon-ui'
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
+import { IconInfo } from '@posthog/icons'
 
 export function RetentionSummary({ insightProps }: EditorFilterProps): JSX.Element {
     const { showGroupsOptions } = useValues(groupsModel)
@@ -63,7 +63,7 @@ export function RetentionSummary({ insightProps }: EditorFilterProps): JSX.Eleme
                             <>
                                 {value}
                                 <Tooltip placement="right" title={retentionOptionDescriptions[key]}>
-                                    <InfoCircleOutlined className="info-indicator" />
+                                    <IconInfo className="info-indicator" />
                                 </Tooltip>
                             </>
                         ),
diff --git a/frontend/src/scenes/insights/EditorFilters/ValueOnSeriesFilter.tsx b/frontend/src/scenes/insights/EditorFilters/ValueOnSeriesFilter.tsx
index a3b1878733b795..37200a5dc3baf9 100644
--- a/frontend/src/scenes/insights/EditorFilters/ValueOnSeriesFilter.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/ValueOnSeriesFilter.tsx
@@ -1,18 +1,20 @@
 import { useActions, useValues } from 'kea'
 import { LemonCheckbox } from 'lib/lemon-ui/LemonCheckbox'
 import { insightLogic } from '../insightLogic'
-import { valueOnSeriesFilterLogic } from './valueOnSeriesFilterLogic'
+import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 
 export function ValueOnSeriesFilter(): JSX.Element {
     const { insightProps } = useValues(insightLogic)
-    const { valueOnSeries } = useValues(valueOnSeriesFilterLogic(insightProps))
-    const { setValueOnSeries } = useActions(valueOnSeriesFilterLogic(insightProps))
+    const { valueOnSeries } = useValues(insightVizDataLogic(insightProps))
+    const { updateInsightFilter } = useActions(insightVizDataLogic(insightProps))
 
     return (
         <LemonCheckbox
             className="p-1 px-2"
             checked={valueOnSeries}
-            onChange={setValueOnSeries}
+            onChange={(checked) => {
+                updateInsightFilter({ show_values_on_series: checked })
+            }}
             label={<span className="font-normal">Show values on series</span>}
             size="small"
         />
diff --git a/frontend/src/scenes/insights/EditorFilters/valueOnSeriesFilterLogic.ts b/frontend/src/scenes/insights/EditorFilters/valueOnSeriesFilterLogic.ts
deleted file mode 100644
index ce952907dad2ce..00000000000000
--- a/frontend/src/scenes/insights/EditorFilters/valueOnSeriesFilterLogic.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
-import { ChartDisplayType, InsightLogicProps, TrendsFilterType } from '~/types'
-import { insightVizDataLogic } from '../insightVizDataLogic'
-import { keyForInsightLogicProps } from '../sharedUtils'
-
-import type { valueOnSeriesFilterLogicType } from './valueOnSeriesFilterLogicType'
-
-export const valueOnSeriesFilterLogic = kea<valueOnSeriesFilterLogicType>([
-    props({} as InsightLogicProps),
-    key(keyForInsightLogicProps('new')),
-    path((key) => ['scenes', 'insights', 'EditorFilters', 'valueOnSeriesFilterLogic', key]),
-
-    connect((props: InsightLogicProps) => ({
-        values: [insightVizDataLogic(props), ['isTrends', 'isStickiness', 'isLifecycle', 'insightFilter']],
-        actions: [insightVizDataLogic(props), ['updateInsightFilter']],
-    })),
-
-    actions({
-        setValueOnSeries: (checked: boolean) => ({ checked }),
-    }),
-
-    selectors({
-        valueOnSeries: [
-            (s) => [s.isTrends, s.isStickiness, s.isLifecycle, s.insightFilter],
-            (isTrends, isStickiness, isLifecycle, insightFilter) => {
-                return !!(
-                    ((isTrends || isStickiness || isLifecycle) &&
-                        (insightFilter as TrendsFilterType)?.show_values_on_series) ||
-                    // pie charts have value checked by default
-                    (isTrends &&
-                        (insightFilter as TrendsFilterType)?.display === ChartDisplayType.ActionsPie &&
-                        (insightFilter as TrendsFilterType)?.show_values_on_series === undefined)
-                )
-            },
-        ],
-    }),
-
-    listeners(({ actions }) => ({
-        setValueOnSeries: ({ checked }) => {
-            actions.updateInsightFilter({ show_values_on_series: checked })
-        },
-    })),
-])
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
index 243ec146dd046d..ab3e7206c558f1 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryObj } from '@storybook/react'
 import funnelOneStep from './funnelOneStep.json'
 import { useStorybookMocks } from '~/mocks/browser'
 import { router } from 'kea-router'
-import insight from '../../../mocks/fixtures/api/projects/:team_id/insights/trendsLine.json'
+import insight from '../../../mocks/fixtures/api/projects/team_id/insights/trendsLine.json'
 import { InsightShortId } from '~/types'
 import { createInsightStory } from 'scenes/insights/__mocks__/createInsightScene'
 import { App } from 'scenes/App'
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
index 603be6ed7422e1..747a093413c068 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -1,5 +1,6 @@
 import { useActions, useValues } from 'kea'
-import { PlusCircleOutlined, ThunderboltFilled, WarningOutlined } from '@ant-design/icons'
+// eslint-disable-next-line no-restricted-imports
+import { PlusCircleOutlined, ThunderboltFilled } from '@ant-design/icons'
 import { IconErrorOutline, IconInfo, IconOpenInNew, IconPlus } from 'lib/lemon-ui/icons'
 import { entityFilterLogic } from 'scenes/insights/filters/ActionFilter/entityFilterLogic'
 import { Button, Empty } from 'antd'
@@ -21,6 +22,7 @@ import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { BuilderHog3 } from 'lib/components/hedgehogs'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { SupportModal } from 'lib/components/Support/SupportModal'
+import { IconWarning } from '@posthog/icons'
 
 export function InsightEmptyState({
     heading = 'There are no matching events for this query',
@@ -240,7 +242,7 @@ export function FunnelInvalidExclusionState(): JSX.Element {
         <div className="insight-empty-state warning">
             <div className="empty-state-inner">
                 <div className="illustration-main">
-                    <WarningOutlined />
+                    <IconWarning />
                 </div>
                 <h2>Invalid exclusion filters</h2>
                 <p>
diff --git a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
index b07540564eade7..500e4920031328 100644
--- a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
+++ b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
@@ -36,9 +36,9 @@ import {
 } from '~/queries/utils'
 import { examples, TotalEventsTable } from '~/queries/examples'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
-import { filterTestAccountsDefaultsLogic } from 'scenes/project/Settings/filterTestAccountDefaultsLogic'
 import { actionsAndEventsToSeries } from '~/queries/nodes/InsightQuery/utils/filtersToQueryNode'
 import { getDisplay, getShowPercentStackView, getShowValueOnSeries } from '~/queries/nodes/InsightViz/utils'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
 
 export interface Tab {
     label: string | JSX.Element
diff --git a/frontend/src/scenes/insights/InsightPageHeader.tsx b/frontend/src/scenes/insights/InsightPageHeader.tsx
index 6213bb6785eacb..e6ba4ea5b9f2fe 100644
--- a/frontend/src/scenes/insights/InsightPageHeader.tsx
+++ b/frontend/src/scenes/insights/InsightPageHeader.tsx
@@ -286,7 +286,12 @@ export function InsightPageHeader({ insightLogicProps }: { insightLogicProps: In
                                 <NotebookSelectButton
                                     resource={{
                                         type: NotebookNodeType.Query,
-                                        attrs: { id: insight.short_id },
+                                        attrs: {
+                                            query: {
+                                                kind: NodeKind.SavedInsightNode,
+                                                shortId: insight.short_id,
+                                            },
+                                        },
                                     }}
                                     type="secondary"
                                 />
diff --git a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.scss b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.scss
index 3715a1a2706124..2dba11b4efb7eb 100644
--- a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.scss
+++ b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.scss
@@ -59,7 +59,7 @@
                 font-weight: 600;
             }
             .tag-pill {
-                background-color: rgba(0, 0, 0, 0.08);
+                background-color: var(--border-3000);
                 margin-right: 0;
                 border: 0;
                 color: var(--primary-alt);
diff --git a/frontend/src/scenes/insights/Insights.stories.tsx b/frontend/src/scenes/insights/Insights.stories.tsx
index cc48ef2becd138..e21a3342167e49 100644
--- a/frontend/src/scenes/insights/Insights.stories.tsx
+++ b/frontend/src/scenes/insights/Insights.stories.tsx
@@ -22,7 +22,16 @@ const meta: Meta = {
                 '/api/projects/:team_id/persons/retention': sampleRetentionPeopleResponse,
                 '/api/projects/:team_id/persons/properties': samplePersonProperties,
                 '/api/projects/:team_id/groups_types': [],
-                '/api/projects/:team_id/notebooks?contains=query': {},
+                '/api/projects/:team_id/notebooks': () => {
+                    // this was matching on `?contains=query` but that made MSW unhappy and seems unnecessary
+                    return [
+                        200,
+                        {
+                            count: 0,
+                            results: [],
+                        },
+                    ]
+                },
             },
             post: {
                 '/api/projects/:team_id/cohorts/': { id: 1 },
@@ -34,13 +43,27 @@ export default meta
 /* eslint-disable @typescript-eslint/no-var-requires */
 // Trends
 export const TrendsLine: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsLine.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLine.json')
 )
 TrendsLine.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsLineEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsLine.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLine.json'),
+    'edit'
+)
+TrendsLineEdit.parameters = {
+    testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
+}
+
+export const TrendsLineMulti: Story = createInsightStory(
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json')
+)
+TrendsLine.parameters = {
+    testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
+}
+export const TrendsLineMultiEdit: Story = createInsightStory(
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'),
     'edit'
 )
 TrendsLineEdit.parameters = {
@@ -48,13 +71,13 @@ TrendsLineEdit.parameters = {
 }
 
 export const TrendsLineBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json')
 )
 TrendsLineBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsLineBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json'),
     'edit'
 )
 TrendsLineBreakdownEdit.parameters = {
@@ -62,13 +85,13 @@ TrendsLineBreakdownEdit.parameters = {
 }
 
 export const TrendsBar: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsBar.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsBar.json')
 )
 TrendsBar.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsBarEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsBar.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsBar.json'),
     'edit'
 )
 TrendsBarEdit.parameters = {
@@ -76,13 +99,13 @@ TrendsBarEdit.parameters = {
 }
 
 export const TrendsBarBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json')
 )
 TrendsBarBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsBarBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json'),
     'edit'
 )
 TrendsBarBreakdownEdit.parameters = {
@@ -90,13 +113,13 @@ TrendsBarBreakdownEdit.parameters = {
 }
 
 export const TrendsValue: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsValue.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsValue.json')
 )
 TrendsValue.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-bar-value-graph] > canvas' },
 }
 export const TrendsValueEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsValue.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsValue.json'),
     'edit'
 )
 TrendsValueEdit.parameters = {
@@ -104,13 +127,13 @@ TrendsValueEdit.parameters = {
 }
 
 export const TrendsValueBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsValueBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsValueBreakdown.json')
 )
 TrendsValueBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-bar-value-graph] > canvas' },
 }
 export const TrendsValueBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsValueBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsValueBreakdown.json'),
     'edit'
 )
 TrendsValueBreakdownEdit.parameters = {
@@ -118,13 +141,13 @@ TrendsValueBreakdownEdit.parameters = {
 }
 
 export const TrendsArea: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsArea.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsArea.json')
 )
 TrendsArea.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsAreaEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsArea.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsArea.json'),
     'edit'
 )
 TrendsAreaEdit.parameters = {
@@ -132,13 +155,13 @@ TrendsAreaEdit.parameters = {
 }
 
 export const TrendsAreaBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsAreaBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsAreaBreakdown.json')
 )
 TrendsAreaBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const TrendsAreaBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsAreaBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsAreaBreakdown.json'),
     'edit'
 )
 TrendsAreaBreakdownEdit.parameters = {
@@ -146,31 +169,31 @@ TrendsAreaBreakdownEdit.parameters = {
 }
 
 export const TrendsNumber: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsNumber.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsNumber.json')
 )
 TrendsNumber.parameters = { testOptions: { waitForSelector: '.BoldNumber__value' } }
 export const TrendsNumberEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsNumber.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsNumber.json'),
     'edit'
 )
 TrendsNumberEdit.parameters = { testOptions: { waitForSelector: '.BoldNumber__value' } }
 
 export const TrendsTable: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsTable.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsTable.json')
 )
 TrendsTable.parameters = { testOptions: { waitForSelector: '[data-attr=insights-table-graph] td' } }
 export const TrendsTableEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsTable.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsTable.json'),
     'edit'
 )
 TrendsTableEdit.parameters = { testOptions: { waitForSelector: '[data-attr=insights-table-graph] td' } }
 
 export const TrendsTableBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsTableBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsTableBreakdown.json')
 )
 TrendsTableBreakdown.parameters = { testOptions: { waitForSelector: '[data-attr=insights-table-graph] td' } }
 export const TrendsTableBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsTableBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsTableBreakdown.json'),
     'edit'
 )
 TrendsTableBreakdownEdit.parameters = {
@@ -178,21 +201,21 @@ TrendsTableBreakdownEdit.parameters = {
 }
 
 export const TrendsPie: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsPie.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsPie.json')
 )
 TrendsPie.parameters = { testOptions: { waitForSelector: '[data-attr=trend-pie-graph] > canvas' } }
 export const TrendsPieEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsPie.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsPie.json'),
     'edit'
 )
 TrendsPieEdit.parameters = { testOptions: { waitForSelector: '[data-attr=trend-pie-graph] > canvas' } }
 
 export const TrendsPieBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json')
 )
 TrendsPieBreakdown.parameters = { testOptions: { waitForSelector: '[data-attr=trend-pie-graph] > canvas' } }
 export const TrendsPieBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json'),
     'edit'
 )
 TrendsPieBreakdownEdit.parameters = {
@@ -200,11 +223,11 @@ TrendsPieBreakdownEdit.parameters = {
 }
 
 export const TrendsWorldMap: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json')
 )
 TrendsWorldMap.parameters = { testOptions: { waitForSelector: '.WorldMap' } }
 export const TrendsWorldMapEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/trendsWorldMap.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json'),
     'edit'
 )
 TrendsWorldMapEdit.parameters = { testOptions: { waitForSelector: '.WorldMap' } }
@@ -212,11 +235,11 @@ TrendsWorldMapEdit.parameters = { testOptions: { waitForSelector: '.WorldMap' }
 // Funnels
 
 export const FunnelLeftToRight: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json')
 )
 FunnelLeftToRight.parameters = { testOptions: { waitForSelector: '[data-attr=funnel-bar-graph] .StepBar' } }
 export const FunnelLeftToRightEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRight.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json'),
     'edit'
 )
 FunnelLeftToRightEdit.parameters = {
@@ -224,13 +247,13 @@ FunnelLeftToRightEdit.parameters = {
 }
 
 export const FunnelLeftToRightBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRightBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json')
 )
 FunnelLeftToRightBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=funnel-bar-graph] .StepBar' },
 }
 export const FunnelLeftToRightBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelLeftToRightBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json'),
     'edit'
 )
 FunnelLeftToRightBreakdownEdit.parameters = {
@@ -238,13 +261,13 @@ FunnelLeftToRightBreakdownEdit.parameters = {
 }
 
 export const FunnelTopToBottom: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json')
 )
 FunnelTopToBottom.parameters = {
     testOptions: { waitForSelector: '[data-attr=funnel-bar-graph] .funnel-bar' },
 }
 export const FunnelTopToBottomEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json'),
     'edit'
 )
 FunnelTopToBottomEdit.parameters = {
@@ -252,13 +275,13 @@ FunnelTopToBottomEdit.parameters = {
 }
 
 export const FunnelTopToBottomBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottomBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json')
 )
 FunnelTopToBottomBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=funnel-bar-graph] .funnel-bar' },
 }
 export const FunnelTopToBottomBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottomBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json'),
     'edit'
 )
 FunnelTopToBottomBreakdownEdit.parameters = {
@@ -266,13 +289,13 @@ FunnelTopToBottomBreakdownEdit.parameters = {
 }
 
 export const FunnelHistoricalTrends: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelHistoricalTrends.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelHistoricalTrends.json')
 )
 FunnelHistoricalTrends.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph-funnel] > canvas' },
 }
 export const FunnelHistoricalTrendsEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelHistoricalTrends.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelHistoricalTrends.json'),
     'edit'
 )
 FunnelHistoricalTrendsEdit.parameters = {
@@ -280,11 +303,11 @@ FunnelHistoricalTrendsEdit.parameters = {
 }
 
 export const FunnelTimeToConvert: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTimeToConvert.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTimeToConvert.json')
 )
 FunnelTimeToConvert.parameters = { testOptions: { waitForSelector: '[data-attr=funnel-histogram] svg' } }
 export const FunnelTimeToConvertEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/funnelTimeToConvert.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/funnelTimeToConvert.json'),
     'edit'
 )
 FunnelTimeToConvertEdit.parameters = { testOptions: { waitForSelector: '[data-attr=funnel-histogram] svg' } }
@@ -292,13 +315,13 @@ FunnelTimeToConvertEdit.parameters = { testOptions: { waitForSelector: '[data-at
 // Retention
 
 export const Retention: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/retention.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/retention.json')
 )
 Retention.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const RetentionEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/retention.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/retention.json'),
     'edit'
 )
 RetentionEdit.parameters = {
@@ -306,13 +329,13 @@ RetentionEdit.parameters = {
 }
 
 export const RetentionBreakdown: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/retentionBreakdown.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/retentionBreakdown.json')
 )
 RetentionBreakdown.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const RetentionBreakdownEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/retentionBreakdown.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/retentionBreakdown.json'),
     'edit'
 )
 RetentionBreakdownEdit.parameters = {
@@ -322,13 +345,13 @@ RetentionBreakdownEdit.parameters = {
 // Lifecycle
 
 export const Lifecycle: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/lifecycle.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/lifecycle.json')
 )
 Lifecycle.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const LifecycleEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/lifecycle.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/lifecycle.json'),
     'edit'
 )
 LifecycleEdit.parameters = {
@@ -338,13 +361,13 @@ LifecycleEdit.parameters = {
 // Stickiness
 
 export const Stickiness: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/stickiness.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/stickiness.json')
 )
 Stickiness.parameters = {
     testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
 }
 export const StickinessEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/stickiness.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/stickiness.json'),
     'edit'
 )
 StickinessEdit.parameters = {
@@ -354,11 +377,11 @@ StickinessEdit.parameters = {
 // User Paths
 
 export const UserPaths: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/userPaths.json')
+    require('../../mocks/fixtures/api/projects/team_id/insights/userPaths.json')
 )
 UserPaths.parameters = { testOptions: { waitForSelector: '[data-attr=paths-viz] > svg' } }
 export const UserPathsEdit: Story = createInsightStory(
-    require('../../mocks/fixtures/api/projects/:team_id/insights/userPaths.json'),
+    require('../../mocks/fixtures/api/projects/team_id/insights/userPaths.json'),
     'edit'
 )
 UserPathsEdit.parameters = { testOptions: { waitForSelector: '[data-attr=paths-viz] > svg' } }
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
index 921f18b586f223..80b792f3e4dd26 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
@@ -321,6 +321,7 @@ export function ActionFilterRow({
             className={'ActionFilterRow'}
             ref={setNodeRef}
             {...attributes}
+            // eslint-disable-next-line react/forbid-dom-props
             style={{
                 position: 'relative',
                 zIndex: isDragging ? 1 : undefined,
@@ -458,7 +459,6 @@ export function ActionFilterRow({
                         pageKey={`${index}-${value}-${typeKey}-filter`}
                         propertyFilters={filter.properties}
                         onChange={(properties) => updateFilterProperty({ properties, index })}
-                        style={{ margin: 0 }}
                         showNestedArrow={showNestedArrow}
                         disablePopover={!propertyFiltersPopover}
                         taxonomicGroupTypes={propertiesTaxonomicGroupTypes}
diff --git a/frontend/src/scenes/insights/filters/InsightDateFilter/InsightDateFilter.tsx b/frontend/src/scenes/insights/filters/InsightDateFilter/InsightDateFilter.tsx
index 1412a7d7a0e3dc..f54d98df2e1261 100644
--- a/frontend/src/scenes/insights/filters/InsightDateFilter/InsightDateFilter.tsx
+++ b/frontend/src/scenes/insights/filters/InsightDateFilter/InsightDateFilter.tsx
@@ -1,8 +1,8 @@
 import { useValues, useActions } from 'kea'
 import { DateFilter } from 'lib/components/DateFilter/DateFilter'
 import { insightLogic } from 'scenes/insights/insightLogic'
-import { CalendarOutlined, InfoCircleOutlined } from '@ant-design/icons'
 import { Tooltip } from 'antd'
+import { IconCalendar, IconInfo } from '@posthog/icons'
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 
 type InsightDateFilterProps = {
@@ -17,17 +17,17 @@ export function InsightDateFilter({ disabled }: InsightDateFilterProps): JSX.Ele
     return (
         <DateFilter
             dateTo={dateRange?.date_to ?? undefined}
-            dateFrom={dateRange?.date_from ?? '-7d' ?? undefined}
+            dateFrom={dateRange?.date_from ?? '-7d'}
             disabled={disabled}
             onChange={(date_from, date_to) => {
                 updateDateRange({ date_from, date_to })
             }}
             makeLabel={(key) => (
                 <>
-                    <CalendarOutlined /> {key}
+                    <IconCalendar /> {key}
                     {key == 'All time' && (
                         <Tooltip title={`Only events dated after 2015 will be shown`}>
-                            <InfoCircleOutlined className="info-indicator" />
+                            <IconInfo className="info-indicator" />
                         </Tooltip>
                     )}
                 </>
diff --git a/frontend/src/scenes/insights/filters/InsightDateFilter/insightDateFilterLogic.ts b/frontend/src/scenes/insights/filters/InsightDateFilter/insightDateFilterLogic.ts
new file mode 100644
index 00000000000000..76c8b4da0321ce
--- /dev/null
+++ b/frontend/src/scenes/insights/filters/InsightDateFilter/insightDateFilterLogic.ts
@@ -0,0 +1,37 @@
+import { kea, props, key, path, connect, actions, selectors, listeners } from 'kea'
+import type { insightDateFilterLogicType } from './insightDateFilterLogicType'
+import { InsightLogicProps } from '~/types'
+import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
+import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
+
+export const insightDateFilterLogic = kea<insightDateFilterLogicType>([
+    props({} as InsightLogicProps),
+    key(keyForInsightLogicProps('new')),
+    path((key) => ['scenes', 'insights', 'InsightDateFilter', 'insightDateFilterLogic', key]),
+    connect((props: InsightLogicProps) => ({
+        actions: [insightVizDataLogic(props), ['updateQuerySource']],
+        values: [insightVizDataLogic(props), ['dateRange']],
+    })),
+    actions(() => ({
+        setDates: (dateFrom: string | undefined | null, dateTo: string | undefined | null) => ({
+            dateFrom,
+            dateTo,
+        }),
+    })),
+    selectors({
+        dates: [
+            (s) => [s.dateRange],
+            (dateRange) => ({ dateFrom: dateRange?.date_from || null, dateTo: dateRange?.date_to || null }),
+        ],
+    }),
+    listeners(({ actions }) => ({
+        setDates: ({ dateFrom, dateTo }) => {
+            actions.updateQuerySource({
+                dateRange: {
+                    date_from: dateFrom || null,
+                    date_to: dateTo || null,
+                },
+            })
+        },
+    })),
+])
diff --git a/frontend/src/scenes/insights/filters/RetentionReferencePicker.tsx b/frontend/src/scenes/insights/filters/RetentionReferencePicker.tsx
index be670f9abc8c5d..a5f9d72f2b649d 100644
--- a/frontend/src/scenes/insights/filters/RetentionReferencePicker.tsx
+++ b/frontend/src/scenes/insights/filters/RetentionReferencePicker.tsx
@@ -1,4 +1,5 @@
 import { Select } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { PercentageOutlined } from '@ant-design/icons'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { useActions, useValues } from 'kea'
diff --git a/frontend/src/scenes/insights/filters/TestAccountFilter/TestAccountFilter.tsx b/frontend/src/scenes/insights/filters/TestAccountFilter/TestAccountFilter.tsx
index 715e5f59932aca..19eeb45ef73475 100644
--- a/frontend/src/scenes/insights/filters/TestAccountFilter/TestAccountFilter.tsx
+++ b/frontend/src/scenes/insights/filters/TestAccountFilter/TestAccountFilter.tsx
@@ -4,7 +4,8 @@ import { teamLogic } from 'scenes/teamLogic'
 import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch/LemonSwitch'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { IconSettings } from 'lib/lemon-ui/icons'
-import { filterTestAccountsDefaultsLogic } from 'scenes/project/Settings/filterTestAccountDefaultsLogic'
+import { urls } from 'scenes/urls'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
 
 export function TestAccountFilter({
     filters,
@@ -33,7 +34,7 @@ export function TestAccountFilter({
                     <span>Filter out internal and test users</span>
                     <LemonButton
                         icon={<IconSettings />}
-                        to="/project/settings#internal-users-filtering"
+                        to={urls.settings('project-product-analytics', 'internal-user-filtering')}
                         status="stealth"
                         size="small"
                         noPadding
diff --git a/frontend/src/scenes/insights/insightCommandLogic.ts b/frontend/src/scenes/insights/insightCommandLogic.ts
index 7a46c062c51d28..c94449d881249e 100644
--- a/frontend/src/scenes/insights/insightCommandLogic.ts
+++ b/frontend/src/scenes/insights/insightCommandLogic.ts
@@ -2,11 +2,11 @@ import { Command, commandPaletteLogic } from 'lib/components/CommandPalette/comm
 import { kea, props, key, path, connect, events } from 'kea'
 import type { insightCommandLogicType } from './insightCommandLogicType'
 import { compareFilterLogic } from 'lib/components/CompareFilter/compareFilterLogic'
-import { RiseOutlined } from '@ant-design/icons'
 import { dateMapping } from 'lib/utils'
 import { InsightLogicProps } from '~/types'
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 import { insightVizDataLogic } from './insightVizDataLogic'
+import { IconTrendingUp } from 'lib/lemon-ui/icons'
 
 const INSIGHT_COMMAND_SCOPE = 'insights'
 
@@ -23,14 +23,14 @@ export const insightCommandLogic = kea<insightCommandLogicType>([
                     key: 'insight-graph',
                     resolver: [
                         {
-                            icon: RiseOutlined,
+                            icon: IconTrendingUp,
                             display: 'Toggle "Compare Previous" on Graph',
                             executor: () => {
                                 compareFilterLogic(props).actions.toggleCompare()
                             },
                         },
                         ...dateMapping.map(({ key, values }) => ({
-                            icon: RiseOutlined,
+                            icon: IconTrendingUp,
                             display: `Set Time Range to ${key}`,
                             executor: () => {
                                 insightVizDataLogic(props).actions.updateDateRange({
diff --git a/frontend/src/scenes/insights/insightDataLogic.ts b/frontend/src/scenes/insights/insightDataLogic.ts
index e2ac23f175ed2e..89e2dec570f328 100644
--- a/frontend/src/scenes/insights/insightDataLogic.ts
+++ b/frontend/src/scenes/insights/insightDataLogic.ts
@@ -15,9 +15,9 @@ import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/InsightViz'
 import { queryExportContext } from '~/queries/query'
 import { objectsEqual } from 'lib/utils'
 import { compareFilters } from './utils/compareFilters'
-import { filterTestAccountsDefaultsLogic } from 'scenes/project/Settings/filterTestAccountDefaultsLogic'
 import { insightDataTimingLogic } from './insightDataTimingLogic'
 import { teamLogic } from 'scenes/teamLogic'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
 
 const queryFromFilters = (filters: Partial<FilterType>): InsightVizNode => ({
     kind: NodeKind.InsightVizNode,
diff --git a/frontend/src/scenes/insights/insightLogic.ts b/frontend/src/scenes/insights/insightLogic.ts
index a38becc02327b6..825d1a1237265a 100644
--- a/frontend/src/scenes/insights/insightLogic.ts
+++ b/frontend/src/scenes/insights/insightLogic.ts
@@ -51,6 +51,7 @@ import { isInsightVizNode } from '~/queries/utils'
 import { userLogic } from 'scenes/userLogic'
 import { transformLegacyHiddenLegendKeys } from 'scenes/funnels/funnelUtils'
 import { summarizeInsight } from 'scenes/insights/summarizeInsight'
+import { InsightVizNode } from '~/queries/schema'
 
 const IS_TEST_MODE = process.env.NODE_ENV === 'test'
 export const UNSAVED_INSIGHT_MIN_REFRESH_INTERVAL_MINUTES = 3
@@ -540,6 +541,7 @@ export const insightLogic = kea<insightLogicType>([
                 )
             },
         ],
+        showPersonsModal: [() => [(_, p) => p.query], (query?: InsightVizNode) => !query || !query.hidePersonsModal],
     }),
     listeners(({ actions, selectors, values }) => ({
         setFiltersMerge: ({ filters }) => {
diff --git a/frontend/src/scenes/insights/insightSceneLogic.tsx b/frontend/src/scenes/insights/insightSceneLogic.tsx
index 4df5586a291bc4..3ff71b3e53720a 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.tsx
+++ b/frontend/src/scenes/insights/insightSceneLogic.tsx
@@ -13,12 +13,13 @@ import { cleanFilters } from 'scenes/insights/utils/cleanFilters'
 import { teamLogic } from 'scenes/teamLogic'
 import { insightDataLogic } from './insightDataLogic'
 import { insightDataLogicType } from './insightDataLogicType'
+import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
 export const insightSceneLogic = kea<insightSceneLogicType>([
     path(['scenes', 'insights', 'insightSceneLogic']),
     connect({
         logic: [eventUsageLogic],
-        values: [teamLogic, ['currentTeam'], sceneLogic, ['activeScene']],
+        values: [teamLogic, ['currentTeam'], sceneLogic, ['activeScene'], preflightLogic, ['isDev']],
     }),
     actions({
         setInsightId: (insightId: InsightShortId) => ({ insightId }),
@@ -236,6 +237,10 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
                 return false
             }
 
+            if (values.isDev) {
+                return false
+            }
+
             return (
                 values.insightMode === ItemMode.Edit &&
                 (!!values.insightLogicRef?.logic.values.insightChanged ||
diff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.ts
index e56d57def84a30..d732592eb2be20 100644
--- a/frontend/src/scenes/insights/insightVizDataLogic.ts
+++ b/frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -1,6 +1,6 @@
 import posthog from 'posthog-js'
 import { actions, connect, kea, key, listeners, path, props, selectors, reducers } from 'kea'
-import { BaseMathType, ChartDisplayType, InsightLogicProps, IntervalType } from '~/types'
+import { BaseMathType, ChartDisplayType, InsightLogicProps, IntervalType, TrendsFilterType } from '~/types'
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 import {
     BreakdownFilter,
@@ -50,7 +50,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 
 import type { insightVizDataLogicType } from './insightVizDataLogicType'
 import { parseProperties } from 'lib/components/PropertyFilters/utils'
-import { filterTestAccountsDefaultsLogic } from 'scenes/project/Settings/filterTestAccountDefaultsLogic'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
 import { BASE_MATH_DEFINITIONS } from 'scenes/trends/mathsLogic'
 import { lemonToast } from '@posthog/lemon-ui'
 import { dayjs } from 'lib/dayjs'
@@ -171,7 +171,11 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
                 )
             },
         ],
-
+        shouldShowSessionAnalysisWarning: [
+            (s) => [s.isUsingSessionAnalysis, s.query],
+            (isUsingSessionAnalysis, query) =>
+                isUsingSessionAnalysis && !(isInsightVizNode(query) && query.suppressSessionAnalysisWarning),
+        ],
         isNonTimeSeriesDisplay: [
             (s) => [s.display],
             (display) => !!display && NON_TIME_SERIES_DISPLAY_TYPES.includes(display),
@@ -184,6 +188,20 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
             },
         ],
 
+        valueOnSeries: [
+            (s) => [s.isTrends, s.isStickiness, s.isLifecycle, s.insightFilter],
+            (isTrends, isStickiness, isLifecycle, insightFilter): boolean => {
+                return !!(
+                    ((isTrends || isStickiness || isLifecycle) &&
+                        (insightFilter as TrendsFilterType)?.show_values_on_series) ||
+                    // pie charts have value checked by default
+                    (isTrends &&
+                        (insightFilter as TrendsFilterType)?.display === ChartDisplayType.ActionsPie &&
+                        (insightFilter as TrendsFilterType)?.show_values_on_series === undefined)
+                )
+            },
+        ],
+
         hasLegend: [
             (s) => [s.isTrends, s.isStickiness, s.display],
             (isTrends, isStickiness, display) =>
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelBinsPicker.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelBinsPicker.tsx
index f9411cfddd8b23..a3971c891a7ded 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelBinsPicker.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelBinsPicker.tsx
@@ -2,11 +2,11 @@ import { useActions, useValues } from 'kea'
 import { BIN_COUNT_AUTO } from 'lib/constants'
 import { InputNumber, Select } from 'antd'
 import { BinCountValue } from '~/types'
-import { BarChartOutlined } from '@ant-design/icons'
 import clsx from 'clsx'
 import { ANTD_TOOLTIP_PLACEMENTS } from 'lib/utils'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
+import { IconBarChart } from 'lib/lemon-ui/icons'
 
 // Constraints as defined in funnel_time_to_convert.py:34
 const MIN = 1
@@ -99,7 +99,7 @@ export function FunnelBinsPicker({ disabled }: FunnelBinsPickerProps): JSX.Eleme
                             value={option.value}
                             label={
                                 <>
-                                    <BarChartOutlined /> {option.label}
+                                    <IconBarChart /> {option.label}
                                 </>
                             }
                         >
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelConversionWindowFilter.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelConversionWindowFilter.tsx
index 68fd13590e4fe7..59deda68014805 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelConversionWindowFilter.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelConversionWindowFilter.tsx
@@ -1,4 +1,3 @@
-import { InfoCircleOutlined } from '@ant-design/icons'
 import { capitalizeFirstLetter, pluralize } from 'lib/utils'
 import { useState } from 'react'
 import { EditorFilterProps, FunnelConversionWindow, FunnelConversionWindowTimeUnit } from '~/types'
@@ -8,6 +7,7 @@ import { LemonInput, LemonSelect, LemonSelectOption } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
 import { FunnelsFilter } from '~/queries/schema'
+import { IconInfo } from '@posthog/icons'
 
 const TIME_INTERVAL_BOUNDS: Record<FunnelConversionWindowTimeUnit, number[]> = {
     [FunnelConversionWindowTimeUnit.Second]: [1, 3600],
@@ -50,8 +50,8 @@ export function FunnelConversionWindowFilter({ insightProps }: Pick<EditorFilter
 
     return (
         <div className="flex items-center gap-2">
-            <span className="whitespace-nowrap">
-                Conversion window limit{' '}
+            <span className="flex whitespace-nowrap">
+                Conversion window limit
                 <Tooltip
                     title={
                         <>
@@ -63,7 +63,7 @@ export function FunnelConversionWindowFilter({ insightProps }: Pick<EditorFilter
                         </>
                     }
                 >
-                    <InfoCircleOutlined className="info-indicator" />
+                    <IconInfo className="w-4 info-indicator" />
                 </Tooltip>
             </span>
             <div className="flex items-center gap-2">
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationFeedbackForm.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationFeedbackForm.tsx
index 59d499953c1648..d2838054e3e803 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationFeedbackForm.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationFeedbackForm.tsx
@@ -5,8 +5,7 @@ import { insightLogic } from 'scenes/insights/insightLogic'
 import { funnelCorrelationFeedbackLogic } from 'scenes/funnels/funnelCorrelationFeedbackLogic'
 
 import { LemonButton, LemonTextArea } from '@posthog/lemon-ui'
-import { IconClose } from 'lib/lemon-ui/icons'
-import { CommentOutlined } from '@ant-design/icons'
+import { IconClose, IconComment } from 'lib/lemon-ui/icons'
 
 export const FunnelCorrelationFeedbackForm = (): JSX.Element | null => {
     const { insightProps } = useValues(insightLogic)
@@ -30,7 +29,7 @@ export const FunnelCorrelationFeedbackForm = (): JSX.Element | null => {
         <div className="border rounded p-4 space-y-2 mt-4">
             <div className="flex items-center justify-between">
                 <h4 className="text-muted-alt">
-                    <CommentOutlined style={{ marginRight: 4 }} />
+                    <IconComment style={{ marginRight: 4 }} />
                     Was this correlation analysis report useful?
                 </h4>
                 <div className="flex items-center gap-2">
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationSkewWarning.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationSkewWarning.tsx
index 3b62284e9ec2cd..587c33aefa5081 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationSkewWarning.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationSkewWarning.tsx
@@ -4,6 +4,7 @@ import { Card } from 'antd'
 import { insightLogic } from 'scenes/insights/insightLogic'
 
 import { IconFeedback } from 'lib/lemon-ui/icons'
+// eslint-disable-next-line no-restricted-imports
 import { CloseOutlined } from '@ant-design/icons'
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
 
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationTable.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationTable.tsx
index eda03e199dd28e..1c3a0222493235 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationTable.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelCorrelationTable.tsx
@@ -2,8 +2,7 @@ import { useEffect } from 'react'
 import { ConfigProvider, Table, Empty } from 'antd'
 import Column from 'antd/lib/table/Column'
 import { useActions, useValues } from 'kea'
-import { RiseOutlined, FallOutlined, InfoCircleOutlined } from '@ant-design/icons'
-import { IconSelectEvents, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
+import { IconSelectEvents, IconTrendUp, IconTrendingDown, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
 import { FunnelCorrelation, FunnelCorrelationResultsType, FunnelCorrelationType } from '~/types'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { ValueInspectorButton } from 'scenes/funnels/ValueInspectorButton'
@@ -24,6 +23,7 @@ import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
 import { parseDisplayNameForCorrelation } from 'scenes/funnels/funnelUtils'
 import { LemonCheckbox } from '@posthog/lemon-ui'
 import { funnelPersonsModalLogic } from 'scenes/funnels/funnelPersonsModalLogic'
+import { IconInfo } from '@posthog/icons'
 
 export function FunnelCorrelationTable(): JSX.Element | null {
     const { insightProps } = useValues(insightLogic)
@@ -85,7 +85,11 @@ export function FunnelCorrelationTable(): JSX.Element | null {
         return (
             <>
                 <h4>
-                    {is_success ? <RiseOutlined className="text-success" /> : <FallOutlined className="text-danger" />}{' '}
+                    {is_success ? (
+                        <IconTrendUp className="text-success" />
+                    ) : (
+                        <IconTrendingDown className="text-danger" />
+                    )}{' '}
                     <PropertyKeyInfo value={first_value} />
                     {second_value !== undefined && (
                         <>
@@ -321,7 +325,7 @@ export function FunnelCorrelationTable(): JSX.Element | null {
                                             querySource?.aggregation_group_type_index != undefined ? 'that' : 'who'
                                         } performed the event and completed the entire funnel.`}
                                     >
-                                        <InfoCircleOutlined className="column-info" />
+                                        <IconInfo className="column-info" />
                                     </Tooltip>
                                 </div>
                             }
@@ -345,7 +349,7 @@ export function FunnelCorrelationTable(): JSX.Element | null {
                                             </>
                                         }
                                     >
-                                        <InfoCircleOutlined className="column-info" />
+                                        <IconInfo className="column-info" />
                                     </Tooltip>
                                 </div>
                             }
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelPropertyCorrelationTable.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelPropertyCorrelationTable.tsx
index a06bac784f4258..3325b103ba438f 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelPropertyCorrelationTable.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelPropertyCorrelationTable.tsx
@@ -3,12 +3,11 @@ import { Link } from 'lib/lemon-ui/Link'
 import { Col, ConfigProvider, Row, Table, Empty } from 'antd'
 import Column from 'antd/lib/table/Column'
 import { useActions, useValues } from 'kea'
-import { RiseOutlined, FallOutlined, InfoCircleOutlined } from '@ant-design/icons'
 import { FunnelCorrelation, FunnelCorrelationResultsType, FunnelCorrelationType } from '~/types'
 import { insightLogic } from 'scenes/insights/insightLogic'
 import { ValueInspectorButton } from 'scenes/funnels/ValueInspectorButton'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
-import { IconSelectProperties } from 'lib/lemon-ui/icons'
+import { IconSelectProperties, IconTrendingDown, IconTrendingUp } from 'lib/lemon-ui/icons'
 import './FunnelCorrelationTable.scss'
 import { VisibilitySensor } from 'lib/components/VisibilitySensor/VisibilitySensor'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
@@ -23,6 +22,7 @@ import { PersonPropertySelect } from 'lib/components/PersonPropertySelect/Person
 import { useState } from 'react'
 import { LemonButton, LemonCheckbox } from '@posthog/lemon-ui'
 import { funnelPersonsModalLogic } from 'scenes/funnels/funnelPersonsModalLogic'
+import { IconInfo } from '@posthog/icons'
 
 export function FunnelPropertyCorrelationTable(): JSX.Element | null {
     const { insightProps } = useValues(insightLogic)
@@ -103,9 +103,9 @@ export function FunnelPropertyCorrelationTable(): JSX.Element | null {
             <>
                 <h4>
                     {is_success ? (
-                        <RiseOutlined style={{ color: 'green' }} />
+                        <IconTrendingUp style={{ color: 'green' }} />
                     ) : (
-                        <FallOutlined style={{ color: 'red' }} />
+                        <IconTrendingDown style={{ color: 'red' }} />
                     )}{' '}
                     <PropertyKeyInfo value={first_value} />
                     {second_value !== undefined && (
@@ -264,7 +264,7 @@ export function FunnelPropertyCorrelationTable(): JSX.Element | null {
                                             querySource?.aggregation_group_type_index != undefined ? 'that' : 'who'
                                         } have this property and completed the entire funnel.`}
                                     >
-                                        <InfoCircleOutlined className="column-info" />
+                                        <IconInfo className="column-info" />
                                     </Tooltip>
                                 </div>
                             }
@@ -288,7 +288,7 @@ export function FunnelPropertyCorrelationTable(): JSX.Element | null {
                                             </>
                                         }
                                     >
-                                        <InfoCircleOutlined className="column-info" />
+                                        <IconInfo className="column-info" />
                                     </Tooltip>
                                 </div>
                             }
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelVizType.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelVizType.tsx
index b53ba5ac1b304c..d66db5a0855f95 100644
--- a/frontend/src/scenes/insights/views/Funnels/FunnelVizType.tsx
+++ b/frontend/src/scenes/insights/views/Funnels/FunnelVizType.tsx
@@ -1,11 +1,13 @@
 import { useActions, useValues } from 'kea'
-import { ClockCircleOutlined, LineChartOutlined, FunnelPlotOutlined } from '@ant-design/icons'
+// eslint-disable-next-line no-restricted-imports
+import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons'
 
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
 
 import { FunnelVizType as VizType, EditorFilterProps } from '~/types'
 import { DropdownSelector } from 'lib/components/DropdownSelector/DropdownSelector'
 import { FunnelsFilter } from '~/queries/schema'
+import { IconFunnels } from '@posthog/icons'
 
 export function FunnelVizType({ insightProps }: Pick<EditorFilterProps, 'insightProps'>): JSX.Element | null {
     const { aggregationTargetLabel } = useValues(funnelDataLogic(insightProps))
@@ -19,7 +21,7 @@ export function FunnelVizType({ insightProps }: Pick<EditorFilterProps, 'insight
             key: VizType.Steps,
             label: 'Conversion steps',
             description: `Track ${aggregationTargetLabel.plural} progress between steps of the funnel`,
-            icon: <FunnelPlotOutlined />,
+            icon: <IconFunnels />,
         },
         {
             key: VizType.TimeToConvert,
diff --git a/frontend/src/scenes/insights/views/Histogram/Histogram.tsx b/frontend/src/scenes/insights/views/Histogram/Histogram.tsx
index d3abb1548470c0..11671e289ecaee 100644
--- a/frontend/src/scenes/insights/views/Histogram/Histogram.tsx
+++ b/frontend/src/scenes/insights/views/Histogram/Histogram.tsx
@@ -260,5 +260,6 @@ export function Histogram({
 
     /* minWidth required to enforce d3's width calculations on the div wrapping the svg
      so that scrolling horizontally works */
+    //  eslint-disable-next-line react/forbid-dom-props
     return <div className="histogram-container" ref={ref} style={{ minWidth: config.width }} />
 }
diff --git a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.stories.tsx b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.stories.tsx
index 6bc37549ef62e1..5b3283417f019b 100644
--- a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.stories.tsx
+++ b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.stories.tsx
@@ -25,7 +25,7 @@ const Template: StoryFn<typeof InsightsTable> = (props, { parameters }) => {
     const [dashboardItemId] = useState(() => `InsightTableStory.${uniqueNode++}`)
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const insight = require('../../../../mocks/fixtures/api/projects/:team_id/insights/trendsLineBreakdown.json')
+    const insight = require('../../../../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json')
     const filters = { ...insight.filters, ...parameters.mergeFilters }
     const cachedInsight = { ...insight, short_id: dashboardItemId, filters }
 
diff --git a/frontend/src/scenes/insights/views/InsightsTable/columns/AggregationColumn.tsx b/frontend/src/scenes/insights/views/InsightsTable/columns/AggregationColumn.tsx
index 901839a9601a26..ba2ec9f5393299 100644
--- a/frontend/src/scenes/insights/views/InsightsTable/columns/AggregationColumn.tsx
+++ b/frontend/src/scenes/insights/views/InsightsTable/columns/AggregationColumn.tsx
@@ -1,5 +1,6 @@
 import { useValues, useActions } from 'kea'
 import { Dropdown, Menu } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { DownOutlined } from '@ant-design/icons'
 
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
diff --git a/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx b/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
index b5a5d6e39aca81..51576c2496ec96 100644
--- a/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
+++ b/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
@@ -733,7 +733,7 @@ export function LineGraph_({
         })
         setMyLineChart(newChart)
         return () => newChart.destroy()
-    }, [datasets, hiddenLegendKeys, isDarkModeOn])
+    }, [datasets, hiddenLegendKeys, isDarkModeOn, trendsFilter, formula, showValueOnSeries, showPercentStackView])
 
     return (
         <div
diff --git a/frontend/src/scenes/insights/views/Paths/PathStepPicker.tsx b/frontend/src/scenes/insights/views/Paths/PathStepPicker.tsx
index 737a5c5975af0b..74fcf78ea45153 100644
--- a/frontend/src/scenes/insights/views/Paths/PathStepPicker.tsx
+++ b/frontend/src/scenes/insights/views/Paths/PathStepPicker.tsx
@@ -1,5 +1,6 @@
 import { useActions, useValues } from 'kea'
 import { Select } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { BarsOutlined } from '@ant-design/icons'
 import { ANTD_TOOLTIP_PLACEMENTS } from 'lib/utils'
 
diff --git a/frontend/src/scenes/insights/views/WorldMap/WorldMap.tsx b/frontend/src/scenes/insights/views/WorldMap/WorldMap.tsx
index 7857ddbf833741..472ad00a1aaeb1 100644
--- a/frontend/src/scenes/insights/views/WorldMap/WorldMap.tsx
+++ b/frontend/src/scenes/insights/views/WorldMap/WorldMap.tsx
@@ -1,7 +1,7 @@
 import { useValues, useActions } from 'kea'
-import React, { useEffect, useRef } from 'react'
+import React, { HTMLProps, useEffect, useRef } from 'react'
 import { insightLogic } from 'scenes/insights/insightLogic'
-import { ChartParams, TrendResult } from '~/types'
+import { ChartDisplayType, ChartParams, TrendResult } from '~/types'
 import './WorldMap.scss'
 import { InsightTooltip } from 'scenes/insights/InsightTooltip/InsightTooltip'
 import { SeriesDatum } from '../../InsightTooltip/insightTooltipUtils'
@@ -104,6 +104,10 @@ interface WorldMapSVGProps extends ChartParams {
     showTooltip: (countryCode: string, countrySeries: TrendResult | null) => void
     hideTooltip: () => void
     updateTooltipCoordinates: (x: number, y: number) => void
+    worldMapCountryProps?: (
+        countryCode: string,
+        countrySeries: TrendResult | undefined
+    ) => Omit<HTMLProps<SVGElement>, 'key'>
 }
 
 const WorldMapSVG = React.memo(
@@ -116,6 +120,7 @@ const WorldMapSVG = React.memo(
                 showTooltip,
                 hideTooltip,
                 updateTooltipCoordinates,
+                worldMapCountryProps,
             },
             ref
         ) => {
@@ -139,15 +144,23 @@ const WorldMapSVG = React.memo(
                         const fill = aggregatedValue
                             ? gradateColor(BRAND_BLUE_HSL, aggregatedValue / maxAggregatedValue, SATURATION_FLOOR)
                             : undefined
-                        return React.cloneElement(countryElement, {
-                            key: countryCode,
-                            style: { color: fill, cursor: showPersonsModal && countrySeries ? 'pointer' : undefined },
-                            onMouseEnter: () => showTooltip(countryCode, countrySeries || null),
-                            onMouseLeave: () => hideTooltip(),
-                            onMouseMove: (e: MouseEvent) => {
-                                updateTooltipCoordinates(e.clientX, e.clientY)
-                            },
-                            onClick: () => {
+
+                        const {
+                            onClick: propsOnClick,
+                            style,
+                            ...props
+                        } = worldMapCountryProps
+                            ? worldMapCountryProps(countryCode, countrySeries)
+                            : { onClick: undefined, style: undefined }
+
+                        let onClick: typeof propsOnClick
+                        if (propsOnClick) {
+                            onClick = (e) => {
+                                propsOnClick(e)
+                                hideTooltip()
+                            }
+                        } else if (showPersonsModal && countrySeries) {
+                            onClick = () => {
                                 if (showPersonsModal && countrySeries) {
                                     if (countrySeries.persons?.url) {
                                         openPersonsModal({
@@ -167,7 +180,19 @@ const WorldMapSVG = React.memo(
                                         })
                                     }
                                 }
+                            }
+                        }
+
+                        return React.cloneElement(countryElement, {
+                            key: countryCode,
+                            style: { color: fill, cursor: onClick ? 'pointer' : undefined, ...style },
+                            onMouseEnter: () => showTooltip(countryCode, countrySeries || null),
+                            onMouseLeave: () => hideTooltip(),
+                            onMouseMove: (e: MouseEvent) => {
+                                updateTooltipCoordinates(e.clientX, e.clientY)
                             },
+                            onClick,
+                            ...props,
                         })
                     })}
                 </svg>
@@ -176,10 +201,11 @@ const WorldMapSVG = React.memo(
     )
 )
 
-export function WorldMap({ showPersonsModal = true }: ChartParams): JSX.Element {
+export function WorldMap({ showPersonsModal = true, context }: ChartParams): JSX.Element {
     const { insightProps } = useValues(insightLogic)
     const { countryCodeToSeries, maxAggregatedValue } = useValues(worldMapLogic(insightProps))
     const { showTooltip, hideTooltip, updateTooltipCoordinates } = useActions(worldMapLogic(insightProps))
+    const renderingMetadata = context?.chartRenderingMetadata?.[ChartDisplayType.WorldMap]
 
     const svgRef = useWorldMapTooltip(showPersonsModal)
 
@@ -192,6 +218,7 @@ export function WorldMap({ showPersonsModal = true }: ChartParams): JSX.Element
             hideTooltip={hideTooltip}
             updateTooltipCoordinates={updateTooltipCoordinates}
             ref={svgRef}
+            worldMapCountryProps={renderingMetadata?.countryProps}
         />
     )
 }
diff --git a/frontend/src/scenes/instance/AsyncMigrations/AsyncMigrations.tsx b/frontend/src/scenes/instance/AsyncMigrations/AsyncMigrations.tsx
index 6c3fbb8b995437..dc1be09924ebc0 100644
--- a/frontend/src/scenes/instance/AsyncMigrations/AsyncMigrations.tsx
+++ b/frontend/src/scenes/instance/AsyncMigrations/AsyncMigrations.tsx
@@ -3,7 +3,6 @@ import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
 import { Button, Progress } from 'antd'
 import { useActions, useValues } from 'kea'
-import { PlayCircleOutlined } from '@ant-design/icons'
 import {
     AsyncMigration,
     migrationStatusNumberToMessage,
@@ -21,7 +20,7 @@ import { humanFriendlyDetailedTime } from 'lib/utils'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonTag, LemonTagType } from 'lib/lemon-ui/LemonTag/LemonTag'
-import { IconRefresh, IconReplay } from 'lib/lemon-ui/icons'
+import { IconPlayCircle, IconRefresh, IconReplay } from 'lib/lemon-ui/icons'
 import { AsyncMigrationParametersModal } from 'scenes/instance/AsyncMigrations/AsyncMigrationParametersModal'
 import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
 import { Link } from '@posthog/lemon-ui'
@@ -153,7 +152,7 @@ export function AsyncMigrations(): JSX.Element {
                         <Tooltip title="Start">
                             <Button
                                 type="link"
-                                icon={<PlayCircleOutlined />}
+                                icon={<IconPlayCircle />}
                                 onClick={() => triggerMigration(asyncMigration)}
                             >
                                 Run
diff --git a/frontend/src/scenes/instance/DeadLetterQueue/MetricsTab.tsx b/frontend/src/scenes/instance/DeadLetterQueue/MetricsTab.tsx
index 6a2a344c78ef92..901500d92a6c4d 100644
--- a/frontend/src/scenes/instance/DeadLetterQueue/MetricsTab.tsx
+++ b/frontend/src/scenes/instance/DeadLetterQueue/MetricsTab.tsx
@@ -71,12 +71,7 @@ export function MetricsTab(): JSX.Element {
                         }}
                         embedded
                     />
-                    <div
-                        style={{
-                            margin: '1rem',
-                            textAlign: 'center',
-                        }}
-                    >
+                    <div className="m-4 text-center">
                         <Button
                             disabled={rowsPerMetric[row.key].length % ROWS_LIMIT !== 0}
                             onClick={() => loadMoreRows(row.key)}
diff --git a/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx b/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
index 7094709a14eaae..a61d9eb7e20cb8 100644
--- a/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
+++ b/frontend/src/scenes/instance/SystemStatus/KafkaInspectorTab.tsx
@@ -10,13 +10,11 @@ export function KafkaInspectorTab(): JSX.Element {
 
     return (
         <div>
-            <h3 className="l3" style={{ marginTop: 16 }}>
-                Kafka Inspector
-            </h3>
+            <h3 className="l3 mt-4">Kafka Inspector</h3>
             <div className="mb-4">Debug Kafka messages using the inspector tool.</div>
             <Divider style={{ margin: 0, marginBottom: 16 }} />
             <section>
-                <div style={{ display: 'flex', marginBottom: '0.75rem' }}>
+                <div className="flex mb-3">
                     <Form
                         logic={kafkaInspectorLogic}
                         formKey="fetchKafkaMessage"
diff --git a/frontend/src/scenes/instance/SystemStatus/StaffUsersTab.tsx b/frontend/src/scenes/instance/SystemStatus/StaffUsersTab.tsx
index 627f303ba7f080..3605857912d5da 100644
--- a/frontend/src/scenes/instance/SystemStatus/StaffUsersTab.tsx
+++ b/frontend/src/scenes/instance/SystemStatus/StaffUsersTab.tsx
@@ -68,16 +68,11 @@ export function StaffUsersTab(): JSX.Element {
                                 okType: 'primary',
                                 okButtonProps: { className: 'btn-danger' },
                                 content: (
-                                    <div style={{ border: '' }}>
+                                    <div className="border-none">
                                         {myself?.uuid === user.uuid ? (
                                             <>
                                                 Please confirm you want to <b>remove yourself</b> as a staff user.
-                                                <div
-                                                    style={{
-                                                        fontWeight: 'normal',
-                                                        color: 'var(--muted-alt)',
-                                                    }}
-                                                >
+                                                <div className="font-normal" style={{ color: 'var(--muted-alt)' }}>
                                                     Only another staff user will be able to add you again.
                                                 </div>
                                             </>
@@ -100,9 +95,7 @@ export function StaffUsersTab(): JSX.Element {
 
     return (
         <div>
-            <h3 className="l3" style={{ marginTop: 16 }}>
-                Staff Users
-            </h3>
+            <h3 className="l3 mt-4">Staff Users</h3>
             <div className="mb-4">
                 Users who have permissions to manage instance-wide settings. Staff user permissions are set at the{' '}
                 <b>instance-level and are independent of any organization or project permissions.</b>{' '}
@@ -118,7 +111,7 @@ export function StaffUsersTab(): JSX.Element {
             <Divider style={{ margin: 0, marginBottom: 16 }} />
             <section>
                 <div className="flex gap-2 mb-4">
-                    <div className="flex flex-1">
+                    <div className="flex-1">
                         <LemonSelectMultiple
                             placeholder="Add staff users here…"
                             loading={allUsersLoading}
diff --git a/frontend/src/scenes/me/Settings/index.tsx b/frontend/src/scenes/me/Settings/index.tsx
deleted file mode 100644
index 7409de959e3faa..00000000000000
--- a/frontend/src/scenes/me/Settings/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useValues } from 'kea'
-import { Divider } from 'antd'
-import { useAnchor } from 'lib/hooks/useAnchor'
-import { router } from 'kea-router'
-import { UpdateEmailPreferences } from './UpdateEmailPreferences'
-import { ChangePassword } from './ChangePassword'
-import { PersonalAPIKeys } from 'lib/components/PersonalAPIKeys'
-import { OptOutCapture } from './OptOutCapture'
-import { PageHeader } from 'lib/components/PageHeader'
-import { SceneExport } from 'scenes/sceneTypes'
-import { UserDetails } from './UserDetails'
-import { TwoFactorAuthentication } from './TwoFactorAuthentication'
-
-export const scene: SceneExport = {
-    component: MySettings,
-}
-
-export function MySettings(): JSX.Element {
-    const { location } = useValues(router)
-
-    useAnchor(location.hash)
-
-    return (
-        <>
-            <PageHeader title="My settings" />
-            <div className="border rounded p-6 mt-4">
-                <UserDetails />
-                <Divider />
-
-                <h2 id="password" className="subtitle">
-                    Change Password
-                </h2>
-                <ChangePassword />
-                <Divider />
-                <h2 id="personal-api-keys" className="subtitle">
-                    Personal API Keys
-                </h2>
-                <PersonalAPIKeys />
-                <Divider />
-                <h2 id="2fa" className="subtitle">
-                    Two-Factor Authentication
-                </h2>
-                <TwoFactorAuthentication />
-                <Divider />
-                <div id="notifications">
-                    <h2 className="subtitle">Notifications</h2>
-                    <UpdateEmailPreferences />
-                </div>
-                <Divider />
-                <h2 id="optout" className="subtitle">
-                    Anonymize Data Collection
-                </h2>
-                <OptOutCapture />
-            </div>
-        </>
-    )
-}
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeExperiment.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeExperiment.tsx
index 28801d7c356a71..e9713d5aa0d91e 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeExperiment.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeExperiment.tsx
@@ -2,7 +2,7 @@ import { createPostHogWidgetNode } from 'scenes/notebooks/Nodes/NodeWrapper'
 import { NotebookNodeType } from '~/types'
 import { BindLogic, useActions, useValues } from 'kea'
 import { IconFlag, IconExperiment } from 'lib/lemon-ui/icons'
-import { LemonButton, LemonDivider } from '@posthog/lemon-ui'
+import { LemonDivider } from '@posthog/lemon-ui'
 import { urls } from 'scenes/urls'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { notebookNodeLogic } from './notebookNodeLogic'
@@ -25,8 +25,8 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeExperimentAttri
         experimentLogic({ experimentId: id })
     )
     const { loadExperiment } = useActions(experimentLogic({ experimentId: id }))
-    const { expanded, nextNode } = useValues(notebookNodeLogic)
-    const { insertAfter } = useActions(notebookNodeLogic)
+    const { expanded } = useValues(notebookNodeLogic)
+    const { insertAfter, setActions } = useActions(notebookNodeLogic)
 
     // experiment progress details
     const logic = insightLogic({ dashboardItemId: EXPERIMENT_INSIGHT_ID })
@@ -40,6 +40,14 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeExperimentAttri
     const entrants = results?.[0]?.count
 
     useEffect(() => {
+        setActions([
+            {
+                text: 'View feature flag',
+                icon: <IconFlag />,
+                onClick: () => insertAfter(buildFlagContent(experiment.feature_flag?.id || 'new')),
+            },
+        ])
+
         loadExperiment()
     }, [id])
 
@@ -57,7 +65,7 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeExperimentAttri
                     ) : (
                         <>
                             <span className="flex-1 font-semibold truncate">{experiment.name}</span>
-                            <StatusTag />
+                            <StatusTag experiment={experiment} />
                             <ResultsTag />
                         </>
                     )}
@@ -99,25 +107,6 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeExperimentAttri
                         )}
                     </>
                 ) : null}
-
-                <LemonDivider className="my-0" />
-                <div className="p-2 mr-1 flex justify-end gap-2">
-                    <LemonButton
-                        type="secondary"
-                        size="small"
-                        icon={<IconFlag />}
-                        onClick={() => {
-                            if (nextNode?.type.name !== NotebookNodeType.FeatureFlag) {
-                                insertAfter(buildFlagContent(experiment.feature_flag?.id || 'new'))
-                            }
-                        }}
-                        disabledReason={
-                            nextNode?.type.name === NotebookNodeType.FeatureFlag && 'Feature flag already exists below'
-                        }
-                    >
-                        View Feature Flag
-                    </LemonButton>
-                </div>
             </BindLogic>
         </div>
     )
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeMention.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeMention.tsx
new file mode 100644
index 00000000000000..e446a8b302fcef
--- /dev/null
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeMention.tsx
@@ -0,0 +1,70 @@
+import { mergeAttributes, Node, NodeViewProps } from '@tiptap/core'
+import { NodeViewWrapper, ReactNodeViewRenderer } from '@tiptap/react'
+import { NotebookNodeType } from '~/types'
+import clsx from 'clsx'
+import { LemonButton, ProfilePicture, Tooltip } from '@posthog/lemon-ui'
+import { useValues } from 'kea'
+import { membersLogic } from 'scenes/organization/membersLogic'
+
+export interface NotebookNodeMentionAttrs {
+    id?: number
+}
+
+const Component = (props: NodeViewProps): JSX.Element => {
+    const { id } = props.node.attrs as NotebookNodeMentionAttrs
+
+    const { meFirstMembers } = useValues(membersLogic)
+
+    const member = meFirstMembers.find((member) => member.user.id === id)
+
+    return (
+        <NodeViewWrapper as="span" className={clsx('NotebookMention', props.selected && 'NotebookMention--selected')}>
+            <Tooltip
+                title={
+                    <div className="p-2 flex items-center gap-2">
+                        <ProfilePicture name={member?.user.first_name} email={member?.user.email} size="xl" />
+                        <div>
+                            <div className="font-bold">{member?.user.first_name}</div>
+                            <div className="text-sm">{member?.user.email}</div>
+                        </div>
+                    </div>
+                }
+            >
+                <LemonButton size="small" noPadding type="secondary" status="primary-alt" sideIcon={null}>
+                    <span className="p-1">@{member?.user.first_name ?? '(Member)'}</span>
+                </LemonButton>
+            </Tooltip>
+        </NodeViewWrapper>
+    )
+}
+
+export const NotebookNodeMention = Node.create({
+    name: NotebookNodeType.Mention,
+    inline: true,
+    group: 'inline',
+    atom: true,
+
+    serializedText: (attrs: NotebookNodeMentionAttrs): string => {
+        // mention is not a block so `getText` does not add a separator.
+        // we need to add it manually
+        return `(member:${attrs.id})`
+    },
+
+    addAttributes() {
+        return {
+            id: { default: null },
+        }
+    },
+
+    parseHTML() {
+        return [{ tag: NotebookNodeType.Mention }]
+    },
+
+    renderHTML({ HTMLAttributes }) {
+        return [NotebookNodeType.Mention, mergeAttributes(HTMLAttributes)]
+    },
+
+    addNodeView() {
+        return ReactNodeViewRenderer(Component)
+    },
+})
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/Session.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/Session.tsx
index e181b27b49bd26..d3f346ae2d7286 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/Session.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/Session.tsx
@@ -26,7 +26,7 @@ export const Session = ({ session }: SessionProps): JSX.Element => {
     const [isFolded, setIsFolded] = useState(false)
 
     const onOpenReplay = (): void => {
-        const newChildren = [...children] || []
+        const newChildren = [...(children || [])]
 
         const existingChild = newChildren.find((child) => child.attrs?.nodeId === `${nodeId}-active-replay`)
 
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
index 9f5838069d4497..e567131b4d6d7d 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
@@ -66,6 +66,7 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeQueryAttributes
             modifiedQuery.full = false
             modifiedQuery.showHogQLEditor = false
             modifiedQuery.embedded = true
+            modifiedQuery.showTimings = false
         }
 
         if (NodeKind.InsightVizNode === modifiedQuery.kind || NodeKind.SavedInsightNode === modifiedQuery.kind) {
@@ -87,7 +88,12 @@ const Component = ({ attributes }: NotebookNodeProps<NotebookNodeQueryAttributes
         <div
             className={clsx('flex flex-1 flex-col', NodeKind.DataTableNode === modifiedQuery.kind && 'overflow-hidden')}
         >
-            <Query query={modifiedQuery} uniqueKey={nodeId} readOnly={true} />
+            <Query
+                query={modifiedQuery}
+                // use separate keys for the settings and visualization to avoid conflicts with insightProps
+                uniqueKey={nodeId + '-component'}
+                readOnly={true}
+            />
         </div>
     )
 }
@@ -126,6 +132,7 @@ export const Settings = ({
 
         if (NodeKind.InsightVizNode === modifiedQuery.kind || NodeKind.SavedInsightNode === modifiedQuery.kind) {
             modifiedQuery.showFilters = true
+            modifiedQuery.showHeader = true
             modifiedQuery.showResults = false
             modifiedQuery.embedded = true
         }
@@ -177,7 +184,8 @@ export const Settings = ({
         <div className="p-3">
             <Query
                 query={modifiedQuery}
-                uniqueKey={attributes.nodeId}
+                // use separate keys for the settings and visualization to avoid conflicts with insightProps
+                uniqueKey={attributes.nodeId + '-settings'}
                 readOnly={false}
                 setQuery={(t) => {
                     updateAttributes({
diff --git a/frontend/src/scenes/notebooks/Notebook/BacklinkCommands.tsx b/frontend/src/scenes/notebooks/Notebook/BacklinkCommands.tsx
deleted file mode 100644
index ef925ef8058701..00000000000000
--- a/frontend/src/scenes/notebooks/Notebook/BacklinkCommands.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { Extension } from '@tiptap/core'
-import { ReactRenderer } from '@tiptap/react'
-import Suggestion from '@tiptap/suggestion'
-import { PluginKey } from '@tiptap/pm/state'
-
-import { Popover } from 'lib/lemon-ui/Popover'
-import { forwardRef } from 'react'
-import {
-    TaxonomicDefinitionTypes,
-    TaxonomicFilterGroup,
-    TaxonomicFilterGroupType,
-    TaxonomicFilterLogicProps,
-    TaxonomicFilterValue,
-} from 'lib/components/TaxonomicFilter/types'
-import { TaxonomicFilter } from 'lib/components/TaxonomicFilter/TaxonomicFilter'
-import { EditorRange } from './utils'
-import { useValues } from 'kea'
-import { notebookLogic } from './notebookLogic'
-import { NotebookNodeType } from '~/types'
-
-type BacklinkCommandsProps = {
-    query?: string
-    range?: EditorRange
-    onClose: () => void
-    decorationNode?: any
-}
-
-const BacklinkCommandsPopover = forwardRef<ReactRenderer, BacklinkCommandsProps>(function BacklinkCommandsPopover(
-    props: BacklinkCommandsProps,
-    ref
-): JSX.Element | null {
-    return (
-        <Popover overlay={<BacklinkCommands ref={ref} {...props} />} visible referenceElement={props.decorationNode} />
-    )
-})
-
-const BacklinkCommands = forwardRef<ReactRenderer, BacklinkCommandsProps>(function BacklinkCommands({
-    range = { from: 0, to: 0 },
-    query,
-    onClose,
-}): JSX.Element | null {
-    const { editor } = useValues(notebookLogic)
-
-    const onSelect = (
-        group: TaxonomicFilterGroup,
-        value: TaxonomicFilterValue,
-        item: TaxonomicDefinitionTypes
-    ): void => {
-        if (!editor) {
-            return
-        }
-
-        const attrs = {
-            id: group.type === TaxonomicFilterGroupType.Events ? item.id : value,
-            title: group.getName?.(item),
-            type: group.type,
-        }
-
-        editor
-            .deleteRange(range)
-            .insertContentAt(range, [
-                { type: NotebookNodeType.Backlink, attrs },
-                { type: 'text', text: ' ' },
-            ])
-            .run()
-    }
-
-    if (!editor) {
-        return null
-    }
-
-    const taxonomicFilterLogicProps: TaxonomicFilterLogicProps = {
-        groupType: TaxonomicFilterGroupType.Events,
-        value: query,
-        onChange: onSelect,
-        onClose: onClose,
-        taxonomicGroupTypes: [
-            TaxonomicFilterGroupType.Events,
-            TaxonomicFilterGroupType.Persons,
-            TaxonomicFilterGroupType.Cohorts,
-            TaxonomicFilterGroupType.Insights,
-            TaxonomicFilterGroupType.FeatureFlags,
-            TaxonomicFilterGroupType.Experiments,
-            TaxonomicFilterGroupType.Dashboards,
-            TaxonomicFilterGroupType.Notebooks,
-        ],
-        optionsFromProp: undefined,
-        popoverEnabled: true,
-        selectFirstItem: true,
-        taxonomicFilterLogicKey: 'notebook',
-    }
-
-    return <TaxonomicFilter {...taxonomicFilterLogicProps} />
-})
-
-const BacklinkCommandsPluginKey = new PluginKey('backlink-commands')
-
-export const BacklinkCommandsExtension = Extension.create({
-    name: 'backlink-commands',
-
-    addProseMirrorPlugins() {
-        return [
-            Suggestion({
-                pluginKey: BacklinkCommandsPluginKey,
-                editor: this.editor,
-                char: '@',
-                allow: ({ range }) => range.to - range.from === 1,
-                render: () => {
-                    let renderer: ReactRenderer
-
-                    const onClose = (): void => {
-                        renderer.destroy()
-                        this.editor.chain().focus().run()
-                    }
-
-                    return {
-                        onStart: (props) => {
-                            renderer = new ReactRenderer(BacklinkCommandsPopover, {
-                                props: { ...props, onClose },
-                                editor: props.editor,
-                            })
-                        },
-
-                        onUpdate(props) {
-                            renderer.updateProps(props)
-
-                            if (!props.clientRect) {
-                                return
-                            }
-                        },
-
-                        onExit() {
-                            onClose()
-                        },
-                    }
-                },
-            }),
-        ]
-    },
-})
diff --git a/frontend/src/scenes/notebooks/Notebook/Editor.tsx b/frontend/src/scenes/notebooks/Notebook/Editor.tsx
index b9c2449d85cc25..23b85be33114b2 100644
--- a/frontend/src/scenes/notebooks/Notebook/Editor.tsx
+++ b/frontend/src/scenes/notebooks/Notebook/Editor.tsx
@@ -29,7 +29,6 @@ import { NotebookNodeImage } from '../Nodes/NotebookNodeImage'
 
 import { EditorFocusPosition, EditorRange, JSONContent, Node, textContent } from './utils'
 import { SlashCommandsExtension } from './SlashCommands'
-import { BacklinkCommandsExtension } from './BacklinkCommands'
 import { NotebookNodeEarlyAccessFeature } from '../Nodes/NotebookNodeEarlyAccessFeature'
 import { NotebookNodeSurvey } from '../Nodes/NotebookNodeSurvey'
 import { InlineMenu } from './InlineMenu'
@@ -40,6 +39,8 @@ import { NotebookNodeCohort } from '../Nodes/NotebookNodeCohort'
 import { NotebookNodePersonFeed } from '../Nodes/NotebookNodePersonFeed/NotebookNodePersonFeed'
 import { NotebookNodeProperties } from '../Nodes/NotebookNodeProperties'
 import { NotebookNodeMap } from '../Nodes/NotebookNodeMap'
+import { MentionsExtension } from './MentionsExtension'
+import { NotebookNodeMention } from '../Nodes/NotebookNodeMention'
 
 const CustomDocument = ExtensionDocument.extend({
     content: 'heading block*',
@@ -118,8 +119,9 @@ export function Editor(): JSX.Element {
             NotebookNodeSurvey,
             NotebookNodeImage,
             NotebookNodeProperties,
+            NotebookNodeMention,
             SlashCommandsExtension,
-            BacklinkCommandsExtension,
+            MentionsExtension,
             NotebookNodePersonFeed,
             NotebookNodeMap,
         ],
diff --git a/frontend/src/scenes/notebooks/Notebook/MentionsExtension.tsx b/frontend/src/scenes/notebooks/Notebook/MentionsExtension.tsx
new file mode 100644
index 00000000000000..c6b90ee6a781b6
--- /dev/null
+++ b/frontend/src/scenes/notebooks/Notebook/MentionsExtension.tsx
@@ -0,0 +1,205 @@
+import { Extension } from '@tiptap/core'
+import Suggestion from '@tiptap/suggestion'
+
+import { ReactRenderer } from '@tiptap/react'
+import { LemonButton, ProfilePicture } from '@posthog/lemon-ui'
+import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react'
+import { EditorRange } from './utils'
+import { Popover } from 'lib/lemon-ui/Popover'
+import Fuse from 'fuse.js'
+import { useValues } from 'kea'
+import { notebookLogic } from './notebookLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
+import { NotebookNodeType, OrganizationMemberType } from '~/types'
+import { PluginKey } from '@tiptap/pm/state'
+
+type MentionsProps = {
+    range: EditorRange
+    query?: string
+    decorationNode?: any
+    onClose?: () => void
+}
+
+type MentionsPopoverProps = MentionsProps & {
+    visible: boolean
+    children?: JSX.Element
+}
+
+type MentionsRef = {
+    onKeyDown: (event: KeyboardEvent) => boolean
+}
+
+export const Mentions = forwardRef<MentionsRef, MentionsProps>(function SlashCommands(
+    { range, onClose, query }: MentionsProps,
+    ref
+): JSX.Element | null {
+    const { editor } = useValues(notebookLogic)
+    const { meFirstMembers } = useValues(membersLogic)
+
+    // We start with 1 because the first item is the text controls
+    const [selectedIndex, setSelectedIndex] = useState(0)
+    const [selectedHorizontalIndex, setSelectedHorizontalIndex] = useState(0)
+
+    const fuse = useMemo(() => {
+        return new Fuse(meFirstMembers, {
+            keys: ['id', 'user.email', 'user.first_name', 'user.last_name'],
+            threshold: 0.3,
+        })
+    }, [meFirstMembers])
+
+    const filteredMembers = useMemo(() => {
+        if (!query) {
+            return meFirstMembers
+        }
+        return fuse.search(query).map((result) => result.item)
+    }, [query, fuse])
+
+    useEffect(() => {
+        setSelectedIndex(0)
+        setSelectedHorizontalIndex(0)
+    }, [query])
+
+    const execute = async (member: OrganizationMemberType): Promise<void> => {
+        if (editor) {
+            editor
+                .deleteRange(range)
+                .insertContentAt(range.from, [
+                    {
+                        type: NotebookNodeType.Mention,
+                        attrs: {
+                            id: member.user.id,
+                        },
+                    },
+                ])
+                .run()
+
+            onClose?.()
+        }
+    }
+
+    const onPressEnter = async (): Promise<void> => {
+        const member = filteredMembers[selectedIndex]
+        await execute(member)
+    }
+    const onPressUp = (): void => {
+        setSelectedIndex(Math.max(selectedIndex - 1, -1))
+    }
+    const onPressDown = (): void => {
+        setSelectedIndex(Math.min(selectedIndex + 1, filteredMembers.length - 1))
+    }
+
+    const onKeyDown = useCallback(
+        (event: KeyboardEvent): boolean => {
+            const keyMappings = {
+                ArrowUp: onPressUp,
+                ArrowDown: onPressDown,
+                Enter: onPressEnter,
+            }
+
+            if (keyMappings[event.key]) {
+                keyMappings[event.key]()
+                return true
+            }
+
+            return false
+        },
+        [selectedIndex, selectedHorizontalIndex, filteredMembers]
+    )
+
+    // Expose the keydown handler to the tiptap extension
+    useImperativeHandle(ref, () => ({ onKeyDown }), [onKeyDown])
+
+    if (!editor) {
+        return null
+    }
+
+    return (
+        <div className="space-y-px">
+            {filteredMembers.map((member, index) => (
+                <LemonButton
+                    key={member.id}
+                    fullWidth
+                    status="primary-alt"
+                    icon={<ProfilePicture name={member.user.first_name} email={member.user.email} size="sm" />}
+                    active={index === selectedIndex}
+                    onClick={async () => await execute(member)}
+                >
+                    {`${member.user.first_name} <${member.user.email}>`}
+                </LemonButton>
+            ))}
+
+            {filteredMembers.length === 0 && (
+                <div className="text-muted-alt p-1">
+                    No member matching <code>@{query}</code>
+                </div>
+            )}
+        </div>
+    )
+})
+
+const MentionsPopover = forwardRef<MentionsRef, MentionsPopoverProps>(function MentionsPopover(
+    { visible = true, decorationNode, children, onClose, ...props }: MentionsPopoverProps,
+    ref
+): JSX.Element | null {
+    return (
+        <Popover
+            placement="bottom-start"
+            fallbackPlacements={['top-start', 'right-start']}
+            overlay={<Mentions ref={ref} onClose={onClose} {...props} />}
+            referenceElement={decorationNode}
+            visible={visible}
+            onClickOutside={onClose}
+        >
+            {children}
+        </Popover>
+    )
+})
+
+const MentionsPluginKey = new PluginKey('mentions')
+
+export const MentionsExtension = Extension.create({
+    name: 'mentions',
+
+    addProseMirrorPlugins() {
+        return [
+            Suggestion({
+                pluginKey: MentionsPluginKey,
+                editor: this.editor,
+                char: '@',
+                startOfLine: false,
+                render: () => {
+                    let renderer: ReactRenderer<MentionsRef>
+
+                    return {
+                        onStart: (props) => {
+                            renderer = new ReactRenderer(MentionsPopover, {
+                                props: props,
+                                editor: props.editor,
+                            })
+                        },
+
+                        onUpdate(props) {
+                            renderer.updateProps(props)
+
+                            if (!props.clientRect) {
+                                return
+                            }
+                        },
+
+                        onKeyDown(props) {
+                            if (props.event.key === 'Escape') {
+                                renderer.destroy()
+                                return true
+                            }
+                            return renderer.ref?.onKeyDown(props.event) ?? false
+                        },
+
+                        onExit() {
+                            renderer.destroy()
+                        },
+                    }
+                },
+            }),
+        ]
+    },
+})
diff --git a/frontend/src/scenes/notebooks/Notebook/Notebook.scss b/frontend/src/scenes/notebooks/Notebook/Notebook.scss
index 14016df49ed7ef..cd63e10b35fbe6 100644
--- a/frontend/src/scenes/notebooks/Notebook/Notebook.scss
+++ b/frontend/src/scenes/notebooks/Notebook/Notebook.scss
@@ -253,6 +253,11 @@
         max-height: 22px;
     }
 
+    .NotebookMention {
+        display: inline-flex;
+        max-height: 22px;
+    }
+
     // overriding ::selection is necessary here because
     // antd makes it invisible otherwise
     span::selection {
diff --git a/frontend/src/scenes/notebooks/Notebook/Notebook.stories.tsx b/frontend/src/scenes/notebooks/Notebook/Notebook.stories.tsx
index 44242519298047..6e00e37d2652ef 100644
--- a/frontend/src/scenes/notebooks/Notebook/Notebook.stories.tsx
+++ b/frontend/src/scenes/notebooks/Notebook/Notebook.stories.tsx
@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/react'
+import { Meta, StoryFn } from '@storybook/react'
 import { useEffect } from 'react'
 import { mswDecorator } from '~/mocks/browser'
 import { router } from 'kea-router'
@@ -347,63 +347,68 @@ const meta: Meta = {
     ],
 }
 export default meta
-export function NotebooksList(): JSX.Element {
+export const NotebooksList: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebooks())
     }, [])
     return <App />
 }
 
-export function Headings(): JSX.Element {
+export const Headings: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('headings'))
     }, [])
     return <App />
 }
 
-export function TextFormats(): JSX.Element {
+export const TextFormats: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('text-formats'))
     }, [])
     return <App />
 }
 
-export function NumberedList(): JSX.Element {
+export const NumberedList: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('numbered-list'))
     }, [])
     return <App />
 }
 
-export function BulletList(): JSX.Element {
+export const BulletList: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('bullet-list'))
     }, [])
     return <App />
 }
 
-export function RecordingsPlaylist(): JSX.Element {
+export const RecordingsPlaylist: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('recordings-playlist'))
     }, [])
     return <App />
 }
+RecordingsPlaylist.parameters = {
+    testOptions: {
+        waitForSelector: '.NotebookNode__content', // All stories with widget-style nodes needs this
+    },
+}
 
-export function TextOnlyNotebook(): JSX.Element {
+export const TextOnlyNotebook: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('12345'))
     }, [])
     return <App />
 }
 
-export function EmptyNotebook(): JSX.Element {
+export const EmptyNotebook: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('empty'))
     }, [])
     return <App />
 }
 
-export function NotebookNotFound(): JSX.Element {
+export const NotebookNotFound: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.notebook('abcde'))
     }, [])
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
index 97313393db0a81..e87521c26ad87e 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
@@ -38,6 +38,7 @@ export type NotebookLogicMode = 'notebook' | 'canvas'
 export type NotebookLogicProps = {
     shortId: string
     mode?: NotebookLogicMode
+    target?: NotebookTarget
 }
 
 async function runWhenEditorIsReady(waitForEditor: () => boolean, fn: () => any): Promise<any> {
@@ -212,12 +213,18 @@ export const notebookLogic = kea<notebookLogicType>([
                     } else if (props.shortId.startsWith('template-')) {
                         response =
                             values.notebookTemplates.find((template) => template.short_id === props.shortId) || null
+                        if (!response) {
+                            return null
+                        }
                     } else {
-                        response = await api.notebooks.get(props.shortId)
-                    }
-
-                    if (!response) {
-                        throw new Error('Notebook not found')
+                        try {
+                            response = await api.notebooks.get(props.shortId)
+                        } catch (e: any) {
+                            if (e.status === 404) {
+                                return null
+                            }
+                            throw e
+                        }
                     }
 
                     const notebook = migrate(response)
@@ -293,7 +300,7 @@ export const notebookLogic = kea<notebookLogicType>([
                         actions.clearLocalContent()
                     }
 
-                    await openNotebook(response.short_id, NotebookTarget.Auto)
+                    await openNotebook(response.short_id, props.target ?? NotebookTarget.Scene)
 
                     return response
                 },
diff --git a/frontend/src/scenes/notebooks/Notebook/utils.ts b/frontend/src/scenes/notebooks/Notebook/utils.ts
index 1ff8085507c5fb..bb3eda4bce1c43 100644
--- a/frontend/src/scenes/notebooks/Notebook/utils.ts
+++ b/frontend/src/scenes/notebooks/Notebook/utils.ts
@@ -164,6 +164,7 @@ export const textContent = (node: any): string => {
         'ph-person-feed': customOrTitleSerializer,
         'ph-properties': customOrTitleSerializer,
         'ph-map': customOrTitleSerializer,
+        'ph-mention': customOrTitleSerializer,
     }
 
     return getText(node, {
diff --git a/frontend/src/scenes/notebooks/NotebookMenu.tsx b/frontend/src/scenes/notebooks/NotebookMenu.tsx
new file mode 100644
index 00000000000000..ea307f726c8b94
--- /dev/null
+++ b/frontend/src/scenes/notebooks/NotebookMenu.tsx
@@ -0,0 +1,55 @@
+import { useActions, useValues } from 'kea'
+import { NotebookLogicProps, notebookLogic } from './Notebook/notebookLogic'
+import { LemonButton } from '@posthog/lemon-ui'
+import { IconDelete, IconEllipsis, IconExport, IconNotification, IconShare } from 'lib/lemon-ui/icons'
+import { LemonMenu } from 'lib/lemon-ui/LemonMenu'
+import { notebooksModel } from '~/models/notebooksModel'
+import { router } from 'kea-router'
+import { urls } from 'scenes/urls'
+import './NotebookScene.scss'
+import { openNotebookShareDialog } from './Notebook/NotebookShare'
+
+export function NotebookMenu({ shortId }: NotebookLogicProps): JSX.Element {
+    const { notebook, showHistory, isLocalOnly } = useValues(notebookLogic({ shortId }))
+    const { exportJSON, setShowHistory } = useActions(notebookLogic({ shortId }))
+
+    return (
+        <LemonMenu
+            items={[
+                {
+                    items: [
+                        {
+                            label: 'Export JSON',
+                            icon: <IconExport />,
+                            onClick: () => exportJSON(),
+                        },
+                        {
+                            label: 'History',
+                            icon: <IconNotification />,
+                            onClick: () => setShowHistory(!showHistory),
+                        },
+                        !isLocalOnly && {
+                            label: 'Share',
+                            icon: <IconShare />,
+                            onClick: () => openNotebookShareDialog({ shortId }),
+                        },
+                        !isLocalOnly &&
+                            !notebook?.is_template && {
+                                label: 'Delete',
+                                icon: <IconDelete />,
+                                status: 'danger',
+
+                                onClick: () => {
+                                    notebooksModel.actions.deleteNotebook(shortId, notebook?.title)
+                                    router.actions.push(urls.notebooks())
+                                },
+                            },
+                    ],
+                },
+            ]}
+            actionable
+        >
+            <LemonButton aria-label="more" icon={<IconEllipsis />} status="stealth" size="small" />
+        </LemonMenu>
+    )
+}
diff --git a/frontend/src/scenes/notebooks/NotebookPanel/NotebookPanel.tsx b/frontend/src/scenes/notebooks/NotebookPanel/NotebookPanel.tsx
index d2a49064c8dfa5..c1bd1fae46a14d 100644
--- a/frontend/src/scenes/notebooks/NotebookPanel/NotebookPanel.tsx
+++ b/frontend/src/scenes/notebooks/NotebookPanel/NotebookPanel.tsx
@@ -2,21 +2,22 @@ import { useActions, useValues } from 'kea'
 import './NotebookPanel.scss'
 import { Notebook } from '../Notebook/Notebook'
 import { LemonButton } from '@posthog/lemon-ui'
-import { IconOpenInNew, IconShare } from 'lib/lemon-ui/icons'
+import { IconOpenInNew } from 'lib/lemon-ui/icons'
 import { useMemo } from 'react'
 import { NotebookListMini } from '../Notebook/NotebookListMini'
 import { NotebookExpandButton, NotebookSyncInfo } from '../Notebook/NotebookMeta'
 import { notebookLogic } from '../Notebook/notebookLogic'
 import { useResizeBreakpoints } from 'lib/hooks/useResizeObserver'
-import { openNotebookShareDialog } from '../Notebook/NotebookShare'
 import { notebookPanelLogic } from './notebookPanelLogic'
 import { NotebookPanelDropzone } from './NotebookPanelDropzone'
 import { urls } from 'scenes/urls'
+import { NotebookMenu } from '../NotebookMenu'
+import { NotebookTarget } from '~/types'
 
 export function NotebookPanel(): JSX.Element | null {
     const { selectedNotebook, initialAutofocus, droppedResource, dropProperties } = useValues(notebookPanelLogic)
     const { selectNotebook, closeSidePanel } = useActions(notebookPanelLogic)
-    const { notebook } = useValues(notebookLogic({ shortId: selectedNotebook }))
+    const { notebook } = useValues(notebookLogic({ shortId: selectedNotebook, target: NotebookTarget.Popover }))
     const editable = !notebook?.is_template
 
     const { ref, size } = useResizeBreakpoints({
@@ -52,16 +53,9 @@ export function NotebookPanel(): JSX.Element | null {
                                 tooltipPlacement="left"
                             />
 
-                            <LemonButton
-                                size="small"
-                                onClick={() => openNotebookShareDialog({ shortId: selectedNotebook })}
-                                status="primary-alt"
-                                icon={<IconShare />}
-                                tooltip="Share notebook"
-                                tooltipPlacement="left"
-                            />
-
                             {contentWidthHasEffect && <NotebookExpandButton status="primary-alt" size="small" />}
+
+                            <NotebookMenu shortId={selectedNotebook} />
                         </span>
                     </header>
 
diff --git a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
index 55c348a66ddd21..0f18ce5290ecec 100644
--- a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
@@ -4,24 +4,29 @@ import { HTMLProps } from 'react'
 import { EditorFocusPosition } from '../Notebook/utils'
 
 import type { notebookPanelLogicType } from './notebookPanelLogicType'
-import { NotebookNodeResource } from '~/types'
-import { SidePanelTab, sidePanelLogic } from '~/layout/navigation-3000/sidepanel/sidePanelLogic'
+import { NotebookNodeResource, SidePanelTab } from '~/types'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { notebookPopoverLogic } from './notebookPopoverLogic'
+import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 
 export const notebookPanelLogic = kea<notebookPanelLogicType>([
     path(['scenes', 'notebooks', 'Notebook', 'notebookPanelLogic']),
     connect({
         values: [
-            sidePanelLogic,
+            sidePanelStateLogic,
             ['sidePanelOpen', 'selectedTab'],
             featureFlagLogic,
             ['featureFlags'],
             notebookPopoverLogic,
             ['popoverVisibility'],
         ],
-        actions: [sidePanelLogic, ['openSidePanel', 'closeSidePanel'], notebookPopoverLogic, ['setPopoverVisibility']],
+        actions: [
+            sidePanelStateLogic,
+            ['openSidePanel', 'closeSidePanel'],
+            notebookPopoverLogic,
+            ['setPopoverVisibility'],
+        ],
     }),
     actions({
         selectNotebook: (id: string, autofocus: EditorFocusPosition | undefined = undefined) => ({ id, autofocus }),
diff --git a/frontend/src/scenes/notebooks/NotebookScene.tsx b/frontend/src/scenes/notebooks/NotebookScene.tsx
index 64e21c6c244107..a6a4ad229270f2 100644
--- a/frontend/src/scenes/notebooks/NotebookScene.tsx
+++ b/frontend/src/scenes/notebooks/NotebookScene.tsx
@@ -7,26 +7,15 @@ import { NotebookSceneLogicProps, notebookSceneLogic } from './notebookSceneLogi
 import { LemonButton, LemonTag } from '@posthog/lemon-ui'
 import { NotebookExpandButton, NotebookSyncInfo } from './Notebook/NotebookMeta'
 import { UserActivityIndicator } from 'lib/components/UserActivityIndicator/UserActivityIndicator'
-import {
-    IconArrowRight,
-    IconDelete,
-    IconEllipsis,
-    IconExport,
-    IconHelpOutline,
-    IconNotification,
-    IconShare,
-} from 'lib/lemon-ui/icons'
-import { LemonMenu } from 'lib/lemon-ui/LemonMenu'
-import { notebooksModel } from '~/models/notebooksModel'
-import { router } from 'kea-router'
-import { urls } from 'scenes/urls'
+import { IconArrowRight, IconHelpOutline } from 'lib/lemon-ui/icons'
 import { LOCAL_NOTEBOOK_TEMPLATES } from './NotebookTemplates/notebookTemplates'
 import './NotebookScene.scss'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { NotebookLoadingState } from './Notebook/NotebookLoadingState'
-import { openNotebookShareDialog } from './Notebook/NotebookShare'
 import { notebookPanelLogic } from './NotebookPanel/notebookPanelLogic'
+import { NotebookMenu } from './NotebookMenu'
+import { NotebookTarget } from '~/types'
 
 interface NotebookSceneProps {
     shortId?: string
@@ -42,8 +31,9 @@ export const scene: SceneExport = {
 
 export function NotebookScene(): JSX.Element {
     const { notebookId, loading } = useValues(notebookSceneLogic)
-    const { notebook, conflictWarningVisible, showHistory } = useValues(notebookLogic({ shortId: notebookId }))
-    const { exportJSON, setShowHistory } = useActions(notebookLogic({ shortId: notebookId }))
+    const { notebook, conflictWarningVisible } = useValues(
+        notebookLogic({ shortId: notebookId, target: NotebookTarget.Scene })
+    )
     const { selectNotebook, closeSidePanel } = useActions(notebookPanelLogic)
     const { selectedNotebook, visibility } = useValues(notebookPanelLogic)
 
@@ -90,42 +80,8 @@ export function NotebookScene(): JSX.Element {
                 <div className="flex gap-2 items-center">
                     <NotebookSyncInfo shortId={notebookId} />
 
-                    <LemonMenu
-                        items={[
-                            {
-                                items: [
-                                    {
-                                        label: 'Export JSON',
-                                        icon: <IconExport />,
-                                        onClick: () => exportJSON(),
-                                    },
-                                    {
-                                        label: 'History',
-                                        icon: <IconNotification />,
-                                        onClick: () => setShowHistory(!showHistory),
-                                    },
-                                    {
-                                        label: 'Share',
-                                        icon: <IconShare />,
-                                        onClick: () => openNotebookShareDialog({ shortId: notebookId }),
-                                    },
-                                    !isTemplate && {
-                                        label: 'Delete',
-                                        icon: <IconDelete />,
-                                        status: 'danger',
+                    <NotebookMenu shortId={notebookId} />
 
-                                        onClick: () => {
-                                            notebooksModel.actions.deleteNotebook(notebookId, notebook?.title)
-                                            router.actions.push(urls.notebooks())
-                                        },
-                                    },
-                                ],
-                            },
-                        ]}
-                        actionable
-                    >
-                        <LemonButton aria-label="more" icon={<IconEllipsis />} status="stealth" size="small" />
-                    </LemonMenu>
                     <LemonButton
                         type="secondary"
                         icon={<IconHelpOutline />}
diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx b/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
index 29493464d77607..d240cf1179a531 100644
--- a/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
+++ b/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
@@ -99,8 +99,8 @@ export function NotebookSelectList(props: NotebookSelectProps): JSX.Element {
         const title = newNotebookTitle ?? `Notes ${dayjs().format('DD/MM')}`
 
         createNotebook(
-            title,
             NotebookTarget.Popover,
+            title,
             notebookResource ? [notebookResource] : undefined,
             (theNotebookLogic) => {
                 props.onNotebookOpened?.(theNotebookLogic)
diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts b/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
index 15f13b70f41414..ed446007c031dd 100644
--- a/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
@@ -1,6 +1,6 @@
 import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
-import { NotebookListItemType, NotebookNodeResource } from '~/types'
+import { NotebookListItemType, NotebookNodeResource, NotebookNodeType } from '~/types'
 
 import api from 'lib/api'
 
@@ -52,7 +52,7 @@ export const notebookSelectButtonLogic = kea<notebookSelectButtonLogicType>([
             [] as NotebookListItemType[],
             {
                 loadAllNotebooks: async (_, breakpoint) => {
-                    breakpoint(100)
+                    await breakpoint(100)
                     const response = await api.notebooks.list(undefined, undefined, values.searchQuery ?? undefined)
                     // TODO for simplicity we'll assume the results will fit into one page
                     return response.results
@@ -63,13 +63,23 @@ export const notebookSelectButtonLogic = kea<notebookSelectButtonLogicType>([
             [] as NotebookListItemType[],
             {
                 loadNotebooksContainingResource: async (_, breakpoint) => {
-                    breakpoint(100)
+                    await breakpoint(100)
                     if (!props.resource) {
                         return []
                     }
                     const response = await api.notebooks.list(
                         props.resource && typeof props.resource !== 'boolean'
-                            ? [{ type: props.resource.type, attrs: { id: props.resource.attrs?.id } }]
+                            ? [
+                                  {
+                                      type: props.resource.type,
+                                      attrs: {
+                                          id:
+                                              props.resource.type === NotebookNodeType.Query
+                                                  ? props.resource.attrs.query.shortId
+                                                  : props.resource.attrs.id,
+                                      },
+                                  },
+                              ]
                             : undefined,
                         undefined,
                         values.searchQuery ?? undefined
diff --git a/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx b/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx
index 258e2cc92d5528..32f2d246a3bec2 100644
--- a/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx
+++ b/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx
@@ -4,7 +4,11 @@ import { NotebooksListFilters } from 'scenes/notebooks/NotebooksTable/notebooksT
 
 export const fromNodeTypeToLabel: Omit<
     Record<NotebookNodeType, string>,
-    NotebookNodeType.Backlink | NotebookNodeType.PersonFeed | NotebookNodeType.Properties | NotebookNodeType.Map
+    | NotebookNodeType.Backlink
+    | NotebookNodeType.PersonFeed
+    | NotebookNodeType.Properties
+    | NotebookNodeType.Map
+    | NotebookNodeType.Mention
 > = {
     [NotebookNodeType.FeatureFlag]: 'Feature flags',
     [NotebookNodeType.FeatureFlagCodeExample]: 'Feature flag Code Examples',
diff --git a/frontend/src/scenes/notebooks/NotebooksTable/NotebooksTable.tsx b/frontend/src/scenes/notebooks/NotebooksTable/NotebooksTable.tsx
index c85b9b102cfff4..169fb46aeced8e 100644
--- a/frontend/src/scenes/notebooks/NotebooksTable/NotebooksTable.tsx
+++ b/frontend/src/scenes/notebooks/NotebooksTable/NotebooksTable.tsx
@@ -10,7 +10,7 @@ import { useEffect } from 'react'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonMenu } from 'lib/lemon-ui/LemonMenu'
 import { IconDelete, IconEllipsis } from 'lib/lemon-ui/icons'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { ContainsTypeFilters } from 'scenes/notebooks/NotebooksTable/ContainsTypeFilter'
 import { DEFAULT_FILTERS, notebooksTableLogic } from 'scenes/notebooks/NotebooksTable/notebooksTableLogic'
 import { notebookPanelLogic } from '../NotebookPanel/notebookPanelLogic'
@@ -97,7 +97,7 @@ export function NotebooksTable(): JSX.Element {
                 dismissKey="notebooks-preview-banner"
             >
                 <b>Welcome to Notebooks</b> - a great way to bring Insights, Replays, Feature Flags and many more
-                PostHog prodcuts together into one place.
+                PostHog products together into one place.
             </LemonBanner>
             <div className="flex justify-between gap-2 flex-wrap">
                 <LemonInput
diff --git a/frontend/src/scenes/notebooks/Suggestions/FloatingSuggestions.scss b/frontend/src/scenes/notebooks/Suggestions/FloatingSuggestions.scss
index 83df28aa2bec62..bc4d9791e78ffe 100644
--- a/frontend/src/scenes/notebooks/Suggestions/FloatingSuggestions.scss
+++ b/frontend/src/scenes/notebooks/Suggestions/FloatingSuggestions.scss
@@ -7,13 +7,4 @@
     z-index: var(--z-popover);
     position: absolute;
     left: 0;
-
-    .NotebookFloatingButton__plus {
-        border-radius: 1rem;
-        min-width: 2rem;
-
-        .LemonButton__icon {
-            margin: 0 auto;
-        }
-    }
 }
diff --git a/frontend/src/scenes/notebooks/Suggestions/SlashCommands.tsx b/frontend/src/scenes/notebooks/Suggestions/SlashCommands.tsx
index 46c28b2feafce3..707bb1e46b90fb 100644
--- a/frontend/src/scenes/notebooks/Suggestions/SlashCommands.tsx
+++ b/frontend/src/scenes/notebooks/Suggestions/SlashCommands.tsx
@@ -19,12 +19,7 @@ const Component = ({ editor }: InsertionSuggestionViewProps): JSX.Element => {
             getPos={editor?.getCurrentPosition}
             onClose={() => setVisible(false)}
         >
-            <LemonButton
-                size="small"
-                icon={<IconPlus />}
-                className="NotebookFloatingButton__plus ml-1"
-                onClick={onClick}
-            />
+            <LemonButton size="xsmall" icon={<IconPlus />} onClick={onClick} />
         </SlashCommandsPopover>
     )
 }
diff --git a/frontend/src/scenes/notebooks/notebookSceneLogic.ts b/frontend/src/scenes/notebooks/notebookSceneLogic.ts
index e7659c203c5d08..2d8656ddd5447f 100644
--- a/frontend/src/scenes/notebooks/notebookSceneLogic.ts
+++ b/frontend/src/scenes/notebooks/notebookSceneLogic.ts
@@ -1,5 +1,5 @@
 import { afterMount, connect, kea, key, path, props, selectors } from 'kea'
-import { Breadcrumb } from '~/types'
+import { Breadcrumb, NotebookTarget } from '~/types'
 
 import type { notebookSceneLogicType } from './notebookSceneLogicType'
 import { notebookLogic } from './Notebook/notebookLogic'
@@ -41,7 +41,7 @@ export const notebookSceneLogic = kea<notebookSceneLogicType>([
 
     afterMount(({ actions, props }) => {
         if (props.shortId === 'new') {
-            actions.createNotebook()
+            actions.createNotebook(NotebookTarget.Scene)
         } else {
             actions.loadNotebook()
         }
diff --git a/frontend/src/scenes/organization/Settings/index.tsx b/frontend/src/scenes/organization/Settings/index.tsx
deleted file mode 100644
index f37152a173da08..00000000000000
--- a/frontend/src/scenes/organization/Settings/index.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { actionToUrl, urlToAction } from 'kea-router'
-import { useState } from 'react'
-import { PageHeader } from 'lib/components/PageHeader'
-import { Invites } from './Invites'
-import { Members } from './Members'
-import { organizationLogic } from '../../organizationLogic'
-import { kea, useActions, useValues, path, actions, reducers } from 'kea'
-import { DangerZone } from './DangerZone'
-import { RestrictedArea, RestrictedComponentProps } from 'lib/components/RestrictedArea'
-import { FEATURE_FLAGS, OrganizationMembershipLevel } from 'lib/constants'
-import { userLogic } from 'scenes/userLogic'
-import { SceneExport } from 'scenes/sceneTypes'
-import { useAnchor } from 'lib/hooks/useAnchor'
-import { VerifiedDomains } from './VerifiedDomains/VerifiedDomains'
-import { LemonButton, LemonDivider, LemonInput, LemonSwitch } from '@posthog/lemon-ui'
-import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
-import { AvailableFeature } from '~/types'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { urls } from 'scenes/urls'
-import type { organizationSettingsTabsLogicType } from './indexType'
-import { PermissionsGrid } from './Permissions/PermissionsGrid'
-import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
-
-export const scene: SceneExport = {
-    component: OrganizationSettings,
-    logic: organizationLogic,
-}
-
-export enum OrganizationSettingsTabs {
-    GENERAL = 'general',
-    ROLE_BASED_ACCESS = 'role_based_access',
-}
-
-function DisplayName({ isRestricted }: RestrictedComponentProps): JSX.Element {
-    const { currentOrganization, currentOrganizationLoading } = useValues(organizationLogic)
-    const { updateOrganization } = useActions(organizationLogic)
-
-    const [name, setName] = useState(currentOrganization?.name || '')
-
-    return (
-        <div className="max-w-160">
-            <h2 id="name" className="subtitle mt-0">
-                Display Name
-            </h2>
-            <LemonInput className="mb-4" value={name} onChange={setName} disabled={isRestricted} />
-            <LemonButton
-                type="primary"
-                onClick={(e) => {
-                    e.preventDefault()
-                    updateOrganization({ name })
-                }}
-                disabled={isRestricted || !name || !currentOrganization || name === currentOrganization.name}
-                loading={currentOrganizationLoading}
-            >
-                Rename Organization
-            </LemonButton>
-        </div>
-    )
-}
-
-function EmailPreferences({ isRestricted }: RestrictedComponentProps): JSX.Element {
-    const { currentOrganization } = useValues(organizationLogic)
-    const { updateOrganization } = useActions(organizationLogic)
-
-    return (
-        <div>
-            <h2 id="notification-preferences" className="subtitle">
-                Notification Preferences
-            </h2>
-            <div>
-                <LemonSwitch
-                    data-attr="is-member-join-email-enabled-switch"
-                    onChange={(checked) => {
-                        updateOrganization({ is_member_join_email_enabled: checked })
-                    }}
-                    checked={!!currentOrganization?.is_member_join_email_enabled}
-                    disabled={isRestricted || !currentOrganization}
-                    label="Email all current members when a new member joins"
-                    bordered
-                />
-            </div>
-        </div>
-    )
-}
-
-const organizationSettingsTabsLogic = kea<organizationSettingsTabsLogicType>([
-    path(['scenes', 'organization', 'Settings', 'index']),
-    actions({
-        setTab: (tab: OrganizationSettingsTabs) => ({ tab }),
-    }),
-    reducers({
-        tab: [
-            OrganizationSettingsTabs.GENERAL as OrganizationSettingsTabs,
-            {
-                setTab: (_, { tab }) => tab,
-            },
-        ],
-    }),
-    actionToUrl(() => ({
-        setTab: ({ tab }) => `${urls.organizationSettings()}?tab=${tab}`,
-    })),
-    urlToAction(({ values, actions }) => ({
-        [urls.organizationSettings()]: (_, searchParams) => {
-            if (searchParams['tab'] && values.tab !== searchParams['tab']) {
-                actions.setTab(searchParams['tab'])
-            }
-        },
-    })),
-])
-
-export function OrganizationSettings(): JSX.Element {
-    const { user } = useValues(userLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
-    useAnchor(location.hash)
-    const { tab } = useValues(organizationSettingsTabsLogic)
-    const { setTab } = useActions(organizationSettingsTabsLogic)
-
-    const tabs = [
-        {
-            key: OrganizationSettingsTabs.GENERAL,
-            label: 'General',
-            content: (
-                <div className="border rounded p-6">
-                    <RestrictedArea Component={DisplayName} minimumAccessLevel={OrganizationMembershipLevel.Admin} />
-                    <LemonDivider className="my-6" />
-                    <Invites />
-                    <LemonDivider className="my-6" />
-                    {user && <Members user={user} />}
-                    <LemonDivider className="my-6" />
-                    <RestrictedArea
-                        Component={VerifiedDomains}
-                        minimumAccessLevel={OrganizationMembershipLevel.Admin}
-                    />
-                    <LemonDivider className="my-6" />
-                    <RestrictedArea
-                        Component={EmailPreferences}
-                        minimumAccessLevel={OrganizationMembershipLevel.Admin}
-                    />
-                    <LemonDivider className="my-6" />
-                    <RestrictedArea Component={DangerZone} minimumAccessLevel={OrganizationMembershipLevel.Owner} />
-                </div>
-            ),
-        },
-    ]
-
-    if (featureFlags[FEATURE_FLAGS.ROLE_BASED_ACCESS]) {
-        tabs.push({
-            key: OrganizationSettingsTabs.ROLE_BASED_ACCESS,
-            label: 'Role-based access',
-            content: (
-                <PayGateMini feature={AvailableFeature.ROLE_BASED_ACCESS}>
-                    <RestrictedArea
-                        Component={PermissionsGrid}
-                        minimumAccessLevel={OrganizationMembershipLevel.Admin}
-                    />
-                </PayGateMini>
-            ),
-        })
-    }
-
-    return (
-        <>
-            <PageHeader
-                title="Organization Settings"
-                caption="View and manage your organization here. Build an even better product together."
-            />
-
-            <LemonTabs activeKey={tab} onChange={setTab} tabs={tabs} />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/organization/TeamMembers/index.tsx b/frontend/src/scenes/organization/TeamMembers/index.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/frontend/src/scenes/organization/Settings/membersLogic.tsx b/frontend/src/scenes/organization/membersLogic.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/membersLogic.tsx
rename to frontend/src/scenes/organization/membersLogic.tsx
diff --git a/frontend/src/scenes/persons-management/PersonsManagementScene.tsx b/frontend/src/scenes/persons-management/PersonsManagementScene.tsx
new file mode 100644
index 00000000000000..e5faa171d4b33d
--- /dev/null
+++ b/frontend/src/scenes/persons-management/PersonsManagementScene.tsx
@@ -0,0 +1,39 @@
+import { useActions, useValues } from 'kea'
+import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
+
+import { groupsModel } from '~/models/groupsModel'
+import { PageHeader } from 'lib/components/PageHeader'
+import { personsManagementSceneLogic } from './personsManagementSceneLogic'
+import { SceneExport } from 'scenes/sceneTypes'
+
+export function PersonsManagementScene(): JSX.Element {
+    const { tabs, activeTab, tabKey } = useValues(personsManagementSceneLogic)
+    const { setTabKey } = useActions(personsManagementSceneLogic)
+    const { showGroupsOptions } = useValues(groupsModel)
+
+    const lemonTabs: LemonTab<string>[] = tabs.map((tab) => ({
+        key: tab.key,
+        label: <span data-attr={`persons-management-${tab.key}-tab`}>{tab.label}</span>,
+        content: tab.content,
+    }))
+
+    return (
+        <>
+            <PageHeader
+                title="People"
+                caption={`A catalog of your product's end users, lists of users who have something in common to use in analytics or feature flags${
+                    showGroupsOptions ? ' and groups' : ''
+                }.`}
+                buttons={activeTab?.buttons}
+                tabbedPage
+            />
+
+            <LemonTabs activeKey={tabKey} onChange={(t) => setTabKey(t)} tabs={lemonTabs} />
+        </>
+    )
+}
+
+export const scene: SceneExport = {
+    component: PersonsManagementScene,
+    logic: personsManagementSceneLogic,
+}
diff --git a/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
new file mode 100644
index 00000000000000..0e1202affc14c6
--- /dev/null
+++ b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
@@ -0,0 +1,152 @@
+import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { actionToUrl, router, urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { LemonTab } from 'lib/lemon-ui/LemonTabs'
+import { Breadcrumb } from '~/types'
+import { capitalizeFirstLetter } from 'lib/utils'
+import { GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
+
+import { groupsModel } from '~/models/groupsModel'
+import { Persons } from './tabs/Persons'
+import { Cohorts } from 'scenes/cohorts/Cohorts'
+import { LemonButton } from '@posthog/lemon-ui'
+
+import type { personsManagementSceneLogicType } from './personsManagementSceneLogicType'
+import { Groups } from 'scenes/groups/Groups'
+
+export type PersonsManagementTab = {
+    key: string
+    url: string
+    label: string
+    content: any
+    buttons?: any
+}
+
+export type PersonsManagementTabs = Record<
+    string,
+    { url: string; label: LemonTab<any>['label']; content: any; buttons?: any }
+>
+
+export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>([
+    path(['scenes', 'persons-management', 'personsManagementSceneLogic']),
+    connect({
+        values: [groupsModel, ['aggregationLabel', 'groupTypes', 'groupsAccessStatus', 'aggregationLabel']],
+    }),
+    actions({
+        setTabKey: (tabKey: string) => ({ tabKey }),
+    }),
+    reducers({
+        tabKey: [
+            'persons' as string,
+            {
+                setTabKey: (_, { tabKey }) => tabKey,
+            },
+        ],
+    }),
+    selectors({
+        tabs: [
+            (s) => [s.groupTabs],
+            (groupTabs): PersonsManagementTab[] => {
+                return [
+                    {
+                        key: 'persons',
+                        url: urls.persons(),
+                        label: 'Persons',
+                        content: <Persons />,
+                    },
+                    {
+                        key: 'cohorts',
+                        url: urls.cohorts(),
+                        label: 'Cohorts',
+                        content: <Cohorts />,
+                        buttons: (
+                            <LemonButton
+                                type="primary"
+                                data-attr="new-cohort"
+                                onClick={() => router.actions.push(urls.cohort('new'))}
+                            >
+                                New Cohort
+                            </LemonButton>
+                        ),
+                    },
+                    ...groupTabs,
+                ]
+            },
+        ],
+
+        activeTab: [
+            (s) => [s.tabs, s.tabKey],
+            (tabs, tabKey): PersonsManagementTab | null => {
+                return tabs.find((x) => x.key === tabKey) ?? null
+            },
+        ],
+
+        groupTabs: [
+            (s) => [s.groupTypes, s.groupsAccessStatus, s.aggregationLabel],
+            (groupTypes, groupsAccessStatus, aggregationLabel): PersonsManagementTab[] => {
+                const showGroupsIntroductionPage = [
+                    GroupsAccessStatus.HasAccess,
+                    GroupsAccessStatus.HasGroupTypes,
+                    GroupsAccessStatus.NoAccess,
+                ].includes(groupsAccessStatus)
+
+                const groupTabs: PersonsManagementTab[] = [
+                    ...(showGroupsIntroductionPage
+                        ? [
+                              {
+                                  key: 'groups-intro',
+                                  label: 'Groups',
+                                  url: urls.groups(0),
+                                  content: <Groups groupTypeIndex={0} />,
+                              },
+                          ]
+                        : Array.from(groupTypes.values()).map((groupType) => ({
+                              key: `groups-${groupType.group_type_index}`,
+                              label: capitalizeFirstLetter(aggregationLabel(groupType.group_type_index).plural),
+                              url: urls.groups(groupType.group_type_index),
+                              content: <Groups groupTypeIndex={groupType.group_type_index} />,
+                          }))),
+                ]
+
+                return groupTabs
+            },
+        ],
+        breadcrumbs: [
+            (s) => [s.tabs, s.activeTab],
+            (tabs, activeTab): Breadcrumb[] => {
+                return [
+                    {
+                        name: `People`,
+                        path: tabs[0].url,
+                    },
+                    activeTab
+                        ? {
+                              name: activeTab.label,
+                              path: activeTab.url,
+                          }
+                        : {
+                              name: 'Loading...',
+                          },
+                ]
+            },
+        ],
+    }),
+    actionToUrl(({ values }) => ({
+        setTabKey: ({ tabKey }) => {
+            return values.tabs.find((x) => x.key === tabKey)?.url || values.tabs[0].url
+        },
+    })),
+    urlToAction(({ actions }) => {
+        return {
+            [urls.persons()]: () => {
+                actions.setTabKey('persons')
+            },
+            [urls.cohorts()]: () => {
+                actions.setTabKey('cohorts')
+            },
+            [urls.groups(':key')]: ({ key }) => {
+                actions.setTabKey(`groups-${key}`)
+            },
+        }
+    }),
+])
diff --git a/frontend/src/scenes/persons-management/tabs/Persons.tsx b/frontend/src/scenes/persons-management/tabs/Persons.tsx
new file mode 100644
index 00000000000000..15fb70d8f518fc
--- /dev/null
+++ b/frontend/src/scenes/persons-management/tabs/Persons.tsx
@@ -0,0 +1,14 @@
+import { useActions, useValues } from 'kea'
+import { personsSceneLogic } from 'scenes/persons-management/tabs/personsSceneLogic'
+import { Query } from '~/queries/Query/Query'
+
+export function Persons(): JSX.Element {
+    const { query } = useValues(personsSceneLogic)
+    const { setQuery } = useActions(personsSceneLogic)
+
+    return (
+        <>
+            <Query query={query} setQuery={setQuery} />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/persons/personsSceneLogic.ts b/frontend/src/scenes/persons-management/tabs/personsSceneLogic.ts
similarity index 50%
rename from frontend/src/scenes/persons/personsSceneLogic.ts
rename to frontend/src/scenes/persons-management/tabs/personsSceneLogic.ts
index 080f644d47a648..b1c5321c992537 100644
--- a/frontend/src/scenes/persons/personsSceneLogic.ts
+++ b/frontend/src/scenes/persons-management/tabs/personsSceneLogic.ts
@@ -1,11 +1,6 @@
 import { actions, connect, kea, path, reducers, selectors } from 'kea'
 
-import { actionToUrl, urlToAction } from 'kea-router'
-import equal from 'fast-deep-equal'
 import { DataTableNode, Node, NodeKind } from '~/queries/schema'
-import { urls } from 'scenes/urls'
-import { objectsEqual } from 'lib/utils'
-import { lemonToast } from 'lib/lemon-ui/lemonToast'
 
 import type { personsSceneLogicType } from './personsSceneLogicType'
 import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
@@ -39,34 +34,36 @@ export const personsSceneLogic = kea<personsSceneLogicType>([
         ],
     })),
 
-    actionToUrl(({ values }) => ({
-        setQuery: () => [
-            urls.persons(),
-            {},
-            objectsEqual(values.query, getDefaultQuery(values.queryFlagEnabled)) ? {} : { q: values.query },
-            { replace: true },
-        ],
-    })),
+    // NOTE: Temp disabled as it triggers a loop bug
 
-    urlToAction(({ actions, values }) => ({
-        [urls.persons()]: (_, __, { q: queryParam }): void => {
-            if (!equal(queryParam, values.query)) {
-                // nothing in the URL
-                if (!queryParam) {
-                    const defaultQuery = getDefaultQuery(values.queryFlagEnabled)
-                    // set the default unless it's already there
-                    if (!objectsEqual(values.query, defaultQuery)) {
-                        actions.setQuery(defaultQuery)
-                    }
-                } else {
-                    if (typeof queryParam === 'object') {
-                        actions.setQuery(queryParam)
-                    } else {
-                        lemonToast.error('Invalid query in URL')
-                        console.error({ queryParam })
-                    }
-                }
-            }
-        },
-    })),
+    // actionToUrl(({ values }) => ({
+    //     setQuery: () => [
+    //         urls.persons(),
+    //         {},
+    //         objectsEqual(values.query, getDefaultQuery(values.queryFlagEnabled)) ? {} : { q: values.query },
+    //         { replace: true },
+    //     ],
+    // })),
+
+    // urlToAction(({ actions, values }) => ({
+    //     [urls.persons()]: (_, __, { q: queryParam }): void => {
+    //         if (!equal(queryParam, values.query)) {
+    //             // nothing in the URL
+    //             if (!queryParam) {
+    //                 const defaultQuery = getDefaultQuery(values.queryFlagEnabled)
+    //                 // set the default unless it's already there
+    //                 if (!objectsEqual(values.query, defaultQuery)) {
+    //                     actions.setQuery(defaultQuery)
+    //                 }
+    //             } else {
+    //                 if (typeof queryParam === 'object') {
+    //                     actions.setQuery(queryParam)
+    //                 } else {
+    //                     lemonToast.error('Invalid query in URL')
+    //                     console.error({ queryParam })
+    //                 }
+    //             }
+    //         }
+    //     },
+    // })),
 ])
diff --git a/frontend/src/scenes/persons/NewPropertyComponent.tsx b/frontend/src/scenes/persons/NewPropertyComponent.tsx
index 7ab20d0e2b532d..ccef80b5060901 100644
--- a/frontend/src/scenes/persons/NewPropertyComponent.tsx
+++ b/frontend/src/scenes/persons/NewPropertyComponent.tsx
@@ -1,8 +1,10 @@
 import { useState } from 'react'
 import { Input, Radio } from 'antd'
-import { SaveOutlined, StopOutlined, CheckOutlined, CloseOutlined } from '@ant-design/icons'
+// eslint-disable-next-line no-restricted-imports
+import { SaveOutlined, StopOutlined, CheckOutlined } from '@ant-design/icons'
 import Modal from 'antd/lib/modal/Modal'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { IconClose } from 'lib/lemon-ui/icons'
 
 interface NewPropertyInterface {
     creating: boolean
@@ -100,7 +102,7 @@ export function NewPropertyComponent({ editProperty }: NewPropertyComponentProps
                                     <CheckOutlined /> True
                                 </Radio.Button>
                                 <Radio.Button value="false">
-                                    <CloseOutlined /> False
+                                    <IconClose /> False
                                 </Radio.Button>
                                 <Radio.Button value="null">
                                     <StopOutlined /> Null
diff --git a/frontend/src/scenes/persons/PersonPageHeader.tsx b/frontend/src/scenes/persons/PersonPageHeader.tsx
deleted file mode 100644
index 2bccf686a77631..00000000000000
--- a/frontend/src/scenes/persons/PersonPageHeader.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useValues } from 'kea'
-import { PageHeader } from 'lib/components/PageHeader'
-import { GroupsTabs } from 'scenes/groups/GroupsTabs'
-import { groupsModel } from '~/models/groupsModel'
-
-export function PersonPageHeader({ activeGroupTypeIndex }: { activeGroupTypeIndex: number }): JSX.Element {
-    const { showGroupsOptions } = useValues(groupsModel)
-
-    return (
-        <>
-            <PageHeader
-                title={`Persons${showGroupsOptions ? ' & Groups' : ''}`}
-                caption={`A catalog of your product's end users${showGroupsOptions ? ' and groups' : ''}.`}
-                tabbedPage
-            />
-            {showGroupsOptions && <GroupsTabs activeGroupTypeIndex={activeGroupTypeIndex} />}
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/PersonPreview.tsx b/frontend/src/scenes/persons/PersonPreview.tsx
index 7b9e61fe377aaa..b303e6a05ba92f 100644
--- a/frontend/src/scenes/persons/PersonPreview.tsx
+++ b/frontend/src/scenes/persons/PersonPreview.tsx
@@ -43,10 +43,8 @@ export function PersonPreview(props: PersonPreviewProps): JSX.Element | null {
 
                 <NotebookSelectButton
                     resource={{
-                        attrs: {
-                            id: person?.distinct_ids[0],
-                        },
                         type: NotebookNodeType.Person,
+                        attrs: { id: person?.distinct_ids[0] },
                     }}
                     onNotebookOpened={() => props.onClose?.()}
                     size="small"
diff --git a/frontend/src/scenes/persons/Persons.scss b/frontend/src/scenes/persons/PersonScene.scss
similarity index 100%
rename from frontend/src/scenes/persons/Persons.scss
rename to frontend/src/scenes/persons/PersonScene.scss
diff --git a/frontend/src/scenes/persons/PersonScene.tsx b/frontend/src/scenes/persons/PersonScene.tsx
index bce2a2b72d130d..6459e73dab82ef 100644
--- a/frontend/src/scenes/persons/PersonScene.tsx
+++ b/frontend/src/scenes/persons/PersonScene.tsx
@@ -1,9 +1,10 @@
-import { Dropdown, Menu, Tag } from 'antd'
+import { Dropdown, Menu } from 'antd'
+// eslint-disable-next-line no-restricted-imports
 import { DownOutlined } from '@ant-design/icons'
 import { useActions, useValues } from 'kea'
 import { personsLogic } from './personsLogic'
 import { PersonDisplay } from './PersonDisplay'
-import './Persons.scss'
+import './PersonScene.scss'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
 import { MergeSplitPerson } from './MergeSplitPerson'
 import { PersonCohorts } from './PersonCohorts'
@@ -18,7 +19,7 @@ import { RelatedGroups } from 'scenes/groups/RelatedGroups'
 import { groupsAccessLogic } from 'lib/introductions/groupsAccessLogic'
 import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
 import { ActivityScope } from 'lib/components/ActivityLog/humanizeActivity'
-import { LemonButton, LemonDivider, LemonSelect, Link } from '@posthog/lemon-ui'
+import { LemonButton, LemonDivider, LemonSelect, LemonTag, Link } from '@posthog/lemon-ui'
 import { teamLogic } from 'scenes/teamLogic'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { PersonDeleteModal } from 'scenes/persons/PersonDeleteModal'
@@ -75,10 +76,10 @@ function PersonCaption({ person }: { person: PersonType }): JSX.Element {
                         }
                         trigger={['click']}
                     >
-                        <Tag className="extra-ids">
-                            +{person.distinct_ids.length - 1}
+                        <LemonTag className="extra-ids space-x-1">
+                            <div>+{person.distinct_ids.length - 1}</div>
                             <DownOutlined />
-                        </Tag>
+                        </LemonTag>
                     </Dropdown>
                 )}
             </div>
@@ -147,10 +148,8 @@ export function PersonScene(): JSX.Element | null {
                     <div className="flex gap-2">
                         <NotebookSelectButton
                             resource={{
-                                attrs: {
-                                    id: person?.distinct_ids[0],
-                                },
                                 type: NotebookNodeType.Person,
+                                attrs: { id: person?.distinct_ids[0] },
                             }}
                             type="secondary"
                         />
@@ -239,7 +238,7 @@ export function PersonScene(): JSX.Element | null {
                                         <LemonBanner type="info">
                                             Session recordings are currently disabled for this project. To use this
                                             feature, please go to your{' '}
-                                            <Link to={`${urls.projectSettings()}#recordings`}>project settings</Link>{' '}
+                                            <Link to={`${urls.settings('project')}#recordings`}>project settings</Link>{' '}
                                             and enable it.
                                         </LemonBanner>
                                     </div>
diff --git a/frontend/src/scenes/persons/Persons.tsx b/frontend/src/scenes/persons/Persons.tsx
deleted file mode 100644
index 866c46b5136406..00000000000000
--- a/frontend/src/scenes/persons/Persons.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { useValues, useActions, BindLogic } from 'kea'
-import { PersonsTable } from './PersonsTable'
-import { Col, Popconfirm } from 'antd'
-import { personsLogic } from './personsLogic'
-import { CohortType, PersonType, ProductKey } from '~/types'
-import { PersonsSearch } from './PersonsSearch'
-import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
-import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { IconExport } from 'lib/lemon-ui/icons'
-import { triggerExport } from 'lib/components/ExportButton/exporter'
-import { LemonTableColumn } from 'lib/lemon-ui/LemonTable'
-import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
-import { router } from 'kea-router'
-import { urls } from 'scenes/urls'
-import { Link } from '@posthog/lemon-ui'
-
-interface PersonsProps {
-    cohort?: CohortType['id']
-}
-
-export function Persons({ cohort }: PersonsProps = {}): JSX.Element {
-    return (
-        <BindLogic logic={personsLogic} props={{ cohort: cohort, syncWithUrl: !cohort, fixedProperties: undefined }}>
-            <PersonsScene />
-        </BindLogic>
-    )
-}
-
-interface PersonsSceneProps {
-    extraSceneActions?: JSX.Element[]
-    compact?: boolean
-    showFilters?: boolean
-    showExportAction?: boolean
-    extraColumns?: LemonTableColumn<PersonType, keyof PersonType | undefined>[]
-    showSearch?: boolean
-    emptyState?: JSX.Element
-}
-
-export function PersonsScene({
-    extraSceneActions,
-    compact,
-    extraColumns,
-    emptyState,
-    showFilters = true,
-    showExportAction = true,
-    showSearch = true,
-}: PersonsSceneProps): JSX.Element {
-    const { loadPersons, setListFilters } = useActions(personsLogic)
-    const { persons, listFilters, personsLoading, exporterProps, apiDocsURL } = useValues(personsLogic)
-    const shouldShowEmptyState = !personsLoading && persons.results.length === 0 && !listFilters.search
-
-    return (
-        <>
-            {shouldShowEmptyState ? (
-                <ProductIntroduction
-                    productName="Persons"
-                    thingName="person"
-                    productKey={ProductKey.PERSONS}
-                    description="PostHog tracks user behaviour, whether or not the user is logged in or anonymous. Once you've sent some data, the associated persons will show up here."
-                    docsURL="https://posthog.com/docs/getting-started/install"
-                    actionElementOverride={
-                        <LemonButton type="primary" onClick={() => router.actions.push(urls.ingestion() + '/platform')}>
-                            Start sending data
-                        </LemonButton>
-                    }
-                    isEmpty={true}
-                />
-            ) : (
-                <div className="persons-list">
-                    <div className="space-y-2">
-                        <div className="flex justify-between items-center gap-2">
-                            {showSearch && (
-                                <Col>
-                                    <PersonsSearch />
-                                </Col>
-                            )}
-                            <Col className="flex flex-row gap-2">
-                                {showExportAction && (
-                                    <Popconfirm
-                                        placement="topRight"
-                                        title={
-                                            <>
-                                                Exporting by CSV is limited to 10,000 users.
-                                                <br />
-                                                To export more, please use <Link to={apiDocsURL}>the API</Link>. Do you
-                                                want to export by CSV?
-                                            </>
-                                        }
-                                        onConfirm={() => triggerExport(exporterProps[0])}
-                                    >
-                                        <LemonButton
-                                            type="secondary"
-                                            icon={<IconExport style={{ color: 'var(--primary)' }} />}
-                                        >
-                                            {listFilters.properties && listFilters.properties.length > 0 ? (
-                                                <div style={{ display: 'block' }}>
-                                                    Export (<strong>{listFilters.properties.length}</strong> filter)
-                                                </div>
-                                            ) : (
-                                                'Export'
-                                            )}
-                                        </LemonButton>
-                                    </Popconfirm>
-                                )}
-                                {extraSceneActions ? extraSceneActions : null}
-                            </Col>
-                        </div>
-                        {showFilters && (
-                            <PropertyFilters
-                                pageKey="persons-list-page"
-                                propertyFilters={listFilters.properties}
-                                onChange={(properties) => {
-                                    setListFilters({ properties })
-                                    loadPersons()
-                                }}
-                                endpoint="person"
-                                taxonomicGroupTypes={[TaxonomicFilterGroupType.PersonProperties]}
-                                showConditionBadge
-                            />
-                        )}
-                        <PersonsTable
-                            people={persons.results}
-                            loading={personsLoading}
-                            hasPrevious={!!persons.previous}
-                            hasNext={!!persons.next}
-                            loadPrevious={() => loadPersons(persons.previous)}
-                            loadNext={() => loadPersons(persons.next)}
-                            compact={compact}
-                            extraColumns={extraColumns}
-                            emptyState={emptyState}
-                        />
-                    </div>
-                </div>
-            )}
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/PersonsScene.tsx b/frontend/src/scenes/persons/PersonsScene.tsx
deleted file mode 100644
index 4e5faea47610ad..00000000000000
--- a/frontend/src/scenes/persons/PersonsScene.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { SceneExport } from 'scenes/sceneTypes'
-import { useActions, useValues } from 'kea'
-import { Query } from '~/queries/Query/Query'
-import { PersonPageHeader } from 'scenes/persons/PersonPageHeader'
-import { personsSceneLogic } from 'scenes/persons/personsSceneLogic'
-
-export const scene: SceneExport = {
-    component: PersonsScene,
-}
-
-export function PersonsScene(): JSX.Element {
-    const { query } = useValues(personsSceneLogic)
-    const { setQuery } = useActions(personsSceneLogic)
-
-    return (
-        <>
-            <PersonPageHeader activeGroupTypeIndex={-1} />
-            <Query query={query} setQuery={setQuery} />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/PersonsTable.tsx b/frontend/src/scenes/persons/PersonsTable.tsx
index 40e150e4683a49..c3d8a2f456fe65 100644
--- a/frontend/src/scenes/persons/PersonsTable.tsx
+++ b/frontend/src/scenes/persons/PersonsTable.tsx
@@ -1,7 +1,6 @@
 import { TZLabel } from 'lib/components/TZLabel'
 import { PropertiesTable } from 'lib/components/PropertiesTable'
 import { PersonType, PropertyDefinitionType } from '~/types'
-import './Persons.scss'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
 import { PersonDisplay } from './PersonDisplay'
 import { LemonTable, LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
diff --git a/frontend/src/scenes/plugins/Plugins.scss b/frontend/src/scenes/plugins/Plugins.scss
index afb04ca6036400..cf6c4a5787ac05 100644
--- a/frontend/src/scenes/plugins/Plugins.scss
+++ b/frontend/src/scenes/plugins/Plugins.scss
@@ -1,7 +1,3 @@
-.Plugins__Popconfirm {
-    z-index: var(--z-plugins-popconfirm);
-}
-
 .Plugin__JobJsonEditor {
     border: 1px solid #efefef;
 }
diff --git a/frontend/src/scenes/plugins/edit/PluginDrawer.tsx b/frontend/src/scenes/plugins/edit/PluginDrawer.tsx
index ad135d40a8043e..b5a5b7f31f5a07 100644
--- a/frontend/src/scenes/plugins/edit/PluginDrawer.tsx
+++ b/frontend/src/scenes/plugins/edit/PluginDrawer.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react'
 import { useActions, useValues } from 'kea'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { Form, Switch } from 'antd'
-import { LockFilled } from '@ant-design/icons'
 import { userLogic } from 'scenes/userLogic'
 import { PluginImage } from 'scenes/plugins/plugin/PluginImage'
 import { Drawer } from 'lib/components/Drawer'
@@ -18,6 +17,7 @@ import { PluginJobOptions } from './interface-jobs/PluginJobOptions'
 import { MOCK_NODE_PROCESS } from 'lib/constants'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
 import { PluginTags } from '../tabs/apps/components'
+import { IconLock } from 'lib/lemon-ui/icons'
 import { LemonButton, LemonTag, Link } from '@posthog/lemon-ui'
 import { IconCode } from '@posthog/icons'
 
@@ -44,7 +44,7 @@ const SecretFieldIcon = (): JSX.Element => (
             placement="topLeft"
             title="This is a secret write-only field. Its value is not available after saving."
         >
-            <LockFilled style={{ marginRight: 5 }} />
+            <IconLock style={{ marginRight: 5 }} />
         </Tooltip>
     </>
 )
diff --git a/frontend/src/scenes/plugins/edit/PluginField.tsx b/frontend/src/scenes/plugins/edit/PluginField.tsx
index b57d47e1da5b2e..f4ccae78890b0e 100644
--- a/frontend/src/scenes/plugins/edit/PluginField.tsx
+++ b/frontend/src/scenes/plugins/edit/PluginField.tsx
@@ -2,10 +2,10 @@ import { UploadField } from 'scenes/plugins/edit/UploadField'
 import { Button, Input, Select } from 'antd'
 import { useState } from 'react'
 import { PluginConfigSchema } from '@posthog/plugin-scaffold/src/types'
-import { EditOutlined } from '@ant-design/icons'
 import { SECRET_FIELD_VALUE } from 'scenes/plugins/utils'
 import { AutoSizer } from 'react-virtualized/dist/es/AutoSizer'
 import { CodeEditor } from 'lib/components/CodeEditors'
+import { IconEdit } from 'lib/lemon-ui/icons'
 
 function JsonConfigField(props: {
     onChange: (value: any) => void
@@ -51,7 +51,7 @@ export function PluginField({
     ) {
         return (
             <Button
-                icon={<EditOutlined />}
+                icon={<IconEdit />}
                 onClick={() => {
                     onChange(fieldConfig.default || '')
                     setEditingSecret(true)
@@ -77,7 +77,7 @@ export function PluginField({
             ))}
         </Select>
     ) : (
-        <strong style={{ color: 'var(--danger)' }}>
+        <strong className="text-danger">
             Unknown field type "<code>{fieldConfig.type}</code>".
             <br />
             You may need to upgrade PostHog!
diff --git a/frontend/src/scenes/plugins/edit/UploadField.tsx b/frontend/src/scenes/plugins/edit/UploadField.tsx
index fbe4e38458aaad..4be545f3e9d083 100644
--- a/frontend/src/scenes/plugins/edit/UploadField.tsx
+++ b/frontend/src/scenes/plugins/edit/UploadField.tsx
@@ -1,6 +1,6 @@
 import { Button, Upload } from 'antd'
-import { UploadOutlined } from '@ant-design/icons'
 import { UploadFile } from 'antd/lib/upload/interface'
+import { IconUploadFile } from 'lib/lemon-ui/icons'
 
 export function UploadField({
     value,
@@ -23,7 +23,7 @@ export function UploadField({
             }}
             className="ph-ignore-input"
         >
-            <Button icon={<UploadOutlined />}>Click to upload</Button>
+            <Button icon={<IconUploadFile />}>Click to upload</Button>
         </Upload>
     )
 }
diff --git a/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx b/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
index f60b11353b7e8e..0372b12afd83bc 100644
--- a/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
+++ b/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
@@ -1,5 +1,4 @@
 import { useMemo } from 'react'
-import { PlayCircleOutlined, CheckOutlined, CloseOutlined, SettingOutlined } from '@ant-design/icons'
 import { Tooltip, Radio, InputNumber } from 'antd'
 import { ChildFunctionProps, Form } from 'kea-forms'
 import { Field } from 'lib/forms/Field'
@@ -15,6 +14,8 @@ import { dayjs } from 'lib/dayjs'
 import { formatDate, formatDateRange } from 'lib/utils'
 import { DatePicker } from 'lib/components/DatePicker'
 import { CodeEditor } from 'lib/components/CodeEditors'
+import { IconClose, IconPlayCircle, IconSettings } from 'lib/lemon-ui/icons'
+import { IconCheck } from '@posthog/icons'
 
 // keep in sync with plugin-server's export-historical-events.ts
 export const HISTORICAL_EXPORT_JOB_NAME = 'Export historical events'
@@ -38,11 +39,11 @@ export function PluginJobConfiguration(props: InterfaceJobsProps): JSX.Element {
             <span className="ml-1" onClick={() => playButtonOnClick(jobHasEmptyPayload)}>
                 <Tooltip title={configureOrRunJobTooltip}>
                     {jobHasEmptyPayload ? (
-                        <PlayCircleOutlined
+                        <IconPlayCircle
                             className={runJobAvailable ? 'Plugin__RunJobButton' : 'Plugin__RunJobButton--disabled'}
                         />
                     ) : (
-                        <SettingOutlined
+                        <IconSettings
                             className={runJobAvailable ? 'Plugin__RunJobButton' : 'Plugin__RunJobButton--disabled'}
                         />
                     )}
@@ -125,10 +126,10 @@ function FieldInput({
                     onChange={(e) => onChange(e.target.value)}
                 >
                     <Radio.Button value={true} defaultChecked>
-                        <CheckOutlined /> True
+                        <IconCheck /> True
                     </Radio.Button>
                     <Radio.Button value={false}>
-                        <CloseOutlined /> False
+                        <IconClose /> False
                     </Radio.Button>
                 </Radio.Group>
             )
diff --git a/frontend/src/scenes/plugins/plugin/PluginImage.tsx b/frontend/src/scenes/plugins/plugin/PluginImage.tsx
index 67120a11074d89..9fec8b6275e9e5 100644
--- a/frontend/src/scenes/plugins/plugin/PluginImage.tsx
+++ b/frontend/src/scenes/plugins/plugin/PluginImage.tsx
@@ -42,6 +42,7 @@ export function PluginImage({
     ) : (
         <div
             className="plugin-image shrink-0"
+            // eslint-disable-next-line react/forbid-dom-props
             style={{
                 width: pixelSize,
                 height: pixelSize,
diff --git a/frontend/src/scenes/plugins/plugin/PluginLogs.tsx b/frontend/src/scenes/plugins/plugin/PluginLogs.tsx
index 741ba55fdc2ea8..11275bcab2da5b 100644
--- a/frontend/src/scenes/plugins/plugin/PluginLogs.tsx
+++ b/frontend/src/scenes/plugins/plugin/PluginLogs.tsx
@@ -9,24 +9,24 @@ function PluginLogEntryTypeDisplay(type: PluginLogEntryType): JSX.Element {
     let color: string | undefined
     switch (type) {
         case PluginLogEntryType.Debug:
-            color = 'var(--muted)'
+            color = 'text-muted'
             break
         case PluginLogEntryType.Log:
-            color = 'var(--default)'
+            color = 'text-default'
             break
         case PluginLogEntryType.Info:
-            color = 'var(--blue)'
+            color = 'text-primary'
             break
         case PluginLogEntryType.Warn:
-            color = 'var(--warning)'
+            color = 'text-warning'
             break
         case PluginLogEntryType.Error:
-            color = 'var(--danger)'
+            color = 'text-danger'
             break
         default:
             break
     }
-    return <span style={{ color }}>{type}</span>
+    return <span className={color}>{type}</span>
 }
 
 const columns: LemonTableColumns<Record<string, any>> = [
diff --git a/frontend/src/scenes/plugins/source/PluginSource.tsx b/frontend/src/scenes/plugins/source/PluginSource.tsx
index 0b2ba5fd675b11..0d016a06a7ba1f 100644
--- a/frontend/src/scenes/plugins/source/PluginSource.tsx
+++ b/frontend/src/scenes/plugins/source/PluginSource.tsx
@@ -80,7 +80,7 @@ export function PluginSource({
             title={pluginSourceLoading ? 'Loading...' : `Edit App: ${name}`}
             placement={placement ?? 'left'}
             footer={
-                <div style={{ textAlign: 'right' }}>
+                <div className="text-right">
                     <Button onClick={closePluginSource} style={{ marginRight: 16 }}>
                         Close
                     </Button>
@@ -126,7 +126,7 @@ export function PluginSource({
                                                 }}
                                             />
                                             {!value && createDefaultPluginSource(name)[currentFile] ? (
-                                                <div style={{ marginTop: '0.5rem' }}>
+                                                <div className="mt-2">
                                                     <LemonButton
                                                         type="primary"
                                                         onClick={() =>
diff --git a/frontend/src/scenes/plugins/tabs/apps/AppManagementView.tsx b/frontend/src/scenes/plugins/tabs/apps/AppManagementView.tsx
index 6324af5a536b87..4d0bc00644da67 100644
--- a/frontend/src/scenes/plugins/tabs/apps/AppManagementView.tsx
+++ b/frontend/src/scenes/plugins/tabs/apps/AppManagementView.tsx
@@ -1,6 +1,6 @@
 import { LemonButton, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
-import { IconCheckmark, IconCloudDownload } from 'lib/lemon-ui/icons'
+import { IconCheckmark, IconCloudDownload, IconDelete, IconReplay, IconWeb } from 'lib/lemon-ui/icons'
 import { PluginImage } from 'scenes/plugins/plugin/PluginImage'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { PluginTypeWithConfig, PluginRepositoryEntry, PluginInstallationType } from 'scenes/plugins/types'
@@ -8,7 +8,6 @@ import { PluginType } from '~/types'
 import { PluginTags } from './components'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { Popconfirm } from 'antd'
-import { DeleteOutlined, GlobalOutlined, RollbackOutlined } from '@ant-design/icons'
 import { canGloballyManagePlugins } from 'scenes/plugins/access'
 import { userLogic } from 'scenes/userLogic'
 
@@ -71,7 +70,7 @@ export function AppManagementView({
                                 type="primary"
                                 status="danger"
                                 size="small"
-                                icon={<DeleteOutlined />}
+                                icon={<IconDelete />}
                                 disabledReason={
                                     unusedPlugins.includes(plugin.id) ? undefined : 'This app is still in use.'
                                 }
@@ -93,7 +92,7 @@ export function AppManagementView({
                                 <LemonButton
                                     type="secondary"
                                     size="small"
-                                    icon={<RollbackOutlined />}
+                                    icon={<IconReplay />}
                                     onClick={() => patchPlugin(plugin.id, { is_global: false })}
                                 >
                                     Make local
@@ -111,7 +110,7 @@ export function AppManagementView({
                                 <LemonButton
                                     type="secondary"
                                     size="small"
-                                    icon={<GlobalOutlined />}
+                                    icon={<IconWeb />}
                                     onClick={() => patchPlugin(plugin.id, { is_global: true })}
                                 >
                                     Make global
diff --git a/frontend/src/scenes/plugins/tabs/apps/InstalledAppsReorderModal.tsx b/frontend/src/scenes/plugins/tabs/apps/InstalledAppsReorderModal.tsx
index 1e5e0ad81b897e..382a157bbbf6f9 100644
--- a/frontend/src/scenes/plugins/tabs/apps/InstalledAppsReorderModal.tsx
+++ b/frontend/src/scenes/plugins/tabs/apps/InstalledAppsReorderModal.tsx
@@ -16,6 +16,7 @@ const MinimalAppView = ({ plugin, order }: { plugin: PluginTypeWithConfig; order
         <div
             ref={setNodeRef}
             className="flex gap-2 cursor-move border rounded p-2 items-center bg-bg-light"
+            // eslint-disable-next-line react/forbid-dom-props
             style={{
                 position: 'relative',
                 transform: CSS.Transform.toString(transform),
diff --git a/frontend/src/scenes/project-homepage/ProjectHomepage.stories.tsx b/frontend/src/scenes/project-homepage/ProjectHomepage.stories.tsx
index ee72de13b7ad18..fb2a439dbee3b2 100644
--- a/frontend/src/scenes/project-homepage/ProjectHomepage.stories.tsx
+++ b/frontend/src/scenes/project-homepage/ProjectHomepage.stories.tsx
@@ -4,6 +4,7 @@ import { mswDecorator } from '~/mocks/browser'
 import { App } from 'scenes/App'
 import { router } from 'kea-router'
 import { urls } from 'scenes/urls'
+import { EMPTY_PAGINATED_RESPONSE } from '~/mocks/handlers'
 
 const meta: Meta = {
     title: 'Scenes-App/Project Homepage',
@@ -13,6 +14,8 @@ const meta: Meta = {
                 '/api/projects/:team_id/dashboards/': require('../dashboard/__mocks__/dashboards.json'),
                 '/api/projects/:team_id/dashboards/1/': require('../dashboard/__mocks__/dashboard1.json'),
                 '/api/projects/:team_id/dashboards/1/collaborators/': [],
+                '/api/projects/:team_id/session_recordings/': EMPTY_PAGINATED_RESPONSE,
+                '/api/projects/:team_id/insights/my_last_viewed/': [],
             },
         }),
     ],
diff --git a/frontend/src/scenes/project-homepage/ProjectHomepage.tsx b/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
index 69d8233fdacf24..c8fea74e75c9cb 100644
--- a/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
+++ b/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
@@ -6,7 +6,7 @@ import { useActions, useValues } from 'kea'
 import { teamLogic } from 'scenes/teamLogic'
 import { Scene, SceneExport } from 'scenes/sceneTypes'
 import { DashboardPlacement } from '~/types'
-import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { IconCottage } from 'lib/lemon-ui/icons'
 import { projectHomepageLogic } from 'scenes/project-homepage/projectHomepageLogic'
diff --git a/frontend/src/scenes/project-homepage/RecentRecordings.tsx b/frontend/src/scenes/project-homepage/RecentRecordings.tsx
index 085f1d6f92a624..d8b178148f6ab5 100644
--- a/frontend/src/scenes/project-homepage/RecentRecordings.tsx
+++ b/frontend/src/scenes/project-homepage/RecentRecordings.tsx
@@ -70,7 +70,7 @@ export function RecentRecordings(): JSX.Element {
                               title: 'Recordings are not enabled for this project',
                               description: 'Once recordings are enabled, new recordings will display here.',
                               buttonText: 'Enable recordings',
-                              buttonTo: urls.projectSettings() + '#recordings',
+                              buttonTo: urls.settings('project-replay'),
                           }
                 }
                 items={sessionRecordings.slice(0, 5)}
diff --git a/frontend/src/scenes/project/Settings/AccessControl.tsx b/frontend/src/scenes/project/Settings/AccessControl.tsx
deleted file mode 100644
index dc98e56f642959..00000000000000
--- a/frontend/src/scenes/project/Settings/AccessControl.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { AvailableFeature } from '~/types'
-import { organizationLogic } from '../../organizationLogic'
-import { useActions, useValues } from 'kea'
-import { RestrictedComponentProps } from 'lib/components/RestrictedArea'
-import { sceneLogic } from '../../sceneLogic'
-import { teamLogic } from 'scenes/teamLogic'
-import { LockOutlined, UnlockOutlined } from '@ant-design/icons'
-import { userLogic } from 'scenes/userLogic'
-import { LemonSwitch } from '@posthog/lemon-ui'
-
-export function AccessControl({ isRestricted }: RestrictedComponentProps): JSX.Element {
-    const { currentOrganization, currentOrganizationLoading } = useValues(organizationLogic)
-    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
-    const { updateCurrentTeam } = useActions(teamLogic)
-    const { guardAvailableFeature } = useActions(sceneLogic)
-    const { hasAvailableFeature } = useValues(userLogic)
-
-    const projectPermissioningEnabled =
-        hasAvailableFeature(AvailableFeature.PROJECT_BASED_PERMISSIONING) && currentTeam?.access_control
-
-    return (
-        <div>
-            <h2 className="subtitle" id="access-control">
-                Access Control
-            </h2>
-            <p>
-                {projectPermissioningEnabled ? (
-                    <>
-                        This project is{' '}
-                        <b>
-                            <LockOutlined style={{ color: 'var(--warning)', marginRight: 5 }} />
-                            private
-                        </b>
-                        . Only members listed below are allowed to access it.
-                    </>
-                ) : (
-                    <>
-                        This project is{' '}
-                        <b>
-                            <UnlockOutlined style={{ marginRight: 5 }} />
-                            open
-                        </b>
-                        . Any member of the organization can access it. To enable granular access control, make it
-                        private.
-                    </>
-                )}
-            </p>
-            <LemonSwitch
-                onChange={(checked) => {
-                    guardAvailableFeature(
-                        AvailableFeature.PROJECT_BASED_PERMISSIONING,
-                        'project-based permissioning',
-                        'Set permissions granularly for each project. Make sure only the right people have access to protected data.',
-                        () => updateCurrentTeam({ access_control: checked })
-                    )
-                }}
-                checked={!!projectPermissioningEnabled}
-                disabled={
-                    isRestricted ||
-                    !currentOrganization ||
-                    !currentTeam ||
-                    currentOrganizationLoading ||
-                    currentTeamLoading
-                }
-                bordered
-                label="Make project private"
-            />
-        </div>
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/AutocaptureSettings.tsx b/frontend/src/scenes/project/Settings/AutocaptureSettings.tsx
deleted file mode 100644
index 61ad7d9363db93..00000000000000
--- a/frontend/src/scenes/project/Settings/AutocaptureSettings.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { useValues, useActions } from 'kea'
-import { userLogic } from 'scenes/userLogic'
-import { LemonSwitch, LemonTag, LemonTextArea, Link } from '@posthog/lemon-ui'
-import { teamLogic } from 'scenes/teamLogic'
-import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { FlaggedFeature } from 'lib/components/FlaggedFeature'
-import { FEATURE_FLAGS } from 'lib/constants'
-import clsx from 'clsx'
-import { autocaptureExceptionsLogic } from 'scenes/project/Settings/autocaptureExceptionsLogic'
-import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
-
-export function AutocaptureSettings(): JSX.Element {
-    const { userLoading } = useValues(userLogic)
-    const { currentTeam } = useValues(teamLogic)
-    const { updateCurrentTeam } = useActions(teamLogic)
-    const { reportIngestionAutocaptureToggled, reportIngestionAutocaptureExceptionsToggled } =
-        useActions(eventUsageLogic)
-
-    const { errorsToIgnoreRules, rulesCharacters } = useValues(autocaptureExceptionsLogic)
-    const { setErrorsToIgnoreRules } = useActions(autocaptureExceptionsLogic)
-
-    return (
-        <>
-            <h2 className="subtitle">Autocapture</h2>
-            <p>
-                Automagically capture front-end interactions like pageviews, clicks, and more when using our web
-                JavaScript SDK.{' '}
-            </p>
-            <p>
-                Autocapture is also available for React Native, where it has to be{' '}
-                <Link to="https://posthog.com/docs/libraries/react-native#autocapture" target="_blank">
-                    configured directly in code
-                </Link>
-                .
-            </p>
-            <div className="space-y-2">
-                <LemonSwitch
-                    id="posthog-autocapture-switch"
-                    onChange={(checked) => {
-                        updateCurrentTeam({
-                            autocapture_opt_out: !checked,
-                        })
-                        reportIngestionAutocaptureToggled(!checked)
-                    }}
-                    checked={!currentTeam?.autocapture_opt_out}
-                    disabled={userLoading}
-                    label="Enable autocapture for web"
-                    bordered
-                />
-                <FlaggedFeature flag={FEATURE_FLAGS.EXCEPTION_AUTOCAPTURE}>
-                    <div className={'mt-4 border rounded px-6 py-4'}>
-                        <LemonSwitch
-                            id="posthog-autocapture-exceptions-switch"
-                            onChange={(checked) => {
-                                updateCurrentTeam({
-                                    autocapture_exceptions_opt_in: checked,
-                                })
-                                reportIngestionAutocaptureExceptionsToggled(checked)
-                            }}
-                            checked={!!currentTeam?.autocapture_exceptions_opt_in}
-                            disabled={userLoading}
-                            label={
-                                <>
-                                    Enable exception autocapture <LemonTag>ALPHA</LemonTag>
-                                </>
-                            }
-                            bordered
-                        />
-                        <h2 className="subtitle">Ignore errors</h2>
-                        <p>
-                            If you're experiencing a high volume of unhelpful errors, add regular expressions here to
-                            ignore them. This will ignore all errors that match, including those that are not
-                            autocaptured.
-                        </p>
-                        <p>
-                            You can enter a regular expression that matches values of{' '}
-                            <PropertyKeyInfo value={'$exception_message'} /> here to ignore them. One per line. For
-                            example, if you want to drop all errors that contain the word "bot", or you can enter "bot"
-                            here. Or if you want to drop all errors that are exactly "bot", you can enter "^bot$".
-                        </p>
-                        <p>Only up to 300 characters of config are allowed here.</p>
-                        <LemonTextArea
-                            id="posthog-autocapture-exceptions-dropped"
-                            value={errorsToIgnoreRules}
-                            onChange={setErrorsToIgnoreRules}
-                            disabled={!currentTeam?.autocapture_exceptions_opt_in}
-                        />
-                        <div
-                            className={clsx(
-                                'mt-2 text-xs text-right',
-                                rulesCharacters > 300 ? 'text-danger' : 'text-muted'
-                            )}
-                        >
-                            {rulesCharacters} / 300 characters
-                        </div>
-                    </div>
-                </FlaggedFeature>
-            </div>
-        </>
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/ExtraTeamSettings.tsx b/frontend/src/scenes/project/Settings/ExtraTeamSettings.tsx
deleted file mode 100644
index 7c8be42a75ede8..00000000000000
--- a/frontend/src/scenes/project/Settings/ExtraTeamSettings.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { useActions, useValues } from 'kea'
-import { teamLogic } from 'scenes/teamLogic'
-import { LemonButton, LemonDivider, LemonInput, LemonSwitch, Link } from '@posthog/lemon-ui'
-import { useState } from 'react'
-
-export enum SettingValueType {
-    Boolean = 'boolean',
-    Text = 'text',
-    Number = 'number',
-}
-
-export interface ExtraSettingType {
-    name: string
-    description: string
-    key: string
-    moreInfo: string
-    valueType: SettingValueType
-}
-
-const AVAILABLE_EXTRA_SETTINGS: ExtraSettingType[] = [
-    {
-        name: 'Person on Events (Beta)',
-        description: `We have updated our data model to also store person properties directly on events, making queries significantly faster. This means that person properties will no longer be "timeless", but rather point-in-time i.e. on filters we'll consider a person's properties at the time of the event, rather than at present time. This may cause data to change on some of your insights, but will be the default way we handle person properties going forward. For now, you can control whether you want this on or not, and should feel free to let us know of any concerns you might have. If you do enable this, you should see speed improvements of around 3-5x on average on most of your insights.`,
-        moreInfo:
-            'https://github.com/PostHog/posthog/blob/75a2111f2c4f9183dd45f85c7b103c7b0524eabf/plugin-server/src/worker/ingestion/PoE.md',
-        key: 'poe_v2_enabled',
-        valueType: SettingValueType.Boolean,
-    },
-]
-
-function ExtraSettingInput({
-    defaultValue,
-    type,
-    settingKey,
-}: {
-    defaultValue?: string | number
-    type: 'number' | 'text'
-    settingKey: string
-}): JSX.Element {
-    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
-    const { updateCurrentTeam } = useActions(teamLogic)
-
-    const [value, setValue] = useState(defaultValue)
-
-    return (
-        <div className="space-y-4" style={{ maxWidth: '40rem' }}>
-            <LemonInput value={value as any} onChange={setValue} disabled={currentTeamLoading} type={type as any} />
-            <LemonButton
-                type="primary"
-                onClick={() =>
-                    updateCurrentTeam({ extra_settings: { ...currentTeam?.extra_settings, [settingKey]: value } })
-                }
-                loading={currentTeamLoading}
-            >
-                Update
-            </LemonButton>
-        </div>
-    )
-}
-
-export function ExtraTeamSettings(): JSX.Element {
-    const { updateCurrentTeam } = useActions(teamLogic)
-    const { currentTeam } = useValues(teamLogic)
-
-    return (
-        <>
-            {AVAILABLE_EXTRA_SETTINGS.map((setting) => (
-                <>
-                    <h2 className="subtitle" id={`extra_settings_${setting.key}`}>
-                        {setting.name}
-                    </h2>
-                    <div className="space-y-2">
-                        <p>
-                            {setting.description}
-                            {setting.moreInfo ? <Link to={setting.moreInfo}> More info.</Link> : null}
-                        </p>
-                        {setting.valueType === SettingValueType.Boolean ? (
-                            <LemonSwitch
-                                data-attr={`extra_settings_${setting.key}`}
-                                onChange={(checked) => {
-                                    updateCurrentTeam({
-                                        extra_settings: { ...currentTeam?.extra_settings, [setting.key]: checked },
-                                    })
-                                }}
-                                label={`Enable ${setting.name}`}
-                                checked={!!currentTeam?.extra_settings?.[setting.key]}
-                                bordered
-                            />
-                        ) : (
-                            <ExtraSettingInput
-                                defaultValue={currentTeam?.extra_settings?.[setting.key] as string | number | undefined}
-                                type={setting.valueType}
-                                settingKey={setting.key}
-                            />
-                        )}
-                    </div>
-                    <LemonDivider className="my-6" />
-                </>
-            ))}
-        </>
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/IngestionInfo.tsx b/frontend/src/scenes/project/Settings/IngestionInfo.tsx
deleted file mode 100644
index 73c62f32539ef7..00000000000000
--- a/frontend/src/scenes/project/Settings/IngestionInfo.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { useActions, useValues } from 'kea'
-import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
-import { JSSnippet } from 'lib/components/JSSnippet'
-import { JSBookmarklet } from 'lib/components/JSBookmarklet'
-import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
-import { CodeSnippet } from 'lib/components/CodeSnippet'
-import { IconRefresh } from 'lib/lemon-ui/icons'
-import { Link } from 'lib/lemon-ui/Link'
-import { AutocaptureSettings } from './AutocaptureSettings'
-
-export function IngestionInfo({ loadingComponent }: { loadingComponent: JSX.Element }): JSX.Element {
-    const { currentTeam, currentTeamLoading, isTeamTokenResetAvailable } = useValues(teamLogic)
-    const { resetToken } = useActions(teamLogic)
-
-    if (currentTeam?.is_demo) {
-        return (
-            <>
-                <h2 id="snippet" className="subtitle">
-                    Event ingestion
-                </h2>
-                <p>
-                    PostHog can ingest events from almost anywhere - JavaScript, Android, iOS, React Native, Node.js,
-                    Ruby, Go, and more.
-                </p>
-                <p>
-                    Demo projects like this one can't ingest events, but you can{' '}
-                    <Link to="https://posthog.com/docs/integrations" target="_blank">
-                        read about ingestion in our Docs
-                    </Link>{' '}
-                    and use a non-demo project to ingest your own events.
-                </p>
-            </>
-        )
-    }
-
-    return (
-        <>
-            <h2 id="snippet" className="subtitle">
-                Web snippet
-            </h2>
-            <p>
-                PostHog's configurable web snippet allows you to (optionally) autocapture events, record user sessions,
-                and more with no extra work. Place the following snippet in your website's HTML, ideally just above the{' '}
-                <code>{'</head>'}</code> tag.
-            </p>
-            <p>
-                For more guidance, including on identifying users,{' '}
-                <Link to="https://posthog.com/docs/integrations/js-integration">see PostHog Docs</Link>.
-            </p>
-            {currentTeamLoading && !currentTeam ? loadingComponent : <JSSnippet />}
-            <LemonDivider className="my-6" />
-            <AutocaptureSettings />
-            <LemonDivider className="my-6" />
-            <p>Need to test PostHog on a live site without changing any code?</p>
-            <p>
-                Just drag the bookmarklet below to your bookmarks bar, open the website you want to test PostHog on and
-                click it. This will enable our tracking, on the currently loaded page only. The data will show up in
-                this project.
-            </p>
-            <div>{isAuthenticatedTeam(currentTeam) && <JSBookmarklet team={currentTeam} />}</div>
-            <LemonDivider className="my-6" />
-            <h2 id="custom-events" className="subtitle">
-                Send custom events
-            </h2>
-            To send custom events <Link to="https://posthog.com/docs/integrations">visit PostHog Docs</Link> and
-            integrate the library for the specific language or platform you're using. We support Python, Ruby, Node, Go,
-            PHP, iOS, Android, and more.
-            <LemonDivider className="my-6" />
-            <h2 id="project-variables" className="subtitle mb-4">
-                Project Variables
-            </h2>
-            <h3 id="project-api-key" className="l3">
-                Project API Key
-            </h3>
-            <p>
-                You can use this write-only key in any one of{' '}
-                <Link to="https://posthog.com/docs/integrations">our libraries</Link>.
-            </p>
-            <CodeSnippet
-                actions={
-                    isTeamTokenResetAvailable
-                        ? [
-                              {
-                                  icon: <IconRefresh />,
-                                  title: 'Reset project API key',
-                                  popconfirmProps: {
-                                      title: (
-                                          <>
-                                              Reset the project's API key?{' '}
-                                              <b>This will invalidate the current API key and cannot be undone.</b>
-                                          </>
-                                      ),
-                                      okText: 'Reset key',
-                                      okType: 'danger',
-                                      placement: 'left',
-                                  },
-                                  callback: resetToken,
-                              },
-                          ]
-                        : []
-                }
-                thing="project API key"
-            >
-                {currentTeam?.api_token || ''}
-            </CodeSnippet>
-            <p>
-                Write-only means it can only create new events. It can't read events or any of your other data stored
-                with PostHog, so it's safe to use in public apps.
-            </p>
-            <h3 id="project-id" className="l3 mt-4">
-                Project ID
-            </h3>
-            <p>
-                You can use this ID to reference your project in our <Link to="https://posthog.com/docs/api">API</Link>.
-            </p>
-            <CodeSnippet thing="project ID">{String(currentTeam?.id || '')}</CodeSnippet>
-        </>
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/PathCleaningFiltersConfig.tsx b/frontend/src/scenes/project/Settings/PathCleaningFiltersConfig.tsx
deleted file mode 100644
index d19fcf987d7865..00000000000000
--- a/frontend/src/scenes/project/Settings/PathCleaningFiltersConfig.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useActions, useValues } from 'kea'
-import { teamLogic } from 'scenes/teamLogic'
-import { PathCleanFilters } from 'lib/components/PathCleanFilters/PathCleanFilters'
-
-export function PathCleaningFiltersConfig(): JSX.Element | null {
-    const { updateCurrentTeam } = useActions(teamLogic)
-    const { currentTeam } = useValues(teamLogic)
-
-    if (!currentTeam) {
-        return null
-    }
-
-    return (
-        <PathCleanFilters
-            filters={currentTeam.path_cleaning_filters}
-            setFilters={(filters) => {
-                updateCurrentTeam({ path_cleaning_filters: filters })
-            }}
-        />
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/SessionRecording.tsx b/frontend/src/scenes/project/Settings/SessionRecording.tsx
deleted file mode 100644
index 91f0cf8691db62..00000000000000
--- a/frontend/src/scenes/project/Settings/SessionRecording.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Link } from '@posthog/lemon-ui'
-import { urls } from 'scenes/urls'
-import { SessionRecordingSettings } from 'scenes/session-recordings/settings/SessionRecordingSettings'
-
-export function SessionRecording(): JSX.Element {
-    return (
-        <>
-            <h2 id="recordings" className="subtitle">
-                Recordings
-            </h2>
-            <p>
-                Watch recordings of how users interact with your web app to see what can be improved. Recordings are
-                found in the <Link to={urls.replay()}>recordings page</Link>.
-            </p>
-
-            <SessionRecordingSettings />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/project/Settings/index.tsx b/frontend/src/scenes/project/Settings/index.tsx
deleted file mode 100644
index 927d296c47f947..00000000000000
--- a/frontend/src/scenes/project/Settings/index.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import { useState } from 'react'
-import { BindLogic, useActions, useValues } from 'kea'
-import { IPCapture } from './IPCapture'
-import { SessionRecording } from './SessionRecording'
-import { WebhookIntegration } from './WebhookIntegration'
-import { useAnchor } from 'lib/hooks/useAnchor'
-import { router } from 'kea-router'
-import { teamLogic } from 'scenes/teamLogic'
-import { DangerZone } from './DangerZone'
-import { PageHeader } from 'lib/components/PageHeader'
-import { Link } from 'lib/lemon-ui/Link'
-import { RestrictedArea, RestrictionScope } from 'lib/components/RestrictedArea'
-import { OrganizationMembershipLevel } from 'lib/constants'
-import { TestAccountFiltersConfig } from './TestAccountFiltersConfig'
-import { TimezoneConfig } from './TimezoneConfig'
-import { DataAttributes } from 'scenes/project/Settings/DataAttributes'
-import { AvailableFeature, InsightType, TeamType } from '~/types'
-import { TeamMembers } from './TeamMembers'
-import { teamMembersLogic } from './teamMembersLogic'
-import { AccessControl } from './AccessControl'
-import { PathCleaningFiltersConfig } from './PathCleaningFiltersConfig'
-import { userLogic } from 'scenes/userLogic'
-import { SceneExport } from 'scenes/sceneTypes'
-import { CorrelationConfig } from './CorrelationConfig'
-import { urls } from 'scenes/urls'
-import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
-import { AuthorizedUrlList } from 'lib/components/AuthorizedUrlList/AuthorizedUrlList'
-import { GroupAnalytics } from 'scenes/project/Settings/GroupAnalytics'
-import { PersonDisplayNameProperties } from './PersonDisplayNameProperties'
-import { SlackIntegration } from './SlackIntegration'
-import { LemonButton, LemonDivider, LemonInput, LemonLabel } from '@posthog/lemon-ui'
-import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
-import { AuthorizedUrlListType } from 'lib/components/AuthorizedUrlList/authorizedUrlListLogic'
-import { IngestionInfo } from './IngestionInfo'
-import { ExtraTeamSettings } from './ExtraTeamSettings'
-import { WeekStartConfig } from './WeekStartConfig'
-import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
-import { SurveySettings } from './Survey'
-
-export const scene: SceneExport = {
-    component: ProjectSettings,
-}
-
-function DisplayName(): JSX.Element {
-    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
-    const { updateCurrentTeam } = useActions(teamLogic)
-
-    const [name, setName] = useState(currentTeam?.name || '')
-
-    if (currentTeam?.is_demo) {
-        return (
-            <p>
-                <i>The demo project cannot be renamed.</i>
-            </p>
-        )
-    }
-
-    return (
-        <div className="space-y-4" style={{ maxWidth: '40rem' }}>
-            <LemonInput value={name} onChange={setName} disabled={currentTeamLoading} />
-            <LemonButton
-                type="primary"
-                onClick={() => updateCurrentTeam({ name })}
-                disabled={!name || !currentTeam || name === currentTeam.name}
-                loading={currentTeamLoading}
-            >
-                Rename Project
-            </LemonButton>
-        </div>
-    )
-}
-
-export function ProjectSettings(): JSX.Element {
-    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
-    const { location } = useValues(router)
-    const { user, hasAvailableFeature } = useValues(userLogic)
-    const hasAdvancedPaths = user?.organization?.available_features?.includes(AvailableFeature.PATHS_ADVANCED)
-
-    useAnchor(location.hash)
-
-    const LoadingComponent = (): JSX.Element => (
-        <div className="space-y-4">
-            <LemonSkeleton className="w-1/2" />
-            <LemonSkeleton repeat={3} />
-        </div>
-    )
-
-    return (
-        <div>
-            <PageHeader
-                title="Project settings"
-                caption={`Organize your analytics within the project. These settings only apply to ${
-                    currentTeam?.name ?? 'the current project'
-                }.`}
-            />
-            <div className="border rounded p-6">
-                <h2 id="name" className="subtitle mt-0">
-                    Display name
-                </h2>
-                {currentTeamLoading && !currentTeam ? <LoadingComponent /> : <DisplayName />}
-                <LemonDivider className="my-6" />
-                {currentTeamLoading && !currentTeam ? (
-                    <LoadingComponent />
-                ) : (
-                    <IngestionInfo loadingComponent={<LoadingComponent />} />
-                )}
-                <LemonDivider className="my-6" />
-                <h2 className="subtitle" id="date-and-time">
-                    Date and time
-                </h2>
-                <p>
-                    These settings affect how PostHog displays, buckets, and filters time-series data. You may need to
-                    refresh insights for new settings to apply.
-                </p>
-                <div className="space-y-2">
-                    <LemonLabel id="timezone">Time zone</LemonLabel>
-                    <TimezoneConfig />
-                    <LemonLabel id="timezone">Week starts on</LemonLabel>
-                    <WeekStartConfig />
-                </div>
-                <LemonDivider className="my-6" />
-                <h2 className="subtitle" id="internal-users-filtering">
-                    Filter out internal and test users
-                </h2>
-                <p>
-                    Increase the quality of your analytics results by filtering out events from internal sources, such
-                    as team members, test accounts, or development environments.{' '}
-                    <strong>
-                        The filters you apply here are added as extra filters when the toggle is switched on.
-                    </strong>{' '}
-                    So, if you apply a cohort, it means you will only match users in that cohort.
-                </p>
-                <LemonBanner type="info">
-                    Events and recordings will still be ingested and saved, but they will be excluded from any queries
-                    where the "Filter out internal and test users" toggle is set. You can learn how to{' '}
-                    <Link to="https://posthog.com/tutorials/fewer-unwanted-events" target="_blank">
-                        capture fewer events
-                    </Link>{' '}
-                    or how to{' '}
-                    <Link to="https://posthog.com/tutorials/limit-session-recordings" target="_blank">
-                        capture fewer recordings
-                    </Link>{' '}
-                    in our docs.
-                </LemonBanner>
-                <div className={'mt-4'}>
-                    <strong>Example filters</strong>
-                    <ul className="list-disc pl-4 mb-2">
-                        <li>
-                            "<strong>Email</strong> does not contain <strong>yourcompany.com</strong>" to exclude all
-                            events from your company's team members.
-                        </li>
-                        <li>
-                            "<strong>Host</strong> does not contain <strong>localhost</strong>" to exclude all events
-                            from local development environments.
-                        </li>
-                    </ul>
-                </div>
-                <TestAccountFiltersConfig />
-                <LemonDivider className="my-6" />
-                <CorrelationConfig />
-                {hasAdvancedPaths && (
-                    <>
-                        <LemonDivider className="my-6" />
-                        <h2 className="subtitle" id="path_cleaning_filtering">
-                            Path cleaning rules
-                            <LemonTag type="warning" className="uppercase" style={{ marginLeft: 8 }}>
-                                Beta
-                            </LemonTag>
-                        </h2>
-                        <p>
-                            Make your <Link to={urls.insightNew({ insight: InsightType.PATHS })}>Paths</Link> clearer by
-                            aliasing one or multiple URLs.{' '}
-                            <i>
-                                Example: <code>http://tenant-one.mydomain.com/accounts</code> and{' '}
-                                <code>http://tenant-two.mydomain.com/accounts</code> can become a single{' '}
-                                <code>/accounts</code> path.
-                            </i>
-                        </p>
-                        <p>
-                            Each rule is composed of an alias and a regex pattern. Any pattern in a URL or event name
-                            that matches the regex will be replaced with the alias. Rules are applied in the order that
-                            they're listed.
-                        </p>
-                        <p>
-                            <b>
-                                Rules that you set here will be applied before wildcarding and other regex replacement
-                                if the toggle is switched on.
-                            </b>
-                        </p>
-                        <PathCleaningFiltersConfig />
-                    </>
-                )}
-                <LemonDivider className="my-6" />
-                <div id="authorized-urls" />
-                <h2 className="subtitle" id="urls">
-                    Authorized URLs
-                </h2>
-                <p>
-                    These are the URLs where the{' '}
-                    <b>
-                        <Link to={urls.toolbarLaunch()}>Toolbar</Link> will automatically launch
-                    </b>{' '}
-                    (if you're logged in).
-                </p>
-                <p>
-                    <b>Domains and wildcard subdomains are allowed</b> (example: <code>https://*.example.com</code>).
-                    However, wildcarded top-level domains cannot be used (for security reasons).
-                </p>
-                <AuthorizedUrlList type={AuthorizedUrlListType.TOOLBAR_URLS} />
-                <LemonDivider className="my-6" />
-                <h2 className="subtitle" id="attributes">
-                    Data attributes
-                </h2>
-                <DataAttributes />
-                <LemonDivider className="my-6" />
-                <h2 className="subtitle" id="person-display-name">
-                    Person display name
-                </h2>
-                <PersonDisplayNameProperties />
-                <LemonDivider className="my-6" />
-                <h2 className="subtitle" id="webhook">
-                    Webhook integration
-                </h2>
-                <WebhookIntegration />
-                <LemonDivider className="my-6" />
-                <>
-                    <h2 className="subtitle" id="slack">
-                        Slack integration
-                    </h2>
-                    <SlackIntegration />
-                    <LemonDivider className="my-6" />
-                </>
-                <h2 className="subtitle" id="datacapture">
-                    Data capture configuration
-                </h2>
-                <IPCapture />
-                <LemonDivider className="my-6" />
-                <SessionRecording />
-                <LemonDivider className="my-6" />
-                <GroupAnalytics />
-                <SurveySettings />
-                <ExtraTeamSettings />
-                <RestrictedArea Component={AccessControl} minimumAccessLevel={OrganizationMembershipLevel.Admin} />
-                <LemonDivider className="my-6" />
-                {currentTeam?.access_control && hasAvailableFeature(AvailableFeature.PROJECT_BASED_PERMISSIONING) && (
-                    <BindLogic logic={teamMembersLogic} props={{ team: currentTeam }}>
-                        {user && <TeamMembers user={user} team={currentTeam as TeamType} />}
-                        <LemonDivider className="my-6" />
-                    </BindLogic>
-                )}
-                <RestrictedArea
-                    Component={DangerZone}
-                    minimumAccessLevel={OrganizationMembershipLevel.Admin}
-                    scope={RestrictionScope.Project}
-                />
-            </div>
-        </div>
-    )
-}
diff --git a/frontend/src/scenes/saved-insights/SavedInsights.stories.tsx b/frontend/src/scenes/saved-insights/SavedInsights.stories.tsx
index 7c01bb6ca7a44b..3b4ee1eb9a1633 100644
--- a/frontend/src/scenes/saved-insights/SavedInsights.stories.tsx
+++ b/frontend/src/scenes/saved-insights/SavedInsights.stories.tsx
@@ -7,9 +7,9 @@ import { useEffect } from 'react'
 import { router } from 'kea-router'
 import { mswDecorator, useStorybookMocks } from '~/mocks/browser'
 
-import trendsBarBreakdown from '../../mocks/fixtures/api/projects/:team_id/insights/trendsBarBreakdown.json'
-import trendsPieBreakdown from '../../mocks/fixtures/api/projects/:team_id/insights/trendsPieBreakdown.json'
-import funnelTopToBottom from '../../mocks/fixtures/api/projects/:team_id/insights/funnelTopToBottom.json'
+import trendsBarBreakdown from '../../mocks/fixtures/api/projects/team_id/insights/trendsBarBreakdown.json'
+import trendsPieBreakdown from '../../mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json'
+import funnelTopToBottom from '../../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json'
 import { EMPTY_PAGINATED_RESPONSE, toPaginatedResponse } from '~/mocks/handlers'
 
 const insights = [trendsBarBreakdown, trendsPieBreakdown, funnelTopToBottom]
diff --git a/frontend/src/scenes/saved-insights/SavedInsightsFilters.tsx b/frontend/src/scenes/saved-insights/SavedInsightsFilters.tsx
index 2edb70bf0f233b..33369ddf00218c 100644
--- a/frontend/src/scenes/saved-insights/SavedInsightsFilters.tsx
+++ b/frontend/src/scenes/saved-insights/SavedInsightsFilters.tsx
@@ -1,13 +1,13 @@
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
 import { DateFilter } from 'lib/components/DateFilter/DateFilter'
-import { CalendarOutlined } from '@ant-design/icons'
 import { SavedInsightsTabs } from '~/types'
 import { INSIGHT_TYPE_OPTIONS } from 'scenes/saved-insights/SavedInsights'
 import { useActions, useValues } from 'kea'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { savedInsightsLogic } from 'scenes/saved-insights/savedInsightsLogic'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
+import { IconCalendar } from '@posthog/icons'
 
 export function SavedInsightsFilters(): JSX.Element {
     const { nameSortedDashboards } = useValues(dashboardsModel)
@@ -66,7 +66,7 @@ export function SavedInsightsFilters(): JSX.Element {
                         }
                         makeLabel={(key) => (
                             <>
-                                <CalendarOutlined />
+                                <IconCalendar />
                                 <span className="hide-when-small"> {key}</span>
                             </>
                         )}
diff --git a/frontend/src/scenes/sceneLogic.test.tsx b/frontend/src/scenes/sceneLogic.test.tsx
index edf4c4b4d6f3be..478b3047d70eda 100644
--- a/frontend/src/scenes/sceneLogic.test.tsx
+++ b/frontend/src/scenes/sceneLogic.test.tsx
@@ -15,8 +15,8 @@ export const logic = kea<logicType>([path(['scenes', 'sceneLogic', 'test'])])
 const sceneImport = (): any => ({ scene: { component: Component, logic: logic } })
 
 const testScenes: Record<string, () => any> = {
-    [Scene.Annotations]: sceneImport,
-    [Scene.MySettings]: sceneImport,
+    [Scene.DataManagement]: sceneImport,
+    [Scene.Settings]: sceneImport,
 }
 
 describe('sceneLogic', () => {
@@ -26,7 +26,7 @@ describe('sceneLogic', () => {
         initKeaTests()
         await expectLogic(teamLogic).toDispatchActions(['loadCurrentTeamSuccess'])
         featureFlagLogic.mount()
-        router.actions.push(urls.annotations())
+        router.actions.push(urls.eventDefinitions())
         logic = sceneLogic({ scenes: testScenes })
         logic.mount()
     })
@@ -43,45 +43,48 @@ describe('sceneLogic', () => {
 
     it('changing URL runs openScene, loadScene and setScene', async () => {
         await expectLogic(logic).toDispatchActions(['openScene', 'loadScene', 'setScene']).toMatchValues({
-            scene: Scene.Annotations,
+            scene: Scene.DataManagement,
         })
-        router.actions.push(urls.mySettings())
+        router.actions.push(urls.settings('user'))
         await expectLogic(logic).toDispatchActions(['openScene', 'loadScene', 'setScene']).toMatchValues({
-            scene: Scene.MySettings,
+            scene: Scene.Settings,
         })
     })
 
     it('persists the loaded scenes', async () => {
         const expectedAnnotation = partial({
-            name: Scene.Annotations,
+            name: Scene.DataManagement,
             component: expect.any(Function),
             logic: expect.any(Function),
             sceneParams: { hashParams: {}, params: {}, searchParams: {} },
             lastTouch: expect.any(Number),
         })
 
-        const expectedMySettings = partial({
-            name: Scene.MySettings,
+        const expectedSettings = partial({
+            name: Scene.Settings,
             component: expect.any(Function),
-            sceneParams: { hashParams: {}, params: {}, searchParams: {} },
+            sceneParams: {
+                hashParams: {},
+                params: {
+                    section: 'user',
+                },
+                searchParams: {},
+            },
+            logic: expect.any(Function),
             lastTouch: expect.any(Number),
         })
 
-        await expectLogic(logic)
-            .delay(1)
-            .toMatchValues({
-                loadedScenes: partial({
-                    [Scene.Annotations]: expectedAnnotation,
-                }),
-            })
-        router.actions.push(urls.mySettings())
-        await expectLogic(logic)
-            .delay(1)
-            .toMatchValues({
-                loadedScenes: partial({
-                    [Scene.Annotations]: expectedAnnotation,
-                    [Scene.MySettings]: expectedMySettings,
-                }),
-            })
+        await expectLogic(logic).delay(1)
+
+        expect(logic.values.loadedScenes).toMatchObject({
+            [Scene.DataManagement]: expectedAnnotation,
+        })
+        router.actions.push(urls.settings('user'))
+        await expectLogic(logic).delay(1)
+
+        expect(logic.values.loadedScenes).toMatchObject({
+            [Scene.DataManagement]: expectedAnnotation,
+            [Scene.Settings]: expectedSettings,
+        })
     })
 })
diff --git a/frontend/src/scenes/sceneLogic.ts b/frontend/src/scenes/sceneLogic.ts
index 8068f4f053ac27..bd5c46206d001c 100644
--- a/frontend/src/scenes/sceneLogic.ts
+++ b/frontend/src/scenes/sceneLogic.ts
@@ -19,17 +19,12 @@ import { FEATURE_FLAGS } from 'lib/constants'
 /** Mapping of some scenes that aren't directly accessible from the sidebar to ones that are - for the sidebar. */
 const sceneNavAlias: Partial<Record<Scene, Scene>> = {
     [Scene.Action]: Scene.DataManagement,
-    [Scene.Actions]: Scene.DataManagement,
-    [Scene.EventDefinitions]: Scene.DataManagement,
-    [Scene.PropertyDefinitions]: Scene.DataManagement,
     [Scene.EventDefinition]: Scene.DataManagement,
     [Scene.PropertyDefinition]: Scene.DataManagement,
-    [Scene.IngestionWarnings]: Scene.DataManagement,
-    [Scene.Person]: Scene.Persons,
-    [Scene.Cohort]: Scene.Cohorts,
-    [Scene.Groups]: Scene.Persons,
+    [Scene.Person]: Scene.PersonsManagement,
+    [Scene.Cohort]: Scene.PersonsManagement,
     [Scene.Experiment]: Scene.Experiments,
-    [Scene.Group]: Scene.Persons,
+    [Scene.Group]: Scene.PersonsManagement,
     [Scene.Dashboard]: Scene.Dashboards,
     [Scene.FeatureFlag]: Scene.FeatureFlags,
     [Scene.EarlyAccessFeature]: Scene.EarlyAccessFeatures,
@@ -39,6 +34,7 @@ const sceneNavAlias: Partial<Record<Scene, Scene>> = {
     [Scene.DataWarehouseExternal]: Scene.DataWarehouse,
     [Scene.DataWarehouseSavedQueries]: Scene.DataWarehouse,
     [Scene.DataWarehouseSettings]: Scene.DataWarehouse,
+    [Scene.DataWarehouseTable]: Scene.DataWarehouse,
     [Scene.AppMetrics]: Scene.Apps,
     [Scene.ReplaySingle]: Scene.Replay,
     [Scene.ReplayPlaylist]: Scene.ReplayPlaylist,
@@ -257,7 +253,7 @@ export const sceneLogic = kea<sceneLogicType>([
                         !location.pathname.startsWith('/ingestion') &&
                         !location.pathname.startsWith('/onboarding') &&
                         !location.pathname.startsWith('/products') &&
-                        !location.pathname.startsWith('/project/settings')
+                        !location.pathname.startsWith('/settings')
                     ) {
                         if (
                             featureFlagLogic.values.featureFlags[FEATURE_FLAGS.PRODUCT_SPECIFIC_ONBOARDING] ===
diff --git a/frontend/src/scenes/sceneTypes.ts b/frontend/src/scenes/sceneTypes.ts
index dc17598a8ee811..5d5ed7a89c3ffe 100644
--- a/frontend/src/scenes/sceneTypes.ts
+++ b/frontend/src/scenes/sceneTypes.ts
@@ -9,29 +9,21 @@ export enum Scene {
     ErrorProjectUnavailable = 'ProjectUnavailable',
     Dashboards = 'Dashboards',
     Dashboard = 'Dashboard',
-    Database = 'Database',
     Insight = 'Insight',
     WebAnalytics = 'WebAnalytics',
-    Cohorts = 'Cohorts',
     Cohort = 'Cohort',
     Events = 'Events',
     DataManagement = 'DataManagement',
-    EventDefinitions = 'EventDefinitionsTable',
     EventDefinition = 'EventDefinition',
-    PropertyDefinitions = 'PropertyDefinitionsTable',
     PropertyDefinition = 'PropertyDefinition',
-    DataManagementHistory = 'DataManagementHistory',
-    IngestionWarnings = 'IngestionWarnings',
     Replay = 'Replay',
     ReplaySingle = 'ReplaySingle',
     ReplayPlaylist = 'ReplayPlaylist',
+    PersonsManagement = 'PersonsManagement',
     Person = 'Person',
-    Persons = 'Persons',
     Pipeline = 'Pipeline',
-    Groups = 'Groups',
     Group = 'Group',
     Action = 'Action',
-    Actions = 'ActionsTable',
     Experiments = 'Experiments',
     Experiment = 'Experiment',
     BatchExports = 'BatchExports',
@@ -48,17 +40,14 @@ export enum Scene {
     DataWarehousePosthog = 'DataWarehousePosthog',
     DataWarehouseExternal = 'DataWarehouseExternal',
     DataWarehouseSavedQueries = 'DataWarehouseSavedQueries',
+    DataWarehouseTable = 'DataWarehouseTable',
     DataWarehouseSettings = 'DataWarehouseSettings',
-    OrganizationSettings = 'OrganizationSettings',
     OrganizationCreateFirst = 'OrganizationCreate',
     ProjectHomepage = 'ProjectHomepage',
-    ProjectSettings = 'ProjectSettings',
     ProjectCreateFirst = 'ProjectCreate',
     SystemStatus = 'SystemStatus',
     AsyncMigrations = 'AsyncMigrations',
     DeadLetterQueue = 'DeadLetterQueue',
-    MySettings = 'MySettings',
-    Annotations = 'Annotations',
     Billing = 'Billing',
     Apps = 'Apps',
     FrontendAppScene = 'FrontendAppScene',
@@ -86,6 +75,7 @@ export enum Scene {
     Canvas = 'Canvas',
     Products = 'Products',
     Onboarding = 'Onboarding',
+    Settings = 'Settings',
 }
 
 export type SceneProps = Record<string, any>
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index 3d3b3baa214db4..dc5aa42bb885e9 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -48,10 +48,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         name: 'Web Analytics',
         layout: 'app-container',
     },
-    [Scene.Cohorts]: {
-        projectBased: true,
-        name: 'Cohorts',
-    },
     [Scene.Cohort]: {
         projectBased: true,
         name: 'Cohort',
@@ -76,38 +72,14 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.Actions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.EventDefinitions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.EventDefinition]: {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.PropertyDefinitions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.PropertyDefinition]: {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.DataManagementHistory]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.IngestionWarnings]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.Database]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.Replay]: {
         projectBased: true,
         name: 'Session Replay',
@@ -124,7 +96,7 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Person',
     },
-    [Scene.Persons]: {
+    [Scene.PersonsManagement]: {
         projectBased: true,
         name: 'Persons & Groups',
     },
@@ -132,10 +104,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Action',
     },
-    [Scene.Groups]: {
-        projectBased: true,
-        name: 'Persons & Groups',
-    },
     [Scene.Group]: {
         projectBased: true,
         name: 'Persons & Groups',
@@ -191,15 +159,15 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Data Warehouse Settings',
     },
-    [Scene.EarlyAccessFeatures]: {
+    [Scene.DataWarehouseTable]: {
         projectBased: true,
+        name: 'Data Warehouse Table',
     },
-    [Scene.EarlyAccessFeature]: {
+    [Scene.EarlyAccessFeatures]: {
         projectBased: true,
     },
-    [Scene.Annotations]: {
+    [Scene.EarlyAccessFeature]: {
         projectBased: true,
-        name: 'Annotations',
     },
     [Scene.Apps]: {
         projectBased: true,
@@ -221,11 +189,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Homepage',
     },
-    [Scene.ProjectSettings]: {
-        projectBased: true,
-        hideProjectNotice: true,
-        name: 'Project settings',
-    },
     [Scene.IntegrationsRedirect]: {
         name: 'Integrations Redirect',
     },
@@ -258,9 +221,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         name: 'Confirm organization creation',
         onlyUnauthenticated: true,
     },
-    [Scene.OrganizationSettings]: {
-        organizationBased: true,
-    },
     [Scene.ProjectCreateFirst]: {
         name: 'Project creation',
         organizationBased: true,
@@ -299,10 +259,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
     [Scene.DeadLetterQueue]: {
         instanceLevel: true,
     },
-    // Personal routes
-    [Scene.MySettings]: {
-        personal: true,
-    },
     // Cloud-only routes
     [Scene.Billing]: {
         hideProjectNotice: true,
@@ -310,6 +266,7 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
     },
     [Scene.Unsubscribe]: {
         allowUnauthenticated: true,
+        layout: 'app-raw',
     },
     [Scene.DebugQuery]: {
         projectBased: true,
@@ -336,6 +293,10 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         name: 'Canvas',
         layout: 'app-raw',
     },
+    [Scene.Settings]: {
+        projectBased: true,
+        name: 'Settings',
+    },
 }
 
 const preserveParams = (url: string) => (_params: Params, searchParams: Params, hashParams: Params) => {
@@ -353,12 +314,12 @@ export const redirects: Record<
     '/dashboards': urls.dashboards(),
     '/plugins': urls.projectApps(),
     '/project/plugins': urls.projectApps(),
-    '/actions': urls.actions(), // TODO: change to urls.eventDefinitions() when "simplify-actions" FF is released
-    '/organization/members': urls.organizationSettings(),
+    '/actions': urls.actions(),
+    '/organization/members': urls.settings('organization'),
     '/i/:shortId': ({ shortId }) => urls.insightView(shortId),
     '/action/:id': ({ id }) => urls.action(id),
     '/action': urls.createAction(),
-    '/events/actions': urls.actions(), // TODO: change to urls.eventDefinitions() when "simplify-actions" FF is released
+    '/events/actions': urls.actions(),
     '/events/stats': urls.eventDefinitions(),
     '/events/stats/:id': ({ id }) => urls.eventDefinition(id),
     '/events/:id/*': ({ id, _ }) => {
@@ -381,6 +342,8 @@ export const redirects: Record<
     },
     '/events/properties': urls.propertyDefinitions(),
     '/events/properties/:id': ({ id }) => urls.propertyDefinition(id),
+    '/annotations': () => urls.annotations(),
+    '/annotations/:id': ({ id }) => urls.annotation(id),
     '/recordings/:id': ({ id }) => urls.replaySingle(id),
     '/recordings/playlists/:id': ({ id }) => urls.replayPlaylist(id),
     '/recordings': (_params, _searchParams, hashParams) => {
@@ -392,6 +355,10 @@ export const redirects: Record<
     },
     '/replay': urls.replay(),
     '/exports': urls.batchExports(),
+    '/settings': urls.settings(),
+    '/project/settings': urls.settings('project'),
+    '/organization/settings': urls.settings('organization'),
+    '/me/settings': urls.settings('user'),
 }
 
 export const routes: Record<string, Scene> = {
@@ -404,7 +371,7 @@ export const routes: Record<string, Scene> = {
     [urls.createAction()]: Scene.Action,
     [urls.copyAction(null)]: Scene.Action,
     [urls.action(':id')]: Scene.Action,
-    [urls.ingestionWarnings()]: Scene.IngestionWarnings,
+    [urls.ingestionWarnings()]: Scene.DataManagement,
     [urls.insightNew()]: Scene.Insight,
     [urls.insightEdit(':shortId' as InsightShortId)]: Scene.Insight,
     [urls.insightView(':shortId' as InsightShortId)]: Scene.Insight,
@@ -413,17 +380,17 @@ export const routes: Record<string, Scene> = {
     [urls.insightSharing(':shortId' as InsightShortId)]: Scene.Insight,
     [urls.savedInsights()]: Scene.SavedInsights,
     [urls.webAnalytics()]: Scene.WebAnalytics,
-    [urls.actions()]: Scene.Actions, // TODO: remove when "simplify-actions" FF is released
-    [urls.eventDefinitions()]: Scene.EventDefinitions,
+    [urls.actions()]: Scene.DataManagement,
+    [urls.eventDefinitions()]: Scene.DataManagement,
     [urls.eventDefinition(':id')]: Scene.EventDefinition,
     [urls.batchExports()]: Scene.BatchExports,
     [urls.batchExportNew()]: Scene.BatchExportEdit,
     [urls.batchExport(':id')]: Scene.BatchExport,
     [urls.batchExportEdit(':id')]: Scene.BatchExportEdit,
-    [urls.propertyDefinitions()]: Scene.PropertyDefinitions,
+    [urls.propertyDefinitions()]: Scene.DataManagement,
     [urls.propertyDefinition(':id')]: Scene.PropertyDefinition,
-    [urls.dataManagementHistory()]: Scene.DataManagementHistory,
-    [urls.database()]: Scene.Database,
+    [urls.dataManagementHistory()]: Scene.DataManagement,
+    [urls.database()]: Scene.DataManagement,
     [urls.events()]: Scene.Events,
     [urls.replay()]: Scene.Replay,
     // One entry for every available tab
@@ -435,18 +402,18 @@ export const routes: Record<string, Scene> = {
     [urls.replayPlaylist(':id')]: Scene.ReplayPlaylist,
     [urls.personByDistinctId('*', false)]: Scene.Person,
     [urls.personByUUID('*', false)]: Scene.Person,
-    [urls.persons()]: Scene.Persons,
+    [urls.persons()]: Scene.PersonsManagement,
     [urls.pipeline()]: Scene.Pipeline,
     // One entry for every available tab
     ...Object.values(PipelineTabs).reduce((acc, tab) => {
         acc[urls.pipeline(tab)] = Scene.Pipeline
         return acc
     }, {} as Record<string, Scene>),
-    [urls.groups(':groupTypeIndex')]: Scene.Groups,
+    [urls.groups(':groupTypeIndex')]: Scene.PersonsManagement,
     [urls.group(':groupTypeIndex', ':groupKey', false)]: Scene.Group,
     [urls.group(':groupTypeIndex', ':groupKey', false, ':groupTab')]: Scene.Group,
     [urls.cohort(':id')]: Scene.Cohort,
-    [urls.cohorts()]: Scene.Cohorts,
+    [urls.cohorts()]: Scene.PersonsManagement,
     [urls.experiments()]: Scene.Experiments,
     [urls.experiment(':id')]: Scene.Experiment,
     [urls.earlyAccessFeatures()]: Scene.EarlyAccessFeatures,
@@ -455,16 +422,16 @@ export const routes: Record<string, Scene> = {
     [urls.survey(':id')]: Scene.Survey,
     [urls.surveyTemplates()]: Scene.SurveyTemplates,
     [urls.dataWarehouse()]: Scene.DataWarehouse,
+    [urls.dataWarehouseTable()]: Scene.DataWarehouseTable,
     [urls.dataWarehousePosthog()]: Scene.DataWarehousePosthog,
     [urls.dataWarehouseExternal()]: Scene.DataWarehouseExternal,
     [urls.dataWarehouseSavedQueries()]: Scene.DataWarehouseSavedQueries,
     [urls.dataWarehouseSettings()]: Scene.DataWarehouseSettings,
     [urls.featureFlags()]: Scene.FeatureFlags,
     [urls.featureFlag(':id')]: Scene.FeatureFlag,
-    [urls.annotations()]: Scene.Annotations,
-    [urls.annotation(':id')]: Scene.Annotations,
+    [urls.annotations()]: Scene.DataManagement,
+    [urls.annotation(':id')]: Scene.DataManagement,
     [urls.projectHomepage()]: Scene.ProjectHomepage,
-    [urls.projectSettings()]: Scene.ProjectSettings,
     [urls.projectApps()]: Scene.Apps,
     [urls.projectApp(':id')]: Scene.Apps,
     [urls.projectAppLogs(':id')]: Scene.Apps,
@@ -475,7 +442,6 @@ export const routes: Record<string, Scene> = {
     [urls.appHistory(':pluginConfigId')]: Scene.AppMetrics,
     [urls.appLogs(':pluginConfigId')]: Scene.AppMetrics,
     [urls.projectCreateFirst()]: Scene.ProjectCreateFirst,
-    [urls.organizationSettings()]: Scene.OrganizationSettings,
     [urls.organizationBilling()]: Scene.Billing,
     [urls.organizationCreateFirst()]: Scene.OrganizationCreateFirst,
     [urls.organizationCreationConfirm()]: Scene.OrganizationCreationConfirm,
@@ -488,7 +454,6 @@ export const routes: Record<string, Scene> = {
     [urls.asyncMigrationsFuture()]: Scene.AsyncMigrations,
     [urls.asyncMigrationsSettings()]: Scene.AsyncMigrations,
     [urls.deadLetterQueue()]: Scene.DeadLetterQueue,
-    [urls.mySettings()]: Scene.MySettings,
     [urls.toolbarLaunch()]: Scene.ToolbarLaunch,
     [urls.site(':url')]: Scene.Site,
     // Onboarding / setup routes
@@ -514,4 +479,5 @@ export const routes: Record<string, Scene> = {
     [urls.notebook(':shortId')]: Scene.Notebook,
     [urls.notebooks()]: Scene.Notebooks,
     [urls.canvas()]: Scene.Canvas,
+    [urls.settings(':section' as any)]: Scene.Settings,
 }
diff --git a/frontend/src/scenes/session-recordings/SessionRecordings.tsx b/frontend/src/scenes/session-recordings/SessionRecordings.tsx
index 7e44843bf4d926..fa3277a7283e16 100644
--- a/frontend/src/scenes/session-recordings/SessionRecordings.tsx
+++ b/frontend/src/scenes/session-recordings/SessionRecordings.tsx
@@ -11,7 +11,6 @@ import { humanFriendlyTabName, sessionRecordingsLogic } from './sessionRecording
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { IconSettings } from 'lib/lemon-ui/icons'
 import { router } from 'kea-router'
-import { openSessionRecordingSettingsDialog } from './settings/SessionRecordingSettings'
 import { SessionRecordingFilePlayback } from './file-playback/SessionRecordingFilePlayback'
 import { createPlaylist } from './playlist/playlistUtils'
 import { useAsyncHandler } from 'lib/hooks/useAsyncHandler'
@@ -25,6 +24,7 @@ import { authorizedUrlListLogic, AuthorizedUrlListType } from 'lib/components/Au
 import { SessionRecordingsPlaylist } from './playlist/SessionRecordingsPlaylist'
 import { NotebookSelectButton } from 'scenes/notebooks/NotebookSelectButton/NotebookSelectButton'
 import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { sidePanelSettingsLogic } from '~/layout/navigation-3000/sidepanel/panels/sidePanelSettingsLogic'
 
 export function SessionsRecordings(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
@@ -34,6 +34,7 @@ export function SessionsRecordings(): JSX.Element {
     const { guardAvailableFeature } = useActions(sceneLogic)
     const playlistsLogic = savedSessionRecordingPlaylistsLogic({ tab: ReplayTabs.Recent })
     const { playlists } = useValues(playlistsLogic)
+    const { openSettingsPanel } = useActions(sidePanelSettingsLogic)
 
     const theAuthorizedUrlsLogic = authorizedUrlListLogic({
         actionId: null,
@@ -67,10 +68,8 @@ export function SessionsRecordings(): JSX.Element {
                             <>
                                 <NotebookSelectButton
                                     resource={{
-                                        attrs: {
-                                            filters: filters,
-                                        },
                                         type: NotebookNodeType.RecordingPlaylist,
+                                        attrs: { filters: filters },
                                     }}
                                     type="secondary"
                                 />
@@ -101,7 +100,7 @@ export function SessionsRecordings(): JSX.Element {
                                 <LemonButton
                                     type="secondary"
                                     icon={<IconSettings />}
-                                    onClick={() => openSessionRecordingSettingsDialog()}
+                                    onClick={() => openSettingsPanel({ sectionId: 'project-replay' })}
                                 >
                                     Configure
                                 </LemonButton>
@@ -147,7 +146,7 @@ export function SessionsRecordings(): JSX.Element {
                         action={{
                             type: 'secondary',
                             icon: <IconSettings />,
-                            onClick: () => openSessionRecordingSettingsDialog(),
+                            onClick: () => openSettingsPanel({ sectionId: 'project-replay' }),
                             children: 'Configure',
                         }}
                     >
@@ -161,7 +160,7 @@ export function SessionsRecordings(): JSX.Element {
                         action={{
                             type: 'secondary',
                             icon: <IconSettings />,
-                            onClick: () => openSessionRecordingSettingsDialog(),
+                            onClick: () => openSettingsPanel({ sectionId: 'project-replay' }),
                             children: 'Configure',
                         }}
                         dismissKey={`session-recordings-authorized-domains-warning/${suggestions.join(',')}`}
diff --git a/frontend/src/scenes/session-recordings/detail/SessionRecordingDetail.tsx b/frontend/src/scenes/session-recordings/detail/SessionRecordingDetail.tsx
index c39a26afd90f86..721a17c735e9c4 100644
--- a/frontend/src/scenes/session-recordings/detail/SessionRecordingDetail.tsx
+++ b/frontend/src/scenes/session-recordings/detail/SessionRecordingDetail.tsx
@@ -31,7 +31,7 @@ export function SessionRecordingDetail({ id }: SessionRecordingDetailLogicProps
                 <div className="mb-4">
                     <LemonBanner type="info">
                         Session recordings are currently disabled for this project. To use this feature, please go to
-                        your <Link to={`${urls.projectSettings()}#recordings`}>project settings</Link> and enable it.
+                        your <Link to={`${urls.settings('project')}#recordings`}>project settings</Link> and enable it.
                     </LemonBanner>
                 </div>
             ) : null}
diff --git a/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackLogic.ts b/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackLogic.ts
index 8d4d1ebe5c878a..54ef82ab8da18b 100644
--- a/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackLogic.ts
+++ b/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackLogic.ts
@@ -77,6 +77,40 @@ export const parseExportedSessionRecording = (fileData: string): ExportedSession
     }
 }
 
+/**
+ * There's a race between loading the file causing the React component to be rendered that mounts the dataLogic
+ * and this logic loading the file and wanting to tell the logic about it
+ *
+ * This method waits for the dataLogic to be mounted and returns it
+ *
+ * in practice, it will only wait for 1-2 retries
+ * but a timeout is provided to avoid waiting forever when something breaks
+ */
+const waitForDataLogic = async (playerKey: string): Promise<BuiltLogic<any>> => {
+    const maxRetries = 20 // 2 seconds / 100 ms per retry
+    let retries = 0
+    let dataLogic = null
+
+    while (retries < maxRetries) {
+        dataLogic = sessionRecordingDataLogic.findMounted({
+            sessionRecordingId: '',
+            playerKey: playerKey,
+        })
+
+        if (dataLogic !== null) {
+            // eslint-disable-next-line no-console
+            console.log('found after retries', retries)
+            return dataLogic
+        }
+
+        // Wait for a short period before trying again
+        await new Promise((resolve) => setTimeout(resolve, 1))
+        retries++
+    }
+
+    throw new Error('Timeout reached: dataLogic is still null after 2 seconds')
+}
+
 export const sessionRecordingFilePlaybackLogic = kea<sessionRecordingFilePlaybackLogicType>([
     path(['scenes', 'session-recordings', 'detail', 'sessionRecordingDetailLogic']),
     connect({
@@ -125,12 +159,8 @@ export const sessionRecordingFilePlaybackLogic = kea<sessionRecordingFilePlaybac
     }),
 
     listeners(({ values }) => ({
-        loadFromFileSuccess: () => {
-            // Once we loaded the file we set the logic
-            const dataLogic = sessionRecordingDataLogic.findMounted({
-                sessionRecordingId: '',
-                playerKey: values.playerKey,
-            })
+        loadFromFileSuccess: async () => {
+            const dataLogic = await waitForDataLogic(values.playerKey)
 
             if (!dataLogic || !values.sessionRecording) {
                 return
diff --git a/frontend/src/scenes/session-recordings/filters/SimpleSessionRecordingsFilters.tsx b/frontend/src/scenes/session-recordings/filters/SimpleSessionRecordingsFilters.tsx
index e943988808d69d..372e813f6cbdde 100644
--- a/frontend/src/scenes/session-recordings/filters/SimpleSessionRecordingsFilters.tsx
+++ b/frontend/src/scenes/session-recordings/filters/SimpleSessionRecordingsFilters.tsx
@@ -86,7 +86,7 @@ export const SimpleSessionRecordingsFilters = ({
                     }}
                 />
                 {displayNameProperties.length === 0 && (
-                    <Link to={urls.projectSettings('person-display-name')}>
+                    <Link to={urls.settings('project', 'person-display-name')}>
                         <LemonButton type="tertiary" size="small" className="whitespace-nowrap" icon={<IconPlus />}>
                             Add person properties
                         </LemonButton>
diff --git a/frontend/src/scenes/session-recordings/player/RecordingNotFound.tsx b/frontend/src/scenes/session-recordings/player/RecordingNotFound.tsx
index 5715722ccb1f9c..d3b067a32eac43 100644
--- a/frontend/src/scenes/session-recordings/player/RecordingNotFound.tsx
+++ b/frontend/src/scenes/session-recordings/player/RecordingNotFound.tsx
@@ -10,7 +10,7 @@ export function RecordingNotFound(): JSX.Element {
                 <>
                     The requested recording doesn't seem to exist. The recording may still be processing, deleted due to
                     age or have not been enabled. Please check your{' '}
-                    <Link to={urls.projectSettings()}>project settings</Link> that recordings is turned on and enabled
+                    <Link to={urls.settings('project')}>project settings</Link> that recordings is turned on and enabled
                     for the domain in question.
                 </>
             }
diff --git a/frontend/src/scenes/session-recordings/player/SessionRecordingPlayer.tsx b/frontend/src/scenes/session-recordings/player/SessionRecordingPlayer.tsx
index d95fc4bdaee0a6..483ba76debca29 100644
--- a/frontend/src/scenes/session-recordings/player/SessionRecordingPlayer.tsx
+++ b/frontend/src/scenes/session-recordings/player/SessionRecordingPlayer.tsx
@@ -129,7 +129,9 @@ export function SessionRecordingPlayer(props: SessionRecordingPlayerProps): JSX.
             400: 'small',
             1000: 'medium',
         },
-        playerRef
+        {
+            ref: playerRef,
+        }
     )
 
     const [inspectorFocus, setInspectorFocus] = useState(false)
diff --git a/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx b/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
index d999f28bb83c95..97ca3071033274 100644
--- a/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
+++ b/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
@@ -8,6 +8,7 @@ import { useKeyHeld } from 'lib/hooks/useKeyHeld'
 import { IconSkipBackward } from 'lib/lemon-ui/icons'
 import clsx from 'clsx'
 import { dayjs } from 'lib/dayjs'
+import { TZLabel } from '@posthog/apps-common'
 
 export function Timestamp(): JSX.Element {
     const { logicProps, currentPlayerTime, currentTimestamp, sessionPlayerData } =
@@ -21,9 +22,9 @@ export function Timestamp(): JSX.Element {
 
     return (
         <div className="whitespace-nowrap mr-4">
-            <Tooltip overlay={dayjs(currentTimestamp).format('HH:mm:ss A')}>
-                {colonDelimitedDuration(startTimeSeconds, fixedUnits)}
-            </Tooltip>{' '}
+            <TZLabel time={dayjs(currentTimestamp)} showSeconds>
+                <span>{colonDelimitedDuration(startTimeSeconds, fixedUnits)}</span>
+            </TZLabel>{' '}
             / {colonDelimitedDuration(endTimeSeconds, fixedUnits)}
         </div>
     )
diff --git a/frontend/src/scenes/session-recordings/player/controller/Seekbar.tsx b/frontend/src/scenes/session-recordings/player/controller/Seekbar.tsx
index c2ed3c6ef3bc1a..56e771c9531d7f 100644
--- a/frontend/src/scenes/session-recordings/player/controller/Seekbar.tsx
+++ b/frontend/src/scenes/session-recordings/player/controller/Seekbar.tsx
@@ -63,9 +63,9 @@ export function Seekbar(): JSX.Element {
                             ))}
                         </div>
 
-                        {/* eslint-disable-next-line react/forbid-dom-props */}
                         <div
                             className="PlayerSeekbar__currentbar"
+                            // eslint-disable-next-line react/forbid-dom-props
                             style={{ width: `${Math.max(thumbLeftPos, 0)}px` }}
                         />
                         {/* eslint-disable-next-line react/forbid-dom-props */}
diff --git a/frontend/src/scenes/session-recordings/player/icons.tsx b/frontend/src/scenes/session-recordings/player/icons.tsx
index 6fff14ba753b5d..fa8a79d631150e 100644
--- a/frontend/src/scenes/session-recordings/player/icons.tsx
+++ b/frontend/src/scenes/session-recordings/player/icons.tsx
@@ -10,7 +10,7 @@ export function IconWindowOld({ value, className = '', size = 'medium' }: IconWi
     const shortValue = typeof value === 'number' ? value : String(value).charAt(0)
     return (
         <div className={clsx('flex justify-center items-center relative shrink-0', className)}>
-            <span className="absolute font-semibold" style={{ fontSize: size === 'medium' ? 8 : 6, marginTop: 2 }}>
+            <span className="absolute font-semibold mt-0.5" style={{ fontSize: size === 'medium' ? 8 : 6 }}>
                 {shortValue}
             </span>
             <svg
diff --git a/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.tsx b/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.tsx
index 2f1ad0175314db..3be6404017cb62 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.tsx
@@ -10,12 +10,12 @@ import { LemonButton } from '@posthog/lemon-ui'
 import './PlayerInspectorList.scss'
 import { range } from 'd3'
 import { teamLogic } from 'scenes/teamLogic'
-import { openSessionRecordingSettingsDialog } from 'scenes/session-recordings/settings/SessionRecordingSettings'
 import { playerSettingsLogic } from '../playerSettingsLogic'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { userLogic } from 'scenes/userLogic'
 import { PayGatePage } from 'lib/components/PayGatePage/PayGatePage'
 import { PlayerInspectorListItem } from './components/PlayerInspectorListItem'
+import { sidePanelSettingsLogic } from '~/layout/navigation-3000/sidepanel/panels/sidePanelSettingsLogic'
 
 function EmptyNetworkTab({
     captureNetworkLogOptIn,
@@ -24,6 +24,7 @@ function EmptyNetworkTab({
     captureNetworkLogOptIn: boolean
     captureNetworkFeatureAvailable: boolean
 }): JSX.Element {
+    const { openSettingsPanel } = useActions(sidePanelSettingsLogic)
     return !captureNetworkFeatureAvailable ? (
         <div className="p-4">
             <PayGatePage
@@ -46,7 +47,11 @@ function EmptyNetworkTab({
                     Capture performance events like network requests during the browser recording to understand things
                     like response times, page load times, and more.
                 </p>
-                <LemonButton type="primary" onClick={() => openSessionRecordingSettingsDialog()} targetBlank>
+                <LemonButton
+                    type="primary"
+                    onClick={() => openSettingsPanel({ sectionId: 'project-replay' })}
+                    targetBlank
+                >
                     Configure in settings
                 </LemonButton>
             </div>
@@ -57,6 +62,8 @@ function EmptyNetworkTab({
 }
 
 function EmptyConsoleTab({ captureConsoleLogOptIn }: { captureConsoleLogOptIn: boolean }): JSX.Element {
+    const { openSettingsPanel } = useActions(sidePanelSettingsLogic)
+
     return captureConsoleLogOptIn ? (
         <>No results found in this recording.</>
     ) : (
@@ -67,7 +74,11 @@ function EmptyConsoleTab({ captureConsoleLogOptIn }: { captureConsoleLogOptIn: b
                     Capture all console logs during the browser recording to get technical information on what was
                     occurring.
                 </p>
-                <LemonButton type="primary" onClick={() => openSessionRecordingSettingsDialog()} targetBlank>
+                <LemonButton
+                    type="primary"
+                    onClick={() => openSettingsPanel({ sectionId: 'project-replay' })}
+                    targetBlank
+                >
                     Configure in settings
                 </LemonButton>
             </div>
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
index 9df94720ef5413..49bb97485ad82d 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
@@ -169,7 +169,7 @@ export function ItemPerformanceEvent({
                                 {performanceSummaryCards.map(({ label, description, key, scoreBenchmarks }, index) => (
                                     <Fragment key={key}>
                                         {index !== 0 && <LemonDivider vertical dashed />}
-                                        <Tooltip isDefaultTooltip title={description}>
+                                        <Tooltip title={description}>
                                             <div className="flex-1 p-2 text-center">
                                                 <div className="text-sm">{label}</div>
                                                 <div className="text-lg font-semibold">
diff --git a/frontend/src/scenes/session-recordings/player/playerMetaLogic.ts b/frontend/src/scenes/session-recordings/player/playerMetaLogic.ts
index 9c55ee262de76e..534b324194276d 100644
--- a/frontend/src/scenes/session-recordings/player/playerMetaLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/playerMetaLogic.ts
@@ -84,6 +84,7 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
         currentWindowIndex: [
             (s) => [s.windowIds, s.currentSegment],
             (windowIds, currentSegment) => {
+                // eslint-disable-next-line no-constant-binary-expression
                 const index = windowIds.findIndex((windowId) => windowId === currentSegment?.windowId ?? -1)
 
                 return index === -1 ? 0 : index
diff --git a/frontend/src/scenes/session-recordings/player/rrweb/__snapshots__/index.test.ts.snap b/frontend/src/scenes/session-recordings/player/rrweb/__snapshots__/index.test.ts.snap
index ecae917dffa9b3..96d29cfbaaff86 100644
--- a/frontend/src/scenes/session-recordings/player/rrweb/__snapshots__/index.test.ts.snap
+++ b/frontend/src/scenes/session-recordings/player/rrweb/__snapshots__/index.test.ts.snap
@@ -1,9 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CorsPlugin should replace font urls in links 1`] = `"https://replay.ph-proxy.com/proxy?url=https://app.posthog.com/fonts/my-font.woff2?t=1234"`;
-
-exports[`CorsPlugin should replace font urls in links 2`] = `"https://replay.ph-proxy.com/proxy?url=https://app.posthog.com/fonts/my-font.ttf"`;
-
 exports[`CorsPlugin should replace font urls in stylesheets 1`] = `"@font-face { font-display: fallback; font-family: "Roboto Condensed"; font-weight: 400; font-style: normal; src: url("https://replay.ph-proxy.com/proxy?url=https://posthog.com/assets/fonts/roboto/roboto_condensed_reg-webfont.woff2?11012022") format("woff2"), url("https://replay.ph-proxy.com/proxy?url=https://posthog.com/assets/fonts/roboto/roboto_condensed_reg-webfont.woff?11012022")"`;
 
 exports[`CorsPlugin should replace font urls in stylesheets 2`] = `"url("https://replay.ph-proxy.com/proxy?url=https://app.posthog.com/fonts/my-font.woff2")"`;
diff --git a/frontend/src/scenes/session-recordings/player/rrweb/index.test.ts b/frontend/src/scenes/session-recordings/player/rrweb/index.test.ts
index da2684cf38e5af..ae4694b15112fb 100644
--- a/frontend/src/scenes/session-recordings/player/rrweb/index.test.ts
+++ b/frontend/src/scenes/session-recordings/player/rrweb/index.test.ts
@@ -1,6 +1,9 @@
 import { CorsPlugin } from '.'
 
 describe('CorsPlugin', () => {
+    it.each(['https://some-external.js'])('should replace JS urls', (jsUrl) => {
+        expect(CorsPlugin._replaceJSUrl(jsUrl)).toEqual(`https://replay.ph-proxy.com/proxy?url=${jsUrl}`)
+    })
     it.each([
         `@font-face { font-display: fallback; font-family: "Roboto Condensed"; font-weight: 400; font-style: normal; src: url("https://posthog.com/assets/fonts/roboto/roboto_condensed_reg-webfont.woff2?11012022") format("woff2"), url("https://posthog.com/assets/fonts/roboto/roboto_condensed_reg-webfont.woff?11012022")`,
         `url("https://app.posthog.com/fonts/my-font.woff2")`,
@@ -11,7 +14,7 @@ describe('CorsPlugin', () => {
     it.each(['https://app.posthog.com/fonts/my-font.woff2?t=1234', 'https://app.posthog.com/fonts/my-font.ttf'])(
         'should replace font urls in links',
         (content: string) => {
-            expect(CorsPlugin._replaceFontUrl(content)).toMatchSnapshot()
+            expect(CorsPlugin._replaceFontUrl(content)).toEqual(`https://replay.ph-proxy.com/proxy?url=${content}`)
         }
     )
 
@@ -21,4 +24,12 @@ describe('CorsPlugin', () => {
             expect(CorsPlugin._replaceFontUrl(content)).toEqual(content)
         }
     )
+
+    it('can replace a modulepreload js link', () => {
+        const el = document.createElement('link')
+        el.setAttribute('rel', 'modulepreload')
+        el.href = 'https://app.posthog.com/my-image.js'
+        CorsPlugin.onBuild?.(el, { id: 1, replayer: null as unknown as any })
+        expect(el.href).toEqual(`https://replay.ph-proxy.com/proxy?url=https://app.posthog.com/my-image.js`)
+    })
 })
diff --git a/frontend/src/scenes/session-recordings/player/rrweb/index.ts b/frontend/src/scenes/session-recordings/player/rrweb/index.ts
index f2032d070d4a0a..72f65e69c9551b 100644
--- a/frontend/src/scenes/session-recordings/player/rrweb/index.ts
+++ b/frontend/src/scenes/session-recordings/player/rrweb/index.ts
@@ -5,6 +5,7 @@ const PROXY_URL = 'https://replay.ph-proxy.com' as const
 export const CorsPlugin: ReplayPlugin & {
     _replaceFontCssUrls: (value: string) => string
     _replaceFontUrl: (value: string) => string
+    _replaceJSUrl: (value: string) => string
 } = {
     _replaceFontCssUrls: (value: string): string => {
         return value.replace(
@@ -17,6 +18,10 @@ export const CorsPlugin: ReplayPlugin & {
         return value.replace(/^(https:\/\/\S*(?:.eot|.woff2|.ttf|.woff)\S*)$/i, `${PROXY_URL}/proxy?url=$1`)
     },
 
+    _replaceJSUrl: (value: string): string => {
+        return value.replace(/^(https:\/\/\S*(?:.js)\S*)$/i, `${PROXY_URL}/proxy?url=$1`)
+    },
+
     onBuild: (node) => {
         if (node.nodeName === 'STYLE') {
             const styleElement = node as HTMLStyleElement
@@ -25,7 +30,20 @@ export const CorsPlugin: ReplayPlugin & {
 
         if (node.nodeName === 'LINK') {
             const linkElement = node as HTMLLinkElement
-            linkElement.href = CorsPlugin._replaceFontUrl(linkElement.href)
+            const href = linkElement.href
+            if (!href) {
+                return
+            }
+            if (linkElement.getAttribute('rel') == 'modulepreload') {
+                linkElement.href = CorsPlugin._replaceJSUrl(href)
+            } else {
+                linkElement.href = CorsPlugin._replaceFontUrl(href)
+            }
+        }
+
+        if (node.nodeName === 'SCRIPT') {
+            const scriptElement = node as HTMLScriptElement
+            scriptElement.src = CorsPlugin._replaceJSUrl(scriptElement.src)
         }
     },
 }
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingDataLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingDataLogic.ts
index 5607d4865a4439..d9028d9034c1c3 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingDataLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingDataLogic.ts
@@ -21,7 +21,7 @@ import {
     SessionRecordingUsageType,
 } from '~/types'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { eventWithTime } from '@rrweb/types'
+import { EventType, eventWithTime } from '@rrweb/types'
 import { Dayjs, dayjs } from 'lib/dayjs'
 import type { sessionRecordingDataLogicType } from './sessionRecordingDataLogicType'
 import { chainToElements } from 'lib/utils/elements-chain'
@@ -311,7 +311,7 @@ export const sessionRecordingDataLogic = kea<sessionRecordingDataLogicType>([
                 if (!values.sessionPlayerMetaData) {
                     return null
                 }
-                breakpoint(100)
+                await breakpoint(100)
                 await api.recordings.persist(props.sessionRecordingId)
 
                 return {
@@ -600,6 +600,42 @@ export const sessionRecordingDataLogic = kea<sessionRecordingDataLogicType>([
             },
         ],
 
+        snapshotsInvalid: [
+            (s, p) => [s.snapshotsByWindowId, s.fullyLoaded, p.sessionRecordingId],
+            (snapshotsByWindowId, fullyLoaded, sessionRecordingId): boolean => {
+                if (!fullyLoaded) {
+                    return false
+                }
+
+                const windowsHaveFullSnapshot = Object.entries(snapshotsByWindowId).reduce(
+                    (acc, [windowId, events]) => {
+                        acc[`window-id-${windowId}-has-full-snapshot`] = events.some(
+                            (event) => event.type === EventType.FullSnapshot
+                        )
+                        return acc
+                    },
+                    {}
+                )
+                const anyWindowMissingFullSnapshot = !Object.values(windowsHaveFullSnapshot).some((x) => x)
+                const everyWindowMissingFullSnapshot = !Object.values(windowsHaveFullSnapshot).every((x) => x)
+
+                if (everyWindowMissingFullSnapshot) {
+                    // video is definitely unplayable
+                    posthog.capture('recording_has_no_full_snapshot', {
+                        ...windowsHaveFullSnapshot,
+                        sessionId: sessionRecordingId,
+                    })
+                } else if (anyWindowMissingFullSnapshot) {
+                    posthog.capture('recording_window_missing_full_snapshot', {
+                        ...windowsHaveFullSnapshot,
+                        sessionId: sessionRecordingId,
+                    })
+                }
+
+                return everyWindowMissingFullSnapshot
+            },
+        ],
+
         bufferedToTime: [
             (s) => [s.segments],
             (segments): number | null => {
diff --git a/frontend/src/scenes/session-recordings/saved-playlists/SavedSessionRecordingPlaylists.tsx b/frontend/src/scenes/session-recordings/saved-playlists/SavedSessionRecordingPlaylists.tsx
index ebbdfa03727f8f..e5a8a07ba2eec3 100644
--- a/frontend/src/scenes/session-recordings/saved-playlists/SavedSessionRecordingPlaylists.tsx
+++ b/frontend/src/scenes/session-recordings/saved-playlists/SavedSessionRecordingPlaylists.tsx
@@ -6,7 +6,7 @@ import { LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { urls } from 'scenes/urls'
 import { createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { DateFilter } from 'lib/components/DateFilter/DateFilter'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { TZLabel } from '@posthog/apps-common'
 import { SavedSessionRecordingPlaylistsEmptyState } from 'scenes/session-recordings/saved-playlists/SavedSessionRecordingPlaylistsEmptyState'
 import clsx from 'clsx'
diff --git a/frontend/src/scenes/settings/Settings.scss b/frontend/src/scenes/settings/Settings.scss
new file mode 100644
index 00000000000000..84bc262bb70161
--- /dev/null
+++ b/frontend/src/scenes/settings/Settings.scss
@@ -0,0 +1,42 @@
+.Settings {
+    display: flex;
+    gap: 2rem;
+    align-items: start;
+
+    .Settings__sections {
+        flex-shrink: 0;
+        position: sticky;
+        max-width: 20rem;
+        min-width: 14rem;
+        width: 20%;
+        top: 0.5rem;
+
+        .posthog-3000 & {
+            top: 4rem;
+        }
+
+        .SidePanel3000 & {
+            top: 0;
+        }
+    }
+
+    &--compact {
+        gap: 0;
+
+        flex-direction: column;
+
+        .Settings__sections {
+            width: 100%;
+            min-width: 100%;
+            max-width: 100%;
+            position: relative;
+        }
+    }
+
+    margin-top: 1rem;
+
+    .posthog-3000 &,
+    .LemonModal & {
+        margin-top: 0;
+    }
+}
diff --git a/frontend/src/scenes/settings/Settings.tsx b/frontend/src/scenes/settings/Settings.tsx
new file mode 100644
index 00000000000000..80097630a04869
--- /dev/null
+++ b/frontend/src/scenes/settings/Settings.tsx
@@ -0,0 +1,142 @@
+import { LemonBanner, LemonButton, LemonDivider } from '@posthog/lemon-ui'
+import { IconChevronRight, IconLink } from 'lib/lemon-ui/icons'
+import { SettingsLogicProps, settingsLogic } from './settingsLogic'
+import { useActions, useValues } from 'kea'
+import { SettingLevelIds } from './types'
+import clsx from 'clsx'
+import { capitalizeFirstLetter } from 'lib/utils'
+import { useResizeBreakpoints } from 'lib/hooks/useResizeObserver'
+import { teamLogic } from 'scenes/teamLogic'
+
+import './Settings.scss'
+import { NotFound } from 'lib/components/NotFound'
+
+export function Settings({
+    hideSections = false,
+    ...props
+}: SettingsLogicProps & { hideSections?: boolean }): JSX.Element {
+    const { selectedSectionId, selectedSection, selectedLevel, sections, isCompactNavigationOpen } = useValues(
+        settingsLogic(props)
+    )
+    const { selectSection, selectLevel, openCompactNavigation } = useActions(settingsLogic(props))
+    const { currentTeam } = useValues(teamLogic)
+
+    const { ref, size } = useResizeBreakpoints(
+        {
+            0: 'small',
+            700: 'medium',
+        },
+        {
+            initialSize: 'medium',
+        }
+    )
+
+    const isCompact = size === 'small'
+
+    const showSections = isCompact ? isCompactNavigationOpen : true
+
+    return (
+        <div className={clsx('Settings flex', isCompact && 'Settings--compact')} ref={ref}>
+            {hideSections ? null : (
+                <>
+                    {showSections ? (
+                        <div className="Settings__sections">
+                            <ul className="space-y-px">
+                                {SettingLevelIds.map((level) => (
+                                    <li key={level} className="space-y-px">
+                                        <LemonButton
+                                            onClick={() => selectLevel(level)}
+                                            size="small"
+                                            fullWidth
+                                            active={selectedLevel === level && !selectedSectionId}
+                                        >
+                                            <span
+                                                className={clsx(
+                                                    'text-muted-alt',
+                                                    level === selectedLevel && 'font-bold'
+                                                )}
+                                            >
+                                                {capitalizeFirstLetter(level)}
+                                            </span>
+                                        </LemonButton>
+
+                                        <ul className="space-y-px">
+                                            {sections
+                                                .filter((x) => x.level === level)
+                                                .map((section) => (
+                                                    <li key={section.id} className="pl-4">
+                                                        <LemonButton
+                                                            onClick={() => selectSection(section.id)}
+                                                            size="small"
+                                                            fullWidth
+                                                            active={selectedSectionId === section.id}
+                                                        >
+                                                            {section.title}
+                                                        </LemonButton>
+                                                    </li>
+                                                ))}
+                                        </ul>
+                                    </li>
+                                ))}
+                            </ul>
+                        </div>
+                    ) : (
+                        <LemonButton fullWidth sideIcon={<IconChevronRight />} onClick={() => openCompactNavigation()}>
+                            {capitalizeFirstLetter(selectedLevel)}
+                            {selectedSection ? ` / ${selectedSection.title}` : null}
+                        </LemonButton>
+                    )}
+                    {isCompact ? <LemonDivider /> : null}
+                </>
+            )}
+
+            <div className="flex-1 w-full space-y-2 overflow-hidden">
+                {!hideSections && selectedLevel === 'project' && (
+                    <LemonBanner type="info">
+                        These settings only apply to the current project{' '}
+                        {currentTeam?.name ? (
+                            <>
+                                (<b>{currentTeam.name}</b>)
+                            </>
+                        ) : null}
+                        .
+                    </LemonBanner>
+                )}
+
+                <SettingsRenderer {...props} />
+            </div>
+        </div>
+    )
+}
+
+function SettingsRenderer(props: SettingsLogicProps): JSX.Element {
+    const { settings } = useValues(settingsLogic(props))
+    const { selectSetting } = useActions(settingsLogic(props))
+
+    return (
+        <div className="space-y-8">
+            {settings.length ? (
+                settings.map((x) => (
+                    <div key={x.id} className="relative">
+                        <div
+                            id={x.id}
+                            className="absolute" // eslint-disable-next-line react/forbid-dom-props
+                            style={{
+                                marginTop: '-3.5rem', // Account for top bar when scrolling to anchor
+                            }}
+                        />
+                        <h2 className="flex gap-2 items-center">
+                            {x.title}{' '}
+                            <LemonButton icon={<IconLink />} size="small" onClick={() => selectSetting?.(x.id)} />
+                        </h2>
+                        {x.description && <p>{x.description}</p>}
+
+                        {x.component}
+                    </div>
+                ))
+            ) : (
+                <NotFound object="setting" />
+            )}
+        </div>
+    )
+}
diff --git a/frontend/src/scenes/settings/SettingsMap.tsx b/frontend/src/scenes/settings/SettingsMap.tsx
new file mode 100644
index 00000000000000..f5015ea7f56811
--- /dev/null
+++ b/frontend/src/scenes/settings/SettingsMap.tsx
@@ -0,0 +1,355 @@
+import { ChangePassword } from './user/ChangePassword'
+import { OptOutCapture } from './user/OptOutCapture'
+import { PersonalAPIKeys } from './user/PersonalAPIKeys'
+import { TwoFactorAuthentication } from './user/TwoFactorAuthentication'
+import { UpdateEmailPreferences } from './user/UpdateEmailPreferences'
+import { UserDetails } from './user/UserDetails'
+import { OrganizationDisplayName } from './organization/OrgDisplayName'
+import { Invites } from './organization/Invites'
+import { Members } from './organization/Members'
+import { VerifiedDomains } from './organization/VerifiedDomains/VerifiedDomains'
+import { OrganizationEmailPreferences } from './organization/OrgEmailPreferences'
+import { OrganizationDangerZone } from './organization/OrganizationDangerZone'
+import { PermissionsGrid } from './organization/Permissions/PermissionsGrid'
+import {
+    Bookmarklet,
+    ProjectDisplayName,
+    ProjectTimezone,
+    ProjectToolbarURLs,
+    ProjectVariables,
+    WebSnippet,
+} from './project/ProjectSettings'
+import { AutocaptureSettings, ExceptionAutocaptureSettings } from './project/AutocaptureSettings'
+import { DataAttributes } from './project/DataAttributes'
+import { ReplayAuthorizedDomains, ReplayCostControl, ReplayGeneral } from './project/SessionRecordingSettings'
+import { ProjectDangerZone } from './project/ProjectDangerZone'
+import { ProjectAccessControl } from './project/ProjectAccessControl'
+import { ProjectAccountFiltersSetting } from './project/TestAccountFiltersConfig'
+import { CorrelationConfig } from './project/CorrelationConfig'
+import { PersonDisplayNameProperties } from './project/PersonDisplayNameProperties'
+import { IPCapture } from './project/IPCapture'
+import { WebhookIntegration } from './project/WebhookIntegration'
+import { SlackIntegration } from './project/SlackIntegration'
+import { PathCleaningFiltersConfig } from './project/PathCleaningFiltersConfig'
+import { GroupAnalyticsConfig } from './project/GroupAnalyticsConfig'
+import { SurveySettings } from './project/SurveySettings'
+import { SettingPersonsOnEvents } from './project/SettingPersonsOnEvents'
+import { SettingSection } from './types'
+
+export const SettingsMap: SettingSection[] = [
+    // PROJECT
+    {
+        level: 'project',
+        id: 'project-details',
+        title: 'General',
+        settings: [
+            {
+                id: 'display-name',
+                title: 'Display name',
+                component: <ProjectDisplayName />,
+            },
+            {
+                id: 'snippet',
+                title: 'Web snippet',
+                component: <WebSnippet />,
+            },
+            {
+                id: 'bookmarklet',
+                title: 'Bookmarklet',
+                component: <Bookmarklet />,
+            },
+            {
+                id: 'variables',
+                title: 'Project ID',
+                component: <ProjectVariables />,
+            },
+        ],
+    },
+    {
+        level: 'project',
+        id: 'project-autocapture',
+        title: 'Autocapture',
+
+        settings: [
+            {
+                id: 'autocapture',
+                title: 'Autocapture',
+                component: <AutocaptureSettings />,
+            },
+            {
+                id: 'exception-autocapture',
+                title: 'Exception Autocapture',
+                component: <ExceptionAutocaptureSettings />,
+            },
+            {
+                id: 'autocapture-data-attributes',
+                title: 'Data attributes',
+                component: <DataAttributes />,
+            },
+        ],
+    },
+
+    {
+        level: 'project',
+        id: 'project-product-analytics',
+        title: 'Product Analytics',
+        settings: [
+            {
+                id: 'date-and-time',
+                title: 'Date & Time',
+                component: <ProjectTimezone />,
+            },
+            {
+                id: 'internal-user-filtering',
+                title: 'Filter our internal and test users',
+                component: <ProjectAccountFiltersSetting />,
+            },
+            {
+                id: 'correlation-analysis',
+                title: 'Correlation analysis exclusions',
+                component: <CorrelationConfig />,
+            },
+            {
+                id: 'person-display-name',
+                title: 'Person display name',
+                component: <PersonDisplayNameProperties />,
+            },
+            {
+                id: 'path-cleaning',
+                title: 'Path cleaning rules',
+                component: <PathCleaningFiltersConfig />,
+            },
+            {
+                id: 'datacapture',
+                title: 'IP Data capture configuration',
+                component: <IPCapture />,
+            },
+            {
+                id: 'group-analytics',
+                title: 'Group Analytics',
+                component: <GroupAnalyticsConfig />,
+            },
+            {
+                id: 'persons-on-events',
+                title: 'Persons on events (beta)',
+                component: <SettingPersonsOnEvents />,
+            },
+        ],
+    },
+
+    {
+        level: 'project',
+        id: 'project-replay',
+        title: 'Session Replay',
+        settings: [
+            {
+                id: 'replay',
+                title: 'Session Replay',
+                component: <ReplayGeneral />,
+            },
+            {
+                id: 'replay-authorized-domains',
+                title: 'Authorized Domains for Replay',
+                component: <ReplayAuthorizedDomains />,
+            },
+            {
+                id: 'replay-ingestion',
+                title: 'Ingestion controls',
+                component: <ReplayCostControl />,
+                flag: 'SESSION_RECORDING_SAMPLING',
+            },
+        ],
+    },
+    {
+        level: 'project',
+        id: 'project-surveys',
+        title: 'Surveys',
+        settings: [
+            {
+                id: 'surveys-interface',
+                title: 'Surveys web interface',
+                component: <SurveySettings />,
+            },
+        ],
+    },
+
+    {
+        level: 'project',
+        id: 'project-toolbar',
+        title: 'Toolbar',
+        settings: [
+            {
+                id: 'authorized-toolbar-urls',
+                title: 'Authorized Toolbar URLs',
+                component: <ProjectToolbarURLs />,
+            },
+        ],
+    },
+    {
+        level: 'project',
+        id: 'project-integrations',
+        title: 'Integrations',
+        settings: [
+            {
+                id: 'integration-webhooks',
+                title: 'Webhook integration',
+                component: <WebhookIntegration />,
+            },
+            {
+                id: 'integration-slack',
+                title: 'Slack integration',
+                component: <SlackIntegration />,
+            },
+        ],
+    },
+    {
+        level: 'project',
+        id: 'project-rbac',
+        title: 'Access control',
+        settings: [
+            {
+                id: 'project-rbac',
+                title: 'Access Control',
+                component: <ProjectAccessControl />,
+            },
+        ],
+    },
+    {
+        level: 'project',
+        id: 'project-danger-zone',
+        title: 'Danger zone',
+        settings: [
+            {
+                id: 'project-delete',
+                title: 'Delete project',
+                component: <ProjectDangerZone />,
+            },
+        ],
+    },
+
+    // ORGANIZATION
+    {
+        level: 'organization',
+        id: 'organization-details',
+        title: 'General',
+        settings: [
+            {
+                id: 'organization-display-name',
+                title: 'Display name',
+                component: <OrganizationDisplayName />,
+            },
+        ],
+    },
+    {
+        level: 'organization',
+        id: 'organization-members',
+        title: 'Members',
+        settings: [
+            {
+                id: 'invites',
+                title: 'Pending Invites',
+                component: <Invites />,
+            },
+            {
+                id: 'members',
+                title: 'Members',
+                component: <Members />,
+            },
+            {
+                id: 'email-members',
+                title: 'Notification preferences',
+                component: <OrganizationEmailPreferences />,
+            },
+        ],
+    },
+    {
+        level: 'organization',
+        id: 'organization-authentication',
+        title: 'Authentication Domains & SSO',
+        settings: [
+            {
+                id: 'authentication-domains',
+                title: 'Authentication Domains',
+                component: <VerifiedDomains />,
+            },
+        ],
+    },
+    {
+        level: 'organization',
+        id: 'organization-rbac',
+        title: 'Role-based access',
+        flag: 'ROLE_BASED_ACCESS',
+        settings: [
+            {
+                id: 'organization-rbac',
+                title: 'Role-based access',
+                component: <PermissionsGrid />,
+            },
+        ],
+    },
+    {
+        level: 'organization',
+        id: 'organization-danger-zone',
+        title: 'Danger zone',
+        settings: [
+            {
+                id: 'organization-delete',
+                title: 'Delete organization',
+                component: <OrganizationDangerZone />,
+            },
+        ],
+    },
+
+    // USER
+    {
+        level: 'user',
+        id: 'user-profile',
+        title: 'Profile',
+        settings: [
+            {
+                id: 'details',
+                title: 'Details',
+                component: <UserDetails />,
+            },
+            {
+                id: 'change-password',
+                title: 'Change password',
+                component: <ChangePassword />,
+            },
+            {
+                id: '2fa',
+                title: 'Two-factor authentication',
+                component: <TwoFactorAuthentication />,
+            },
+        ],
+    },
+    {
+        level: 'user',
+        id: 'user-api-keys',
+        title: 'Personal API Keys',
+        settings: [
+            {
+                id: 'personal-api-keys',
+                title: 'Personal API keys',
+                component: <PersonalAPIKeys />,
+            },
+        ],
+    },
+    {
+        level: 'user',
+        id: 'user-notifications',
+        title: 'Notifications',
+        settings: [
+            {
+                id: 'notifications',
+                title: 'Notifications',
+                component: <UpdateEmailPreferences />,
+            },
+            {
+                id: 'optout',
+                title: 'Anonymize Data Collection',
+                component: <OptOutCapture />,
+            },
+        ],
+    },
+]
diff --git a/frontend/src/scenes/settings/SettingsScene.stories.tsx b/frontend/src/scenes/settings/SettingsScene.stories.tsx
new file mode 100644
index 00000000000000..bcfb160b24badd
--- /dev/null
+++ b/frontend/src/scenes/settings/SettingsScene.stories.tsx
@@ -0,0 +1,49 @@
+import { Meta } from '@storybook/react'
+import { mswDecorator } from '~/mocks/browser'
+import preflightJson from '~/mocks/fixtures/_preflight.json'
+import { App } from 'scenes/App'
+import { useEffect } from 'react'
+import { router } from 'kea-router'
+import { urls } from 'scenes/urls'
+
+const meta: Meta = {
+    title: 'Scenes-Other/Settings',
+    parameters: {
+        layout: 'fullscreen',
+        viewMode: 'story',
+        mockDate: '2023-05-25',
+    },
+    decorators: [
+        mswDecorator({
+            get: {
+                '/_preflight': {
+                    ...preflightJson,
+                    cloud: true,
+                    realm: 'cloud',
+                },
+            },
+        }),
+    ],
+}
+export default meta
+
+export function SettingsProject(): JSX.Element {
+    useEffect(() => {
+        router.actions.push(urls.settings('project'))
+    }, [])
+    return <App />
+}
+
+export function SettingsUser(): JSX.Element {
+    useEffect(() => {
+        router.actions.push(urls.settings('user'))
+    }, [])
+    return <App />
+}
+
+export function SettingsOrganization(): JSX.Element {
+    useEffect(() => {
+        router.actions.push(urls.settings('organization'))
+    }, [])
+    return <App />
+}
diff --git a/frontend/src/scenes/settings/SettingsScene.tsx b/frontend/src/scenes/settings/SettingsScene.tsx
new file mode 100644
index 00000000000000..29695feeefa370
--- /dev/null
+++ b/frontend/src/scenes/settings/SettingsScene.tsx
@@ -0,0 +1,18 @@
+import { SceneExport } from 'scenes/sceneTypes'
+import { useValues } from 'kea'
+import { settingsSceneLogic } from './settingsSceneLogic'
+import { useAnchor } from 'lib/hooks/useAnchor'
+import { router } from 'kea-router'
+import { Settings } from './Settings'
+
+export const scene: SceneExport = {
+    component: SettingsScene,
+    logic: settingsSceneLogic,
+}
+
+export function SettingsScene(): JSX.Element {
+    const { location } = useValues(router)
+    useAnchor(location.hash)
+
+    return <Settings logicKey={'settingsScene'} />
+}
diff --git a/frontend/src/scenes/organization/Settings/InviteModal.scss b/frontend/src/scenes/settings/organization/InviteModal.scss
similarity index 100%
rename from frontend/src/scenes/organization/Settings/InviteModal.scss
rename to frontend/src/scenes/settings/organization/InviteModal.scss
diff --git a/frontend/src/scenes/organization/Settings/InviteModal.tsx b/frontend/src/scenes/settings/organization/InviteModal.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/InviteModal.tsx
rename to frontend/src/scenes/settings/organization/InviteModal.tsx
diff --git a/frontend/src/scenes/organization/Settings/Invites.tsx b/frontend/src/scenes/settings/organization/Invites.tsx
similarity index 92%
rename from frontend/src/scenes/organization/Settings/Invites.tsx
rename to frontend/src/scenes/settings/organization/Invites.tsx
index 4fe50084b5b951..41be87d491cf6a 100644
--- a/frontend/src/scenes/organization/Settings/Invites.tsx
+++ b/frontend/src/scenes/settings/organization/Invites.tsx
@@ -97,23 +97,19 @@ export function Invites(): JSX.Element {
     ]
 
     return (
-        <div>
-            <h2 id="invites" className="subtitle" style={{ justifyContent: 'space-between' }}>
-                Pending Invites
-                <LemonButton type="primary" onClick={showInviteModal} data-attr="invite-teammate-button">
-                    Invite team member
-                </LemonButton>
-            </h2>
+        <div className="space-y-4">
             {!preflight?.email_service_available && <EmailUnavailableMessage />}
             <LemonTable
                 dataSource={invites}
                 columns={columns}
                 rowKey="id"
                 loading={invitesLoading}
-                style={{ marginTop: '1rem' }}
                 data-attr="invites-table"
                 emptyState="There are no outstanding invitations. You can invite another team member above."
             />
+            <LemonButton type="primary" onClick={showInviteModal} data-attr="invite-teammate-button">
+                Invite team member
+            </LemonButton>
         </div>
     )
 }
diff --git a/frontend/src/scenes/organization/Settings/Members.tsx b/frontend/src/scenes/settings/organization/Members.tsx
similarity index 96%
rename from frontend/src/scenes/organization/Settings/Members.tsx
rename to frontend/src/scenes/settings/organization/Members.tsx
index 077eeb24ab8198..ea468523c95e29 100644
--- a/frontend/src/scenes/organization/Settings/Members.tsx
+++ b/frontend/src/scenes/settings/organization/Members.tsx
@@ -1,7 +1,6 @@
 import { useValues, useActions } from 'kea'
-import { membersLogic } from './membersLogic'
 import { OrganizationMembershipLevel } from 'lib/constants'
-import { OrganizationMemberType, UserType } from '~/types'
+import { OrganizationMemberType } from '~/types'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { userLogic } from 'scenes/userLogic'
 import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
@@ -18,11 +17,11 @@ import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { LemonInput, LemonModal, LemonSwitch } from '@posthog/lemon-ui'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
-import { Row } from 'antd'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { useState } from 'react'
 import { Setup2FA } from 'scenes/authentication/Setup2FA'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 
 function ActionsComponent(_: any, member: OrganizationMemberType): JSX.Element | null {
     const { user } = useValues(userLogic)
@@ -133,18 +132,18 @@ function ActionsComponent(_: any, member: OrganizationMemberType): JSX.Element |
     )
 }
 
-export interface MembersProps {
-    /** Currently logged-in user. */
-    user: UserType
-}
-
-export function Members({ user }: MembersProps): JSX.Element {
+export function Members(): JSX.Element | null {
     const { filteredMembers, membersLoading, search } = useValues(membersLogic)
     const { currentOrganization } = useValues(organizationLogic)
     const { setSearch } = useActions(membersLogic)
     const { updateOrganization } = useActions(organizationLogic)
     const [is2FAModalVisible, set2FAModalVisible] = useState(false)
     const { preflight } = useValues(preflightLogic)
+    const { user } = useValues(userLogic)
+
+    if (!user) {
+        return null
+    }
 
     const columns: LemonTableColumns<OrganizationMemberType> = [
         {
@@ -262,8 +261,7 @@ export function Members({ user }: MembersProps): JSX.Element {
 
     return (
         <>
-            <h2 className="subtitle">Members</h2>
-            <Row align="middle" justify="space-between">
+            <div className="flex items-center justify-between">
                 <LemonInput type="search" placeholder="Search for members" value={search} onChange={setSearch} />
                 <LemonSwitch
                     label="Enforce 2FA"
@@ -271,7 +269,7 @@ export function Members({ user }: MembersProps): JSX.Element {
                     checked={currentOrganization?.enforce_2fa ? true : false}
                     onChange={(enforce_2fa) => updateOrganization({ enforce_2fa })}
                 />
-            </Row>
+            </div>
 
             <LemonTable
                 dataSource={filteredMembers}
diff --git a/frontend/src/scenes/settings/organization/OrgDisplayName.tsx b/frontend/src/scenes/settings/organization/OrgDisplayName.tsx
new file mode 100644
index 00000000000000..2b65751496e6c1
--- /dev/null
+++ b/frontend/src/scenes/settings/organization/OrgDisplayName.tsx
@@ -0,0 +1,32 @@
+import { LemonInput, LemonButton } from '@posthog/lemon-ui'
+import { useValues, useActions } from 'kea'
+import { useRestrictedArea } from 'lib/components/RestrictedArea'
+import { OrganizationMembershipLevel } from 'lib/constants'
+import { useState } from 'react'
+import { organizationLogic } from 'scenes/organizationLogic'
+
+export function OrganizationDisplayName(): JSX.Element {
+    const { currentOrganization, currentOrganizationLoading } = useValues(organizationLogic)
+    const { updateOrganization } = useActions(organizationLogic)
+
+    const [name, setName] = useState(currentOrganization?.name || '')
+
+    const isRestricted = !!useRestrictedArea({ minimumAccessLevel: OrganizationMembershipLevel.Admin })
+
+    return (
+        <div className="max-w-160">
+            <LemonInput className="mb-4" value={name} onChange={setName} disabled={isRestricted} />
+            <LemonButton
+                type="primary"
+                onClick={(e) => {
+                    e.preventDefault()
+                    updateOrganization({ name })
+                }}
+                disabled={isRestricted || !name || !currentOrganization || name === currentOrganization.name}
+                loading={currentOrganizationLoading}
+            >
+                Rename Organization
+            </LemonButton>
+        </div>
+    )
+}
diff --git a/frontend/src/scenes/settings/organization/OrgEmailPreferences.tsx b/frontend/src/scenes/settings/organization/OrgEmailPreferences.tsx
new file mode 100644
index 00000000000000..e2e4a1524e9e8d
--- /dev/null
+++ b/frontend/src/scenes/settings/organization/OrgEmailPreferences.tsx
@@ -0,0 +1,25 @@
+import { LemonSwitch } from '@posthog/lemon-ui'
+import { useValues, useActions } from 'kea'
+import { useRestrictedArea } from 'lib/components/RestrictedArea'
+import { OrganizationMembershipLevel } from 'lib/constants'
+import { organizationLogic } from 'scenes/organizationLogic'
+
+export function OrganizationEmailPreferences(): JSX.Element {
+    const { currentOrganization } = useValues(organizationLogic)
+    const { updateOrganization } = useActions(organizationLogic)
+
+    const isRestricted = !!useRestrictedArea({ minimumAccessLevel: OrganizationMembershipLevel.Admin })
+
+    return (
+        <LemonSwitch
+            data-attr="is-member-join-email-enabled-switch"
+            onChange={(checked) => {
+                updateOrganization({ is_member_join_email_enabled: checked })
+            }}
+            checked={!!currentOrganization?.is_member_join_email_enabled}
+            disabled={isRestricted || !currentOrganization}
+            label="Email all current members when a new member joins"
+            bordered
+        />
+    )
+}
diff --git a/frontend/src/scenes/organization/Settings/DangerZone.tsx b/frontend/src/scenes/settings/organization/OrganizationDangerZone.tsx
similarity index 74%
rename from frontend/src/scenes/organization/Settings/DangerZone.tsx
rename to frontend/src/scenes/settings/organization/OrganizationDangerZone.tsx
index a4fa581b337e90..5425d9b67c2980 100644
--- a/frontend/src/scenes/organization/Settings/DangerZone.tsx
+++ b/frontend/src/scenes/settings/organization/OrganizationDangerZone.tsx
@@ -1,9 +1,10 @@
 import { useActions, useValues } from 'kea'
 import { organizationLogic } from 'scenes/organizationLogic'
-import { RestrictedComponentProps } from 'lib/components/RestrictedArea'
+import { useRestrictedArea } from 'lib/components/RestrictedArea'
 import { Dispatch, SetStateAction, useState } from 'react'
 import { LemonButton, LemonInput, LemonModal } from '@posthog/lemon-ui'
 import { IconDelete } from 'lib/lemon-ui/icons'
+import { OrganizationMembershipLevel } from 'lib/constants'
 
 export function DeleteOrganizationModal({
     isOpen,
@@ -62,32 +63,29 @@ export function DeleteOrganizationModal({
     )
 }
 
-export function DangerZone({ isRestricted }: RestrictedComponentProps): JSX.Element {
+export function OrganizationDangerZone(): JSX.Element {
     const { currentOrganization } = useValues(organizationLogic)
-
     const [isModalVisible, setIsModalVisible] = useState(false)
+    const isRestricted = !!useRestrictedArea({ minimumAccessLevel: OrganizationMembershipLevel.Admin })
 
     return (
         <>
             <div className="text-danger">
-                <h2 className="text-danger subtitle">Danger Zone</h2>
-                <div className="mt-4">
-                    {!isRestricted && (
-                        <p className="text-danger">
-                            This is <b>irreversible</b>. Please be certain.
-                        </p>
-                    )}
-                    <LemonButton
-                        status="danger"
-                        type="secondary"
-                        onClick={() => setIsModalVisible(true)}
-                        data-attr="delete-organization-button"
-                        icon={<IconDelete />}
-                        disabled={isRestricted}
-                    >
-                        Delete {currentOrganization?.name || 'the current organization'}
-                    </LemonButton>
-                </div>
+                {!isRestricted && (
+                    <p className="text-danger">
+                        This is <b>irreversible</b>. Please be certain.
+                    </p>
+                )}
+                <LemonButton
+                    status="danger"
+                    type="secondary"
+                    onClick={() => setIsModalVisible(true)}
+                    data-attr="delete-organization-button"
+                    icon={<IconDelete />}
+                    disabled={isRestricted}
+                >
+                    Delete {currentOrganization?.name || 'the current organization'}
+                </LemonButton>
             </div>
             <DeleteOrganizationModal isOpen={isModalVisible} setIsOpen={setIsModalVisible} />
         </>
diff --git a/frontend/src/scenes/organization/Settings/Permissions/Permissions.tsx b/frontend/src/scenes/settings/organization/Permissions/Permissions.tsx
similarity index 98%
rename from frontend/src/scenes/organization/Settings/Permissions/Permissions.tsx
rename to frontend/src/scenes/settings/organization/Permissions/Permissions.tsx
index 65213ed1284815..7adcbed6a36213 100644
--- a/frontend/src/scenes/organization/Settings/Permissions/Permissions.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/Permissions.tsx
@@ -54,7 +54,7 @@ export function Permissions({ isRestricted }: RestrictedComponentProps): JSX.Ele
     return (
         <>
             <div className="flex items-center">
-                <div style={{ flexGrow: 1 }}>
+                <div className="grow">
                     <h2 id="roles" className="subtitle">
                         Permission Defaults
                     </h2>
diff --git a/frontend/src/scenes/organization/Settings/Permissions/PermissionsGrid.tsx b/frontend/src/scenes/settings/organization/Permissions/PermissionsGrid.tsx
similarity index 73%
rename from frontend/src/scenes/organization/Settings/Permissions/PermissionsGrid.tsx
rename to frontend/src/scenes/settings/organization/Permissions/PermissionsGrid.tsx
index 418510115015a4..5f97a4c778e313 100644
--- a/frontend/src/scenes/organization/Settings/Permissions/PermissionsGrid.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/PermissionsGrid.tsx
@@ -2,22 +2,25 @@ import { LemonButton, LemonCheckbox, LemonTable } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { IconInfo } from 'lib/lemon-ui/icons'
 import { LemonTableColumns } from 'lib/lemon-ui/LemonTable'
-import { RestrictedComponentProps } from 'lib/components/RestrictedArea'
+import { useRestrictedArea } from 'lib/components/RestrictedArea'
 import { TitleWithIcon } from 'lib/components/TitleWithIcon'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { organizationLogic } from 'scenes/organizationLogic'
-import { AccessLevel, Resource, RoleType } from '~/types'
+import { AccessLevel, AvailableFeature, Resource, RoleType } from '~/types'
 import { permissionsLogic } from './permissionsLogic'
 import { CreateRoleModal } from './Roles/CreateRoleModal'
 import { rolesLogic } from './Roles/rolesLogic'
 import { getSingularType } from './utils'
+import { OrganizationMembershipLevel } from 'lib/constants'
+import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
 
-export function PermissionsGrid({ isRestricted }: RestrictedComponentProps): JSX.Element {
+export function PermissionsGrid(): JSX.Element {
     const { resourceRolesAccess, organizationResourcePermissionsLoading } = useValues(permissionsLogic)
     const { updatePermission } = useActions(permissionsLogic)
     const { roles, rolesLoading } = useValues(rolesLogic)
     const { setRoleInFocus, openCreateRoleModal } = useActions(rolesLogic)
     const { isAdminOrOwner } = useValues(organizationLogic)
+    const isRestricted = !!useRestrictedArea({ minimumAccessLevel: OrganizationMembershipLevel.Admin }) // TODO: check if this is correct
 
     const columns: LemonTableColumns<RoleType> = [
         {
@@ -95,24 +98,26 @@ export function PermissionsGrid({ isRestricted }: RestrictedComponentProps): JSX
     ]
 
     return (
-        <>
-            <div className="flex flex-row justify-between items-center mb-4">
-                <div className="text-muted-alt">
-                    Edit organizational default permission levels for posthog resources. Use roles to apply permissions
-                    to specific sets of users.
+        <PayGateMini feature={AvailableFeature.ROLE_BASED_ACCESS}>
+            <>
+                <div className="flex flex-row justify-between items-center mb-4">
+                    <div className="text-muted-alt">
+                        Edit organizational default permission levels for posthog resources. Use roles to apply
+                        permissions to specific sets of users.
+                    </div>
+                    {!isRestricted && (
+                        <LemonButton type="primary" onClick={openCreateRoleModal} data-attr="create-role-button">
+                            Create role
+                        </LemonButton>
+                    )}
                 </div>
-                {!isRestricted && (
-                    <LemonButton type="primary" onClick={openCreateRoleModal} data-attr="create-role-button">
-                        Create role
-                    </LemonButton>
-                )}
-            </div>
-            <LemonTable
-                columns={columns}
-                loading={rolesLoading || organizationResourcePermissionsLoading}
-                dataSource={[{ name: 'organization_default' } as RoleType, ...roles]}
-            />
-            <CreateRoleModal />
-        </>
+                <LemonTable
+                    columns={columns}
+                    loading={rolesLoading || organizationResourcePermissionsLoading}
+                    dataSource={[{ name: 'organization_default' } as RoleType, ...roles]}
+                />
+                <CreateRoleModal />
+            </>
+        </PayGateMini>
     )
 }
diff --git a/frontend/src/scenes/organization/Settings/Permissions/Roles/CreateRoleModal.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/CreateRoleModal.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/Permissions/Roles/CreateRoleModal.tsx
rename to frontend/src/scenes/settings/organization/Permissions/Roles/CreateRoleModal.tsx
diff --git a/frontend/src/scenes/organization/Settings/Permissions/Roles/Roles.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/Roles.tsx
similarity index 99%
rename from frontend/src/scenes/organization/Settings/Permissions/Roles/Roles.tsx
rename to frontend/src/scenes/settings/organization/Permissions/Roles/Roles.tsx
index 50ca6b37b62147..915433298a2d39 100644
--- a/frontend/src/scenes/organization/Settings/Permissions/Roles/Roles.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/Roles/Roles.tsx
@@ -58,7 +58,7 @@ export function Roles({ isRestricted }: RestrictedComponentProps): JSX.Element {
     return (
         <>
             <div className="flex items-center">
-                <div style={{ flexGrow: 1 }}>
+                <div className="grow">
                     <h2 id="roles" className="subtitle">
                         Roles
                     </h2>
diff --git a/frontend/src/scenes/organization/Settings/Permissions/Roles/rolesLogic.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
similarity index 98%
rename from frontend/src/scenes/organization/Settings/Permissions/Roles/rolesLogic.tsx
rename to frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
index 37acd4fa6b8070..32276a71df837d 100644
--- a/frontend/src/scenes/organization/Settings/Permissions/Roles/rolesLogic.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
@@ -2,9 +2,9 @@ import { actions, kea, reducers, path, connect, selectors, afterMount, listeners
 import { loaders } from 'kea-loaders'
 import api from 'lib/api'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { teamMembersLogic } from 'scenes/project/Settings/teamMembersLogic'
 import { AccessLevel, Resource, RoleMemberType, RoleType, UserBasicType } from '~/types'
 import type { rolesLogicType } from './rolesLogicType'
+import { teamMembersLogic } from 'scenes/settings/project/teamMembersLogic'
 
 export const rolesLogic = kea<rolesLogicType>([
     path(['scenes', 'organization', 'rolesLogic']),
diff --git a/frontend/src/scenes/organization/Settings/Permissions/permissionsLogic.tsx b/frontend/src/scenes/settings/organization/Permissions/permissionsLogic.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/Permissions/permissionsLogic.tsx
rename to frontend/src/scenes/settings/organization/Permissions/permissionsLogic.tsx
diff --git a/frontend/src/scenes/organization/Settings/Permissions/utils.ts b/frontend/src/scenes/settings/organization/Permissions/utils.ts
similarity index 100%
rename from frontend/src/scenes/organization/Settings/Permissions/utils.ts
rename to frontend/src/scenes/settings/organization/Permissions/utils.ts
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/AddDomainModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/AddDomainModal.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/AddDomainModal.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/AddDomainModal.tsx
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/ConfigureSAMLModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/ConfigureSAMLModal.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/SSOSelect.stories.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.stories.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/SSOSelect.stories.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.stories.tsx
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/SSOSelect.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/SSOSelect.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/VerifiedDomains.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
similarity index 91%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/VerifiedDomains.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
index 62610b74d34615..548a89ad5ca5a1 100644
--- a/frontend/src/scenes/organization/Settings/VerifiedDomains/VerifiedDomains.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
@@ -5,7 +5,6 @@ import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { OrganizationDomainType } from '~/types'
 import { verifiedDomainsLogic } from './verifiedDomainsLogic'
-import { InfoCircleOutlined } from '@ant-design/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { AddDomainModal } from './AddDomainModal'
@@ -17,6 +16,7 @@ import { UPGRADE_LINK } from 'lib/constants'
 import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch/LemonSwitch'
 import { ConfigureSAMLModal } from './ConfigureSAMLModal'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { IconInfo } from '@posthog/icons'
 
 const iconStyle = { marginRight: 4, fontSize: '1.15em', paddingTop: 2 }
 
@@ -26,25 +26,20 @@ export function VerifiedDomains(): JSX.Element {
 
     return (
         <>
-            <div className="flex items-center">
-                <div style={{ flexGrow: 1 }}>
-                    <h2 id="authentication-domains" className="subtitle">
-                        Authentication domains
-                    </h2>
-                    <p className="text-muted-alt">
-                        Enable users to sign up automatically with an email address on verified domains and enforce SSO
-                        for accounts under your domains.
-                    </p>
-                </div>
-                <LemonButton
-                    type="primary"
-                    onClick={() => setAddModalShown(true)}
-                    disabled={verifiedDomainsLoading || updatingDomainLoading}
-                >
-                    Add domain
-                </LemonButton>
-            </div>
+            <p>
+                Enable users to sign up automatically with an email address on verified domains and enforce SSO for
+                accounts under your domains.
+            </p>
+
             <VerifiedDomainsTable />
+            <LemonButton
+                type="primary"
+                onClick={() => setAddModalShown(true)}
+                className="mt-4"
+                disabledReason={verifiedDomainsLoading || updatingDomainLoading ? 'loading...' : null}
+            >
+                Add domain
+            </LemonButton>
         </>
     )
 }
@@ -79,7 +74,7 @@ function VerifiedDomainsTable(): JSX.Element {
                           <>
                               Verification
                               <Tooltip title="Verification (through DNS) is required to use domains for authentication (e.g. SAML or enforce SSO).">
-                                  <InfoCircleOutlined style={{ marginLeft: 4 }} />
+                                  <IconInfo style={{ marginLeft: 4 }} />
                               </Tooltip>
                           </>
                       ),
@@ -111,7 +106,7 @@ function VerifiedDomainsTable(): JSX.Element {
                             currentOrganization?.name || 'this organization'
                         } if it does not exist.`}
                     >
-                        <InfoCircleOutlined />
+                        <IconInfo />
                     </Tooltip>
                 </>
             ),
@@ -138,7 +133,7 @@ function VerifiedDomainsTable(): JSX.Element {
                 <>
                     Enforce SSO{' '}
                     <Tooltip title="Require users with email addresses on this domain to always log in using a specific SSO provider.">
-                        <InfoCircleOutlined />
+                        <IconInfo />
                     </Tooltip>
                 </>
             ),
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/VerifyDomainModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/VerifyDomainModal.tsx
rename to frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap b/frontend/src/scenes/settings/organization/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap
rename to frontend/src/scenes/settings/organization/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/verifiedDomainsLogic.test.ts b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.test.ts
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/verifiedDomainsLogic.test.ts
rename to frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.test.ts
diff --git a/frontend/src/scenes/organization/Settings/VerifiedDomains/verifiedDomainsLogic.ts b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts
similarity index 100%
rename from frontend/src/scenes/organization/Settings/VerifiedDomains/verifiedDomainsLogic.ts
rename to frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts
diff --git a/frontend/src/scenes/organization/Settings/inviteLogic.ts b/frontend/src/scenes/settings/organization/inviteLogic.ts
similarity index 100%
rename from frontend/src/scenes/organization/Settings/inviteLogic.ts
rename to frontend/src/scenes/settings/organization/inviteLogic.ts
diff --git a/frontend/src/scenes/organization/Settings/invitesLogic.tsx b/frontend/src/scenes/settings/organization/invitesLogic.tsx
similarity index 100%
rename from frontend/src/scenes/organization/Settings/invitesLogic.tsx
rename to frontend/src/scenes/settings/organization/invitesLogic.tsx
diff --git a/frontend/src/scenes/project/Settings/AddMembersModal.tsx b/frontend/src/scenes/settings/project/AddMembersModal.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/AddMembersModal.tsx
rename to frontend/src/scenes/settings/project/AddMembersModal.tsx
diff --git a/frontend/src/scenes/settings/project/AutocaptureSettings.tsx b/frontend/src/scenes/settings/project/AutocaptureSettings.tsx
new file mode 100644
index 00000000000000..e65c24e6f76b50
--- /dev/null
+++ b/frontend/src/scenes/settings/project/AutocaptureSettings.tsx
@@ -0,0 +1,99 @@
+import { useValues, useActions } from 'kea'
+import { userLogic } from 'scenes/userLogic'
+import { LemonSwitch, LemonTag, LemonTextArea, Link } from '@posthog/lemon-ui'
+import { teamLogic } from 'scenes/teamLogic'
+import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
+import clsx from 'clsx'
+import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
+import { autocaptureExceptionsLogic } from './autocaptureExceptionsLogic'
+
+export function AutocaptureSettings(): JSX.Element {
+    const { userLoading } = useValues(userLogic)
+    const { currentTeam } = useValues(teamLogic)
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { reportIngestionAutocaptureToggled } = useActions(eventUsageLogic)
+
+    return (
+        <>
+            <p>
+                Automagically capture front-end interactions like pageviews, clicks, and more when using our web
+                JavaScript SDK.{' '}
+            </p>
+            <p>
+                Autocapture is also available for React Native, where it has to be{' '}
+                <Link to="https://posthog.com/docs/libraries/react-native#autocapture" target="_blank">
+                    configured directly in code
+                </Link>
+                .
+            </p>
+            <div className="space-y-2">
+                <LemonSwitch
+                    id="posthog-autocapture-switch"
+                    onChange={(checked) => {
+                        updateCurrentTeam({
+                            autocapture_opt_out: !checked,
+                        })
+                        reportIngestionAutocaptureToggled(!checked)
+                    }}
+                    checked={!currentTeam?.autocapture_opt_out}
+                    disabled={userLoading}
+                    label="Enable autocapture for web"
+                    bordered
+                />
+            </div>
+        </>
+    )
+}
+
+export function ExceptionAutocaptureSettings(): JSX.Element {
+    const { userLoading } = useValues(userLogic)
+    const { currentTeam } = useValues(teamLogic)
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { reportIngestionAutocaptureExceptionsToggled } = useActions(eventUsageLogic)
+
+    const { errorsToIgnoreRules, rulesCharacters } = useValues(autocaptureExceptionsLogic)
+    const { setErrorsToIgnoreRules } = useActions(autocaptureExceptionsLogic)
+
+    return (
+        <>
+            <LemonSwitch
+                id="posthog-autocapture-exceptions-switch"
+                onChange={(checked) => {
+                    updateCurrentTeam({
+                        autocapture_exceptions_opt_in: checked,
+                    })
+                    reportIngestionAutocaptureExceptionsToggled(checked)
+                }}
+                checked={!!currentTeam?.autocapture_exceptions_opt_in}
+                disabled={userLoading}
+                label={
+                    <>
+                        Enable exception autocapture <LemonTag>ALPHA</LemonTag>
+                    </>
+                }
+                bordered
+            />
+            <h3 className="mt-4">Ignore errors</h3>
+            <p>
+                If you're experiencing a high volume of unhelpful errors, add regular expressions here to ignore them.
+                This will ignore all errors that match, including those that are not autocaptured.
+            </p>
+            <p>
+                You can enter a regular expression that matches values of{' '}
+                <PropertyKeyInfo value={'$exception_message'} /> here to ignore them. One per line. For example, if you
+                want to drop all errors that contain the word "bot", or you can enter "bot" here. Or if you want to drop
+                all errors that are exactly "bot", you can enter "^bot$".
+            </p>
+            <p>Only up to 300 characters of config are allowed here.</p>
+            <LemonTextArea
+                id="posthog-autocapture-exceptions-dropped"
+                value={errorsToIgnoreRules}
+                onChange={setErrorsToIgnoreRules}
+                disabled={!currentTeam?.autocapture_exceptions_opt_in}
+            />
+            <div className={clsx('mt-2 text-xs text-right', rulesCharacters > 300 ? 'text-danger' : 'text-muted')}>
+                {rulesCharacters} / 300 characters
+            </div>
+        </>
+    )
+}
diff --git a/frontend/src/scenes/project/Settings/CorrelationConfig.tsx b/frontend/src/scenes/settings/project/CorrelationConfig.tsx
similarity index 96%
rename from frontend/src/scenes/project/Settings/CorrelationConfig.tsx
rename to frontend/src/scenes/settings/project/CorrelationConfig.tsx
index fd357cd23e0f56..83bf547ca39135 100644
--- a/frontend/src/scenes/project/Settings/CorrelationConfig.tsx
+++ b/frontend/src/scenes/settings/project/CorrelationConfig.tsx
@@ -35,9 +35,6 @@ export function CorrelationConfig(): JSX.Element {
 
     return (
         <>
-            <h2 className="subtitle" id="internal-users-filtering">
-                Correlation analysis exclusions
-            </h2>
             <p>Globally exclude events or properties that do not provide relevant signals for your conversions.</p>
 
             <LemonBanner type="info">
diff --git a/frontend/src/scenes/project/Settings/DataAttributes.tsx b/frontend/src/scenes/settings/project/DataAttributes.tsx
similarity index 94%
rename from frontend/src/scenes/project/Settings/DataAttributes.tsx
rename to frontend/src/scenes/settings/project/DataAttributes.tsx
index 4efdb3c1ca7635..52786527115195 100644
--- a/frontend/src/scenes/project/Settings/DataAttributes.tsx
+++ b/frontend/src/scenes/settings/project/DataAttributes.tsx
@@ -1,5 +1,4 @@
-import { LemonButton, Link } from '@posthog/lemon-ui'
-import { Skeleton } from 'antd'
+import { LemonButton, LemonSkeleton, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { LemonSelectMultiple } from 'lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple'
 import { useEffect, useState } from 'react'
@@ -13,7 +12,7 @@ export function DataAttributes(): JSX.Element {
     useEffect(() => setValue(currentTeam?.data_attributes || []), [currentTeam])
 
     if (!currentTeam) {
-        return <Skeleton paragraph={{ rows: 0 }} active />
+        return <LemonSkeleton />
     }
 
     return (
diff --git a/frontend/src/scenes/project/Settings/GroupAnalytics.tsx b/frontend/src/scenes/settings/project/GroupAnalyticsConfig.tsx
similarity index 89%
rename from frontend/src/scenes/project/Settings/GroupAnalytics.tsx
rename to frontend/src/scenes/settings/project/GroupAnalyticsConfig.tsx
index 4d563af695bdbf..ea893db7132b74 100644
--- a/frontend/src/scenes/project/Settings/GroupAnalytics.tsx
+++ b/frontend/src/scenes/settings/project/GroupAnalyticsConfig.tsx
@@ -2,11 +2,11 @@ import { useActions, useValues } from 'kea'
 import { GroupType } from '~/types'
 import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
-import { groupAnalyticsConfigLogic } from 'scenes/project/Settings/groupAnalyticsConfigLogic'
-import { LemonButton, LemonDivider, LemonInput, Link } from '@posthog/lemon-ui'
+import { LemonButton, LemonInput, Link } from '@posthog/lemon-ui'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { groupAnalyticsConfigLogic } from './groupAnalyticsConfigLogic'
 
-export function GroupAnalytics(): JSX.Element | null {
+export function GroupAnalyticsConfig(): JSX.Element | null {
     const { groupTypes, groupTypesLoading, singularChanges, pluralChanges, hasChanges } =
         useValues(groupAnalyticsConfigLogic)
     const { setSingular, setPlural, reset, save } = useActions(groupAnalyticsConfigLogic)
@@ -63,8 +63,7 @@ export function GroupAnalytics(): JSX.Element | null {
     ]
 
     return (
-        <div id="group-analytics">
-            <h2 className="subtitle">Group Analytics</h2>
+        <>
             <p>
                 This project has access to group analytics. Below you can configure how various group types are
                 displayed throughout the app.
@@ -91,7 +90,6 @@ export function GroupAnalytics(): JSX.Element | null {
                     Cancel
                 </LemonButton>
             </div>
-            <LemonDivider className="my-6" />
-        </div>
+        </>
     )
 }
diff --git a/frontend/src/scenes/project/Settings/IPCapture.tsx b/frontend/src/scenes/settings/project/IPCapture.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/IPCapture.tsx
rename to frontend/src/scenes/settings/project/IPCapture.tsx
diff --git a/frontend/src/scenes/settings/project/PathCleaningFiltersConfig.tsx b/frontend/src/scenes/settings/project/PathCleaningFiltersConfig.tsx
new file mode 100644
index 00000000000000..076ac078020a0d
--- /dev/null
+++ b/frontend/src/scenes/settings/project/PathCleaningFiltersConfig.tsx
@@ -0,0 +1,52 @@
+import { useActions, useValues } from 'kea'
+import { teamLogic } from 'scenes/teamLogic'
+import { PathCleanFilters } from 'lib/components/PathCleanFilters/PathCleanFilters'
+import { Link } from '@posthog/lemon-ui'
+import { userLogic } from 'scenes/userLogic'
+import { AvailableFeature, InsightType } from '~/types'
+import { urls } from 'scenes/urls'
+
+export function PathCleaningFiltersConfig(): JSX.Element | null {
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { currentTeam } = useValues(teamLogic)
+    const { user } = useValues(userLogic)
+    const hasAdvancedPaths = user?.organization?.available_features?.includes(AvailableFeature.PATHS_ADVANCED)
+
+    if (!currentTeam) {
+        return null
+    }
+
+    if (!hasAdvancedPaths) {
+        return <p>Advanced path cleaning is a premium feature.</p>
+    }
+
+    return (
+        <>
+            <p>
+                Make your <Link to={urls.insightNew({ insight: InsightType.PATHS })}>Paths</Link> clearer by aliasing
+                one or multiple URLs.{' '}
+                <i>
+                    Example: <code>http://tenant-one.mydomain.com/accounts</code> and{' '}
+                    <code>http://tenant-two.mydomain.com/accounts</code> can become a single <code>/accounts</code>{' '}
+                    path.
+                </i>
+            </p>
+            <p>
+                Each rule is composed of an alias and a regex pattern. Any pattern in a URL or event name that matches
+                the regex will be replaced with the alias. Rules are applied in the order that they're listed.
+            </p>
+            <p>
+                <b>
+                    Rules that you set here will be applied before wildcarding and other regex replacement if the toggle
+                    is switched on.
+                </b>
+            </p>
+            <PathCleanFilters
+                filters={currentTeam.path_cleaning_filters}
+                setFilters={(filters) => {
+                    updateCurrentTeam({ path_cleaning_filters: filters })
+                }}
+            />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/project/Settings/PersonDisplayNameProperties.tsx b/frontend/src/scenes/settings/project/PersonDisplayNameProperties.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/PersonDisplayNameProperties.tsx
rename to frontend/src/scenes/settings/project/PersonDisplayNameProperties.tsx
diff --git a/frontend/src/scenes/project/Settings/TeamMembers.tsx b/frontend/src/scenes/settings/project/ProjectAccessControl.tsx
similarity index 67%
rename from frontend/src/scenes/project/Settings/TeamMembers.tsx
rename to frontend/src/scenes/settings/project/ProjectAccessControl.tsx
index bd2a76793aff1c..edfdb92742a044 100644
--- a/frontend/src/scenes/project/Settings/TeamMembers.tsx
+++ b/frontend/src/scenes/settings/project/ProjectAccessControl.tsx
@@ -1,9 +1,10 @@
 import { useValues, useActions } from 'kea'
 import { MINIMUM_IMPLICIT_ACCESS_LEVEL, teamMembersLogic } from './teamMembersLogic'
+// eslint-disable-next-line no-restricted-imports
 import { CloseCircleOutlined, LogoutOutlined, CrownFilled } from '@ant-design/icons'
 import { humanFriendlyDetailedTime } from 'lib/utils'
 import { OrganizationMembershipLevel, TeamMembershipLevel } from 'lib/constants'
-import { TeamType, UserType, FusedTeamMemberType } from '~/types'
+import { FusedTeamMemberType, AvailableFeature } from '~/types'
 import { userLogic } from 'scenes/userLogic'
 import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
@@ -13,11 +14,14 @@ import {
     teamMembershipLevelIntegers,
 } from 'lib/utils/permissioning'
 import { AddMembersModalWithButton } from './AddMembersModal'
-import { RestrictedArea, RestrictionScope } from 'lib/components/RestrictedArea'
-import { LemonButton, LemonSelect, LemonSelectOption, LemonTable } from '@posthog/lemon-ui'
+import { RestrictedArea, RestrictionScope, useRestrictedArea } from 'lib/components/RestrictedArea'
+import { LemonButton, LemonSelect, LemonSelectOption, LemonSwitch, LemonTable } from '@posthog/lemon-ui'
 import { LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { organizationLogic } from 'scenes/organizationLogic'
+import { sceneLogic } from 'scenes/sceneLogic'
+import { IconLock, IconLockOpen } from 'lib/lemon-ui/icons'
 
 function LevelComponent(member: FusedTeamMemberType): JSX.Element | null {
     const { user } = useValues(userLogic)
@@ -122,14 +126,14 @@ function ActionsComponent(member: FusedTeamMemberType): JSX.Element | null {
     ) : null
 }
 
-export interface MembersProps {
-    user: UserType
-    team: TeamType
-}
-
-export function TeamMembers({ user }: MembersProps): JSX.Element {
+export function ProjectTeamMembers(): JSX.Element | null {
+    const { user } = useValues(userLogic)
     const { allMembers, allMembersLoading } = useValues(teamMembersLogic)
 
+    if (!user) {
+        return null
+    }
+
     const columns: LemonTableColumns<FusedTeamMemberType> = [
         {
             key: 'user_profile_picture',
@@ -177,14 +181,14 @@ export function TeamMembers({ user }: MembersProps): JSX.Element {
 
     return (
         <>
-            <h2 className="subtitle flex justify-between items-center" id="members-with-project-access">
+            <h3 className="flex justify-between items-center mt-4">
                 Members with Project Access
                 <RestrictedArea
                     Component={AddMembersModalWithButton}
                     minimumAccessLevel={OrganizationMembershipLevel.Admin}
                     scope={RestrictionScope.Project}
                 />
-            </h2>
+            </h3>
 
             <LemonTable
                 columns={columns}
@@ -195,3 +199,68 @@ export function TeamMembers({ user }: MembersProps): JSX.Element {
         </>
     )
 }
+
+export function ProjectAccessControl(): JSX.Element {
+    const { currentOrganization, currentOrganizationLoading } = useValues(organizationLogic)
+    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { guardAvailableFeature } = useActions(sceneLogic)
+    const { hasAvailableFeature } = useValues(userLogic)
+
+    const projectPermissioningEnabled =
+        hasAvailableFeature(AvailableFeature.PROJECT_BASED_PERMISSIONING) && currentTeam?.access_control
+    const isRestricted = !!useRestrictedArea({
+        minimumAccessLevel: OrganizationMembershipLevel.Admin,
+    })
+
+    return (
+        <>
+            <p>
+                {projectPermissioningEnabled ? (
+                    <>
+                        This project is{' '}
+                        <b>
+                            <IconLock style={{ color: 'var(--warning)', marginRight: 5 }} />
+                            private
+                        </b>
+                        . Only members listed below are allowed to access it.
+                    </>
+                ) : (
+                    <>
+                        This project is{' '}
+                        <b>
+                            <IconLockOpen style={{ marginRight: 5 }} />
+                            open
+                        </b>
+                        . Any member of the organization can access it. To enable granular access control, make it
+                        private.
+                    </>
+                )}
+            </p>
+            <LemonSwitch
+                onChange={(checked) => {
+                    guardAvailableFeature(
+                        AvailableFeature.PROJECT_BASED_PERMISSIONING,
+                        'project-based permissioning',
+                        'Set permissions granularly for each project. Make sure only the right people have access to protected data.',
+                        () => updateCurrentTeam({ access_control: checked })
+                    )
+                }}
+                checked={!!projectPermissioningEnabled}
+                disabled={
+                    isRestricted ||
+                    !currentOrganization ||
+                    !currentTeam ||
+                    currentOrganizationLoading ||
+                    currentTeamLoading
+                }
+                bordered
+                label="Make project private"
+            />
+
+            {currentTeam?.access_control && hasAvailableFeature(AvailableFeature.PROJECT_BASED_PERMISSIONING) && (
+                <ProjectTeamMembers />
+            )}
+        </>
+    )
+}
diff --git a/frontend/src/scenes/project/Settings/DangerZone.tsx b/frontend/src/scenes/settings/project/ProjectDangerZone.tsx
similarity index 87%
rename from frontend/src/scenes/project/Settings/DangerZone.tsx
rename to frontend/src/scenes/settings/project/ProjectDangerZone.tsx
index d188618bdd57f9..82dd00ba309ef9 100644
--- a/frontend/src/scenes/project/Settings/DangerZone.tsx
+++ b/frontend/src/scenes/settings/project/ProjectDangerZone.tsx
@@ -1,10 +1,11 @@
 import { Dispatch, SetStateAction, useState } from 'react'
 import { useActions, useValues } from 'kea'
 import { teamLogic } from 'scenes/teamLogic'
-import { RestrictedComponentProps } from 'lib/components/RestrictedArea'
+import { RestrictionScope, useRestrictedArea } from 'lib/components/RestrictedArea'
 import { LemonButton, LemonInput, LemonModal } from '@posthog/lemon-ui'
 import { IconDelete } from 'lib/lemon-ui/icons'
 import { TeamType } from '~/types'
+import { OrganizationMembershipLevel } from 'lib/constants'
 
 export function DeleteProjectModal({
     isOpen,
@@ -59,17 +60,20 @@ export function DeleteProjectModal({
     )
 }
 
-export function DangerZone({ isRestricted }: RestrictedComponentProps): JSX.Element {
+export function ProjectDangerZone(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
-
     const [isModalVisible, setIsModalVisible] = useState(false)
 
+    const restrictedReason = useRestrictedArea({
+        minimumAccessLevel: OrganizationMembershipLevel.Admin,
+        scope: RestrictionScope.Project,
+    })
+
     return (
         <>
             <div className="text-danger">
-                <h2 className="text-danger subtitle">Danger Zone</h2>
                 <div className="mt-4">
-                    {!isRestricted && (
+                    {!restrictedReason && (
                         <p className="text-danger">
                             This is <b>irreversible</b>. Please be certain.
                         </p>
@@ -80,7 +84,7 @@ export function DangerZone({ isRestricted }: RestrictedComponentProps): JSX.Elem
                         onClick={() => setIsModalVisible(true)}
                         data-attr="delete-project-button"
                         icon={<IconDelete />}
-                        disabled={isRestricted}
+                        disabledReason={restrictedReason}
                     >
                         Delete {currentTeam?.name || 'the current project'}
                     </LemonButton>
diff --git a/frontend/src/scenes/settings/project/ProjectSettings.tsx b/frontend/src/scenes/settings/project/ProjectSettings.tsx
new file mode 100644
index 00000000000000..ac6d40c2849a57
--- /dev/null
+++ b/frontend/src/scenes/settings/project/ProjectSettings.tsx
@@ -0,0 +1,181 @@
+import { useActions, useValues } from 'kea'
+import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
+import { JSSnippet } from 'lib/components/JSSnippet'
+import { JSBookmarklet } from 'lib/components/JSBookmarklet'
+import { CodeSnippet } from 'lib/components/CodeSnippet'
+import { IconRefresh } from 'lib/lemon-ui/icons'
+import { Link } from 'lib/lemon-ui/Link'
+import { LemonButton, LemonInput, LemonLabel, LemonSkeleton } from '@posthog/lemon-ui'
+import { useState } from 'react'
+import { TimezoneConfig } from './TimezoneConfig'
+import { WeekStartConfig } from './WeekStartConfig'
+import { AuthorizedUrlList } from 'lib/components/AuthorizedUrlList/AuthorizedUrlList'
+import { AuthorizedUrlListType } from 'lib/components/AuthorizedUrlList/authorizedUrlListLogic'
+import { urls } from '@posthog/apps-common'
+
+export function ProjectDisplayName(): JSX.Element {
+    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
+    const { updateCurrentTeam } = useActions(teamLogic)
+
+    const [name, setName] = useState(currentTeam?.name || '')
+
+    if (currentTeam?.is_demo) {
+        return (
+            <p>
+                <i>The demo project cannot be renamed.</i>
+            </p>
+        )
+    }
+
+    return (
+        <div className="space-y-4" style={{ maxWidth: '40rem' }}>
+            <LemonInput value={name} onChange={setName} disabled={currentTeamLoading} />
+            <LemonButton
+                type="primary"
+                onClick={() => updateCurrentTeam({ name })}
+                disabled={!name || !currentTeam || name === currentTeam.name}
+                loading={currentTeamLoading}
+            >
+                Rename Project
+            </LemonButton>
+        </div>
+    )
+}
+
+export function WebSnippet(): JSX.Element {
+    const { currentTeam, currentTeamLoading } = useValues(teamLogic)
+
+    return (
+        <>
+            <p>
+                PostHog's configurable web snippet allows you to (optionally) autocapture events, record user sessions,
+                and more with no extra work. Place the following snippet in your website's HTML, ideally just above the{' '}
+                <code>{'</head>'}</code> tag.
+            </p>
+            <p>
+                For more guidance, including on identifying users,{' '}
+                <Link to="https://posthog.com/docs/integrations/js-integration">see PostHog Docs</Link>.
+            </p>
+            {currentTeamLoading && !currentTeam ? (
+                <div className="space-y-4">
+                    <LemonSkeleton className="w-1/2" />
+                    <LemonSkeleton repeat={3} />
+                </div>
+            ) : (
+                <JSSnippet />
+            )}
+        </>
+    )
+}
+
+export function Bookmarklet(): JSX.Element {
+    const { currentTeam } = useValues(teamLogic)
+
+    return (
+        <>
+            <p>Need to test PostHog on a live site without changing any code?</p>
+            <p>
+                Just drag the bookmarklet below to your bookmarks bar, open the website you want to test PostHog on and
+                click it. This will enable our tracking, on the currently loaded page only. The data will show up in
+                this project.
+            </p>
+            <div>{isAuthenticatedTeam(currentTeam) && <JSBookmarklet team={currentTeam} />}</div>
+        </>
+    )
+}
+
+export function ProjectVariables(): JSX.Element {
+    const { currentTeam, isTeamTokenResetAvailable } = useValues(teamLogic)
+    const { resetToken } = useActions(teamLogic)
+
+    return (
+        <div className="flex items-start gap-4 flex-wrap">
+            <div className="flex-1">
+                <h3 id="project-api-key" className="min-w-100">
+                    Project API Key
+                </h3>
+                <p>
+                    You can use this write-only key in any one of{' '}
+                    <Link to="https://posthog.com/docs/integrations">our libraries</Link>.
+                </p>
+                <CodeSnippet
+                    actions={
+                        isTeamTokenResetAvailable
+                            ? [
+                                  {
+                                      icon: <IconRefresh />,
+                                      title: 'Reset project API key',
+                                      popconfirmProps: {
+                                          title: (
+                                              <>
+                                                  Reset the project's API key?{' '}
+                                                  <b>This will invalidate the current API key and cannot be undone.</b>
+                                              </>
+                                          ),
+                                          okText: 'Reset key',
+                                          okType: 'danger',
+                                          placement: 'left',
+                                      },
+                                      callback: resetToken,
+                                  },
+                              ]
+                            : []
+                    }
+                    thing="project API key"
+                >
+                    {currentTeam?.api_token || ''}
+                </CodeSnippet>
+                <p>
+                    Write-only means it can only create new events. It can't read events or any of your other data
+                    stored with PostHog, so it's safe to use in public apps.
+                </p>
+            </div>
+            <div className="flex-1">
+                <h3 id="project-id" className="min-w-100">
+                    Project ID
+                </h3>
+                <p>
+                    You can use this ID to reference your project in our{' '}
+                    <Link to="https://posthog.com/docs/api">API</Link>.
+                </p>
+                <CodeSnippet thing="project ID">{String(currentTeam?.id || '')}</CodeSnippet>
+            </div>
+        </div>
+    )
+}
+
+export function ProjectTimezone(): JSX.Element {
+    return (
+        <>
+            <p>
+                These settings affect how PostHog displays, buckets, and filters time-series data. You may need to
+                refresh insights for new settings to apply.
+            </p>
+            <div className="space-y-2">
+                <LemonLabel id="timezone">Time zone</LemonLabel>
+                <TimezoneConfig />
+                <LemonLabel id="timezone">Week starts on</LemonLabel>
+                <WeekStartConfig />
+            </div>
+        </>
+    )
+}
+
+export function ProjectToolbarURLs(): JSX.Element {
+    return (
+        <>
+            <p>
+                These are the URLs where the{' '}
+                <b>
+                    <Link to={urls.toolbarLaunch()}>Toolbar</Link> will automatically launch
+                </b>{' '}
+                (if you're logged in).
+            </p>
+            <p>
+                <b>Domains and wildcard subdomains are allowed</b> (example: <code>https://*.example.com</code>).
+                However, wildcarded top-level domains cannot be used (for security reasons).
+            </p>
+            <AuthorizedUrlList type={AuthorizedUrlListType.TOOLBAR_URLS} />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/session-recordings/settings/SessionRecordingSettings.tsx b/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
similarity index 84%
rename from frontend/src/scenes/session-recordings/settings/SessionRecordingSettings.tsx
rename to frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
index 7ff2582193790d..4b19878b74146f 100644
--- a/frontend/src/scenes/session-recordings/settings/SessionRecordingSettings.tsx
+++ b/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
@@ -1,30 +1,117 @@
 import { useActions, useValues } from 'kea'
 import { teamLogic } from 'scenes/teamLogic'
-import { LemonBanner, LemonButton, LemonSelect, LemonSwitch, LemonTag, Link } from '@posthog/lemon-ui'
+import { LemonBanner, LemonButton, LemonSelect, LemonSwitch, Link } from '@posthog/lemon-ui'
 import { urls } from 'scenes/urls'
 import { AuthorizedUrlList } from 'lib/components/AuthorizedUrlList/AuthorizedUrlList'
 import { AuthorizedUrlListType } from 'lib/components/AuthorizedUrlList/authorizedUrlListLogic'
-import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 import { FlaggedFeature } from 'lib/components/FlaggedFeature'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { IconCancel } from 'lib/lemon-ui/icons'
 import { FlagSelector } from 'lib/components/FlagSelector'
 
-export type SessionRecordingSettingsProps = {
-    inModal?: boolean
+export function ReplayGeneral(): JSX.Element {
+    const { updateCurrentTeam } = useActions(teamLogic)
+
+    const { currentTeam } = useValues(teamLogic)
+
+    return (
+        <div className="space-y-4">
+            <p>Watch recordings of how users interact with your web app to see what can be improved.</p>
+
+            <div className="space-y-2">
+                <LemonSwitch
+                    data-attr="opt-in-session-recording-switch"
+                    onChange={(checked) => {
+                        updateCurrentTeam({
+                            session_recording_opt_in: checked,
+                            capture_console_log_opt_in: checked,
+                            capture_performance_opt_in: checked,
+                        })
+                    }}
+                    label="Record user sessions"
+                    bordered
+                    checked={!!currentTeam?.session_recording_opt_in}
+                />
+
+                <p>
+                    Please note your website needs to have the{' '}
+                    <Link to={urls.settings('project', 'snippet')}>PostHog snippet</Link> or the latest version of{' '}
+                    <Link
+                        to="https://posthog.com/docs/integrations/js-integration?utm_campaign=session-recording&utm_medium=in-product"
+                        target="_blank"
+                    >
+                        posthog-js
+                    </Link>{' '}
+                    directly installed. For more details, check out our{' '}
+                    <Link
+                        to="https://posthog.com/docs/user-guides/recordings?utm_campaign=session-recording&utm_medium=in-product"
+                        target="_blank"
+                    >
+                        docs
+                    </Link>
+                    .
+                </p>
+            </div>
+            <div className="space-y-2">
+                <LemonSwitch
+                    data-attr="opt-in-capture-console-log-switch"
+                    onChange={(checked) => {
+                        updateCurrentTeam({ capture_console_log_opt_in: checked })
+                    }}
+                    label="Capture console logs"
+                    bordered
+                    checked={currentTeam?.session_recording_opt_in ? !!currentTeam?.capture_console_log_opt_in : false}
+                    disabled={!currentTeam?.session_recording_opt_in}
+                />
+                <p>
+                    This setting controls if browser console logs will be captured as a part of recordings. The console
+                    logs will be shown in the recording player to help you debug any issues.
+                </p>
+            </div>
+            <div className="space-y-2">
+                <LemonSwitch
+                    data-attr="opt-in-capture-performance-switch"
+                    onChange={(checked) => {
+                        updateCurrentTeam({ capture_performance_opt_in: checked })
+                    }}
+                    label="Capture network performance"
+                    bordered
+                    checked={currentTeam?.session_recording_opt_in ? !!currentTeam?.capture_performance_opt_in : false}
+                    disabled={!currentTeam?.session_recording_opt_in}
+                />
+                <p>
+                    This setting controls if performance and network information will be captured alongside recordings.
+                    The network requests and timings will be shown in the recording player to help you debug any issues.
+                </p>
+            </div>
+        </div>
+    )
 }
 
-function ReplayCostControl(): JSX.Element {
+export function ReplayAuthorizedDomains(): JSX.Element {
+    return (
+        <div className="space-y-2">
+            <p>
+                Use the settings below to restrict the domains where recordings will be captured. If no domains are
+                selected, then there will be no domain restriction.
+            </p>
+            <p>
+                Domains and wildcard subdomains are allowed (e.g. <code>https://*.example.com</code>). However,
+                wildcarded top-level domains cannot be used (for security reasons).
+            </p>
+            <AuthorizedUrlList type={AuthorizedUrlListType.RECORDING_DOMAINS} />
+        </div>
+    )
+}
+
+export function ReplayCostControl(): JSX.Element {
     const { updateCurrentTeam } = useActions(teamLogic)
     const { currentTeam } = useValues(teamLogic)
 
     return (
         <FlaggedFeature flag={FEATURE_FLAGS.SESSION_RECORDING_SAMPLING}>
             <>
-                <h2 className={'flex flex-row align-center space-x-2'}>
-                    <span>Replay ingestion controls</span> <LemonTag type={'highlight'}>BETA</LemonTag>
-                </h2>
                 <p>
                     PostHog offers several tools to let you control the number of recordings you collect and which users
                     you collect recordings for.{' '}
@@ -35,7 +122,9 @@ function ReplayCostControl(): JSX.Element {
                         Learn more in our docs
                     </Link>
                 </p>
-                <LemonBanner type={'info'}>Requires posthog-js version 1.85.0 or greater</LemonBanner>
+                <LemonBanner className="mb-4" type={'info'}>
+                    Requires posthog-js version 1.88.2 or greater
+                </LemonBanner>
                 <div className={'flex flex-row justify-between'}>
                     <LemonLabel className="text-base">Sampling</LemonLabel>
                     <LemonSelect
@@ -210,110 +299,3 @@ function ReplayCostControl(): JSX.Element {
         </FlaggedFeature>
     )
 }
-
-export function SessionRecordingSettings({ inModal = false }: SessionRecordingSettingsProps): JSX.Element {
-    const { updateCurrentTeam } = useActions(teamLogic)
-    const { currentTeam } = useValues(teamLogic)
-
-    return (
-        <div className="space-y-4">
-            <div className="space-y-2">
-                <LemonSwitch
-                    data-attr="opt-in-session-recording-switch"
-                    onChange={(checked) => {
-                        updateCurrentTeam({
-                            session_recording_opt_in: checked,
-                            capture_console_log_opt_in: checked,
-                            capture_performance_opt_in: checked,
-                        })
-                    }}
-                    label="Record user sessions"
-                    bordered={!inModal}
-                    fullWidth={inModal}
-                    labelClassName={inModal ? 'text-base font-semibold' : ''}
-                    checked={!!currentTeam?.session_recording_opt_in}
-                />
-
-                <p>
-                    Please note your website needs to have the{' '}
-                    <Link to={urls.projectSettings() + '#snippet'}>PostHog snippet</Link> or the latest version of{' '}
-                    <Link
-                        to="https://posthog.com/docs/integrations/js-integration?utm_campaign=session-recording&utm_medium=in-product"
-                        target="_blank"
-                    >
-                        posthog-js
-                    </Link>{' '}
-                    directly installed. For more details, check out our{' '}
-                    <Link
-                        to="https://posthog.com/docs/user-guides/recordings?utm_campaign=session-recording&utm_medium=in-product"
-                        target="_blank"
-                    >
-                        docs
-                    </Link>
-                    .
-                </p>
-            </div>
-            <div className="space-y-2">
-                <LemonSwitch
-                    data-attr="opt-in-capture-console-log-switch"
-                    onChange={(checked) => {
-                        updateCurrentTeam({ capture_console_log_opt_in: checked })
-                    }}
-                    label="Capture console logs"
-                    labelClassName={inModal ? 'text-base font-semibold' : ''}
-                    bordered={!inModal}
-                    fullWidth={inModal}
-                    checked={currentTeam?.session_recording_opt_in ? !!currentTeam?.capture_console_log_opt_in : false}
-                    disabled={!currentTeam?.session_recording_opt_in}
-                />
-                <p>
-                    This setting controls if browser console logs will be captured as a part of recordings. The console
-                    logs will be shown in the recording player to help you debug any issues.
-                </p>
-            </div>
-            <div className="space-y-2">
-                <LemonSwitch
-                    data-attr="opt-in-capture-performance-switch"
-                    onChange={(checked) => {
-                        updateCurrentTeam({ capture_performance_opt_in: checked })
-                    }}
-                    label="Capture network performance"
-                    labelClassName={inModal ? 'text-base font-semibold' : ''}
-                    bordered={!inModal}
-                    fullWidth={inModal}
-                    checked={currentTeam?.session_recording_opt_in ? !!currentTeam?.capture_performance_opt_in : false}
-                    disabled={!currentTeam?.session_recording_opt_in}
-                />
-                <p>
-                    This setting controls if performance and network information will be captured alongside recordings.
-                    The network requests and timings will be shown in the recording player to help you debug any issues.
-                </p>
-            </div>
-            <div className="space-y-2">
-                <LemonLabel className="text-base">Authorized domains for recordings</LemonLabel>
-
-                <p>
-                    Use the settings below to restrict the domains where recordings will be captured. If no domains are
-                    selected, then there will be no domain restriction.
-                </p>
-                <p>
-                    Domains and wildcard subdomains are allowed (e.g. <code>https://*.example.com</code>). However,
-                    wildcarded top-level domains cannot be used (for security reasons).
-                </p>
-                <AuthorizedUrlList type={AuthorizedUrlListType.RECORDING_DOMAINS} />
-            </div>
-            <ReplayCostControl />
-        </div>
-    )
-}
-
-export function openSessionRecordingSettingsDialog(): void {
-    LemonDialog.open({
-        title: 'Session recording settings',
-        content: <SessionRecordingSettings inModal />,
-        width: 600,
-        primaryButton: {
-            children: 'Done',
-        },
-    })
-}
diff --git a/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx b/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx
new file mode 100644
index 00000000000000..031def32411097
--- /dev/null
+++ b/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx
@@ -0,0 +1,37 @@
+import { useActions, useValues } from 'kea'
+import { teamLogic } from 'scenes/teamLogic'
+import { LemonSwitch, Link } from '@posthog/lemon-ui'
+
+export function SettingPersonsOnEvents(): JSX.Element {
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { currentTeam } = useValues(teamLogic)
+
+    return (
+        <>
+            <p>
+                We have updated our data model to also store person properties directly on events, making queries
+                significantly faster. This means that person properties will no longer be "timeless", but rather
+                point-in-time i.e. on filters we'll consider a person's properties at the time of the event, rather than
+                at present time. This may cause data to change on some of your insights, but will be the default way we
+                handle person properties going forward. For now, you can control whether you want this on or not, and
+                should feel free to let us know of any concerns you might have. If you do enable this, you should see
+                speed improvements of around 3-5x on average on most of your insights.
+                <Link to="https://github.com/PostHog/posthog/blob/75a2111f2c4f9183dd45f85c7b103c7b0524eabf/plugin-server/src/worker/ingestion/PoE.md">
+                    More info.
+                </Link>
+            </p>
+
+            <LemonSwitch
+                data-attr={`poe-setting`}
+                onChange={(checked) => {
+                    updateCurrentTeam({
+                        extra_settings: { ...currentTeam?.extra_settings, ['poe_v2_enabled']: checked },
+                    })
+                }}
+                label={`Enable Person on Events (Beta)`}
+                checked={!!currentTeam?.extra_settings?.['poe_v2_enabled']}
+                bordered
+            />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/project/Settings/SlackIntegration.stories.tsx b/frontend/src/scenes/settings/project/SlackIntegration.stories.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/SlackIntegration.stories.tsx
rename to frontend/src/scenes/settings/project/SlackIntegration.stories.tsx
diff --git a/frontend/src/scenes/project/Settings/SlackIntegration.tsx b/frontend/src/scenes/settings/project/SlackIntegration.tsx
similarity index 98%
rename from frontend/src/scenes/project/Settings/SlackIntegration.tsx
rename to frontend/src/scenes/settings/project/SlackIntegration.tsx
index 93732b838cbf85..e74ef84a8fa011 100644
--- a/frontend/src/scenes/project/Settings/SlackIntegration.tsx
+++ b/frontend/src/scenes/settings/project/SlackIntegration.tsx
@@ -47,9 +47,9 @@ export function SlackIntegration(): JSX.Element {
                 .
             </p>
 
-            <p>
+            <div>
                 {slackIntegration ? (
-                    <div className="rounded border flex justify-between items-center p-2">
+                    <div className="rounded border flex justify-between items-center p-2 bg-bg-light">
                         <div className="flex items-center gap-4 ml-2">
                             <IconSlack />
                             <div>
@@ -120,7 +120,7 @@ export function SlackIntegration(): JSX.Element {
                         configure it.
                     </p>
                 )}
-            </p>
+            </div>
         </div>
     )
 }
diff --git a/frontend/src/scenes/project/Settings/Survey.tsx b/frontend/src/scenes/settings/project/SurveySettings.tsx
similarity index 70%
rename from frontend/src/scenes/project/Settings/Survey.tsx
rename to frontend/src/scenes/settings/project/SurveySettings.tsx
index a33f4cdd9cb134..81d536ece76a80 100644
--- a/frontend/src/scenes/project/Settings/Survey.tsx
+++ b/frontend/src/scenes/settings/project/SurveySettings.tsx
@@ -1,20 +1,16 @@
-import { LemonDivider, Link } from '@posthog/lemon-ui'
+import { Link } from '@posthog/lemon-ui'
 import { SurveySettings as BasicSurveySettings } from 'scenes/surveys/SurveySettings'
 import { urls } from 'scenes/urls'
 
 export function SurveySettings(): JSX.Element {
     return (
         <>
-            <h2 id="surveys" className="subtitle">
-                Surveys
-            </h2>
             <p>
                 Get qualitative and quantitative data on how your users are doing. Surveys are found in the{' '}
                 <Link to={urls.surveys()}>surveys page</Link>.
             </p>
 
             <BasicSurveySettings />
-            <LemonDivider className="my-6" />
         </>
     )
 }
diff --git a/frontend/src/scenes/project/Settings/TestAccountFiltersConfig.tsx b/frontend/src/scenes/settings/project/TestAccountFiltersConfig.tsx
similarity index 67%
rename from frontend/src/scenes/project/Settings/TestAccountFiltersConfig.tsx
rename to frontend/src/scenes/settings/project/TestAccountFiltersConfig.tsx
index f905ce9759a2fe..58cd23f6288e1d 100644
--- a/frontend/src/scenes/project/Settings/TestAccountFiltersConfig.tsx
+++ b/frontend/src/scenes/settings/project/TestAccountFiltersConfig.tsx
@@ -5,11 +5,11 @@ import { teamLogic } from 'scenes/teamLogic'
 import { AnyPropertyFilter } from '~/types'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { groupsModel } from '~/models/groupsModel'
-import { LemonSwitch } from '@posthog/lemon-ui'
+import { LemonSwitch, Link } from '@posthog/lemon-ui'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { filterTestAccountsDefaultsLogic } from './filterTestAccountDefaultsLogic'
 
-export function TestAccountFiltersConfig(): JSX.Element {
+function TestAccountFiltersConfig(): JSX.Element {
     const { updateCurrentTeam } = useActions(teamLogic)
     const { setTeamDefault } = useActions(filterTestAccountsDefaultsLogic)
     const { reportTestAccountFiltersUpdated } = useActions(eventUsageLogic)
@@ -83,3 +83,42 @@ export function TestAccountFiltersConfig(): JSX.Element {
         </div>
     )
 }
+
+export function ProjectAccountFiltersSetting(): JSX.Element {
+    return (
+        <>
+            <p>
+                Increase the quality of your analytics results by filtering out events from internal sources, such as
+                team members, test accounts, or development environments.{' '}
+                <strong>The filters you apply here are added as extra filters when the toggle is switched on.</strong>{' '}
+                So, if you apply a cohort, it means you will only match users in that cohort.
+            </p>
+            <LemonBanner type="info">
+                Events and recordings will still be ingested and saved, but they will be excluded from any queries where
+                the "Filter out internal and test users" toggle is set. You can learn how to{' '}
+                <Link to="https://posthog.com/tutorials/fewer-unwanted-events" target="_blank">
+                    capture fewer events
+                </Link>{' '}
+                or how to{' '}
+                <Link to="https://posthog.com/tutorials/limit-session-recordings" target="_blank">
+                    capture fewer recordings
+                </Link>{' '}
+                in our docs.
+            </LemonBanner>
+            <div className={'mt-4'}>
+                <strong>Example filters</strong>
+                <ul className="list-disc pl-4 mb-2">
+                    <li>
+                        "<strong>Email</strong> does not contain <strong>yourcompany.com</strong>" to exclude all events
+                        from your company's team members.
+                    </li>
+                    <li>
+                        "<strong>Host</strong> does not contain <strong>localhost</strong>" to exclude all events from
+                        local development environments.
+                    </li>
+                </ul>
+            </div>
+            <TestAccountFiltersConfig />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/project/Settings/TimezoneConfig.tsx b/frontend/src/scenes/settings/project/TimezoneConfig.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/TimezoneConfig.tsx
rename to frontend/src/scenes/settings/project/TimezoneConfig.tsx
diff --git a/frontend/src/scenes/project/Settings/WebhookIntegration.tsx b/frontend/src/scenes/settings/project/WebhookIntegration.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/WebhookIntegration.tsx
rename to frontend/src/scenes/settings/project/WebhookIntegration.tsx
diff --git a/frontend/src/scenes/project/Settings/WeekStartConfig.tsx b/frontend/src/scenes/settings/project/WeekStartConfig.tsx
similarity index 100%
rename from frontend/src/scenes/project/Settings/WeekStartConfig.tsx
rename to frontend/src/scenes/settings/project/WeekStartConfig.tsx
diff --git a/frontend/src/scenes/project/Settings/autocaptureExceptionsLogic.ts b/frontend/src/scenes/settings/project/autocaptureExceptionsLogic.ts
similarity index 85%
rename from frontend/src/scenes/project/Settings/autocaptureExceptionsLogic.ts
rename to frontend/src/scenes/settings/project/autocaptureExceptionsLogic.ts
index d2fa99e1729dfb..9aa7a465bdb0c3 100644
--- a/frontend/src/scenes/project/Settings/autocaptureExceptionsLogic.ts
+++ b/frontend/src/scenes/settings/project/autocaptureExceptionsLogic.ts
@@ -1,20 +1,20 @@
-import { kea, reducers, actions, listeners, events, selectors, connect, path } from 'kea'
+import { kea, reducers, actions, listeners, selectors, connect, path, afterMount } from 'kea'
 import { teamLogic } from 'scenes/teamLogic'
 
 import type { autocaptureExceptionsLogicType } from './autocaptureExceptionsLogicType'
 
 export const autocaptureExceptionsLogic = kea<autocaptureExceptionsLogicType>([
     path(['scenes', 'project', 'Settings', 'autocaptureExceptionsLogic']),
-    connect({
+    connect(() => ({
         values: [teamLogic, ['currentTeam']],
         actions: [teamLogic, ['updateCurrentTeam']],
-    }),
+    })),
     actions({
         setErrorsToIgnoreRules: (newRules: string) => ({ newRules }),
     }),
     reducers({
         errorsToIgnoreRules: [
-            (teamLogic.values.currentTeam?.autocapture_exceptions_errors_to_ignore || []).join('\n'),
+            '',
             {
                 setErrorsToIgnoreRules: (_, { newRules }) => newRules,
             },
@@ -45,5 +45,7 @@ export const autocaptureExceptionsLogic = kea<autocaptureExceptionsLogicType>([
             })
         },
     })),
-    events(() => ({})),
+    afterMount(({ actions, values }) => {
+        actions.setErrorsToIgnoreRules(values.currentTeamErrorsToIgnoreRules)
+    }),
 ])
diff --git a/frontend/src/scenes/project/Settings/filterTestAccountDefaultsLogic.ts b/frontend/src/scenes/settings/project/filterTestAccountDefaultsLogic.ts
similarity index 100%
rename from frontend/src/scenes/project/Settings/filterTestAccountDefaultsLogic.ts
rename to frontend/src/scenes/settings/project/filterTestAccountDefaultsLogic.ts
diff --git a/frontend/src/scenes/project/Settings/groupAnalyticsConfigLogic.ts b/frontend/src/scenes/settings/project/groupAnalyticsConfigLogic.ts
similarity index 100%
rename from frontend/src/scenes/project/Settings/groupAnalyticsConfigLogic.ts
rename to frontend/src/scenes/settings/project/groupAnalyticsConfigLogic.ts
diff --git a/frontend/src/scenes/project/Settings/integrationsLogic.ts b/frontend/src/scenes/settings/project/integrationsLogic.ts
similarity index 98%
rename from frontend/src/scenes/project/Settings/integrationsLogic.ts
rename to frontend/src/scenes/settings/project/integrationsLogic.ts
index 56cfa47d330f30..be287440db304b 100644
--- a/frontend/src/scenes/project/Settings/integrationsLogic.ts
+++ b/frontend/src/scenes/settings/project/integrationsLogic.ts
@@ -97,7 +97,7 @@ export const integrationsLogic = kea<integrationsLogicType>([
                 case 'slack': {
                     const { state, code, error, next } = searchParams
 
-                    const replaceUrl = next || urls.projectSettings()
+                    const replaceUrl = next || urls.settings('project')
 
                     if (error) {
                         lemonToast.error(`Failed due to "${error}"`)
diff --git a/frontend/src/scenes/project/Settings/teamMembersLogic.tsx b/frontend/src/scenes/settings/project/teamMembersLogic.tsx
similarity index 99%
rename from frontend/src/scenes/project/Settings/teamMembersLogic.tsx
rename to frontend/src/scenes/settings/project/teamMembersLogic.tsx
index 67455ac28c39fe..d6d137b48a2be2 100644
--- a/frontend/src/scenes/project/Settings/teamMembersLogic.tsx
+++ b/frontend/src/scenes/settings/project/teamMembersLogic.tsx
@@ -13,11 +13,11 @@ import {
     UserType,
 } from '~/types'
 import type { teamMembersLogicType } from './teamMembersLogicType'
-import { membersLogic } from '../../organization/Settings/membersLogic'
 import { membershipLevelToName } from 'lib/utils/permissioning'
 import { userLogic } from '../../userLogic'
 import { teamLogic } from '../../teamLogic'
 import { lemonToast } from 'lib/lemon-ui/lemonToast'
+import { membersLogic } from 'scenes/organization/membersLogic'
 
 export const MINIMUM_IMPLICIT_ACCESS_LEVEL = OrganizationMembershipLevel.Admin
 
diff --git a/frontend/src/scenes/project/Settings/webhookIntegrationLogic.ts b/frontend/src/scenes/settings/project/webhookIntegrationLogic.ts
similarity index 100%
rename from frontend/src/scenes/project/Settings/webhookIntegrationLogic.ts
rename to frontend/src/scenes/settings/project/webhookIntegrationLogic.ts
diff --git a/frontend/src/scenes/settings/settingsLogic.ts b/frontend/src/scenes/settings/settingsLogic.ts
new file mode 100644
index 00000000000000..665b7d27a4c7fc
--- /dev/null
+++ b/frontend/src/scenes/settings/settingsLogic.ts
@@ -0,0 +1,103 @@
+import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { SettingsMap } from './SettingsMap'
+
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { SettingSection, Setting, SettingSectionId, SettingLevelId, SettingId } from './types'
+
+import type { settingsLogicType } from './settingsLogicType'
+import { urls } from 'scenes/urls'
+import { copyToClipboard } from 'lib/utils'
+
+export type SettingsLogicProps = {
+    logicKey?: string
+    // Optional - if given, renders only the given level
+    settingLevelId?: SettingLevelId
+    // Optional - if given, renders only the given section
+    sectionId?: SettingSectionId
+    // Optional - if given, renders only the given setting
+    settingId?: SettingId
+}
+
+export const settingsLogic = kea<settingsLogicType>([
+    props({} as SettingsLogicProps),
+    key((props) => props.logicKey ?? 'global'),
+    path((key) => ['scenes', 'settings', 'settingsLogic', key]),
+    connect({
+        values: [featureFlagLogic, ['featureFlags']],
+    }),
+
+    actions({
+        selectSection: (section: SettingSectionId) => ({ section }),
+        selectLevel: (level: SettingLevelId) => ({ level }),
+        selectSetting: (setting: string) => ({ setting }),
+        openCompactNavigation: true,
+        closeCompactNavigation: true,
+    }),
+
+    reducers(({ props }) => ({
+        selectedLevel: [
+            (props.settingLevelId ?? 'project') as SettingLevelId,
+            {
+                selectLevel: (_, { level }) => level,
+                selectSection: (_, { section }) => SettingsMap.find((x) => x.id === section)?.level || 'user',
+            },
+        ],
+        selectedSectionId: [
+            (props.sectionId ?? null) as SettingSectionId | null,
+            {
+                selectLevel: () => null,
+                selectSection: (_, { section }) => section,
+            },
+        ],
+
+        isCompactNavigationOpen: [
+            false,
+            {
+                openCompactNavigation: () => true,
+                closeCompactNavigation: () => false,
+                selectLevel: () => false,
+                selectSection: () => false,
+            },
+        ],
+    })),
+
+    selectors({
+        sections: [
+            (s) => [s.featureFlags],
+            (featureFlags): SettingSection[] => {
+                return SettingsMap.filter((x) => (x.flag ? featureFlags[FEATURE_FLAGS[x.flag]] : true))
+            },
+        ],
+        selectedSection: [
+            (s) => [s.sections, s.selectedSectionId],
+            (sections, selectedSectionId): SettingSection | null => {
+                return sections.find((x) => x.id === selectedSectionId) ?? null
+            },
+        ],
+        settings: [
+            (s) => [s.selectedLevel, s.selectedSectionId, s.sections, s.featureFlags],
+            (selectedLevel, selectedSectionId, sections, featureFlags): Setting[] => {
+                let settings: Setting[] = []
+
+                if (!selectedSectionId) {
+                    settings = sections
+                        .filter((section) => section.level === selectedLevel)
+                        .reduce((acc, section) => [...acc, ...section.settings], [] as Setting[])
+                } else {
+                    settings = sections.find((x) => x.id === selectedSectionId)?.settings || []
+                }
+
+                return settings.filter((x) => (x.flag ? featureFlags[FEATURE_FLAGS[x.flag]] : true))
+            },
+        ],
+    }),
+
+    listeners(({ values }) => ({
+        selectSetting({ setting }) {
+            const url = urls.settings(values.selectedSectionId ?? values.selectedLevel, setting as SettingId)
+
+            copyToClipboard(window.location.origin + url)
+        },
+    })),
+])
diff --git a/frontend/src/scenes/settings/settingsSceneLogic.ts b/frontend/src/scenes/settings/settingsSceneLogic.ts
new file mode 100644
index 00000000000000..ecd2b85d06e3f0
--- /dev/null
+++ b/frontend/src/scenes/settings/settingsSceneLogic.ts
@@ -0,0 +1,71 @@
+import { connect, kea, path, selectors } from 'kea'
+import { SettingsMap } from './SettingsMap'
+
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { actionToUrl, urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { Breadcrumb } from '~/types'
+import { capitalizeFirstLetter } from 'lib/utils'
+import { SettingSectionId, SettingLevelId, SettingLevelIds } from './types'
+
+import type { settingsSceneLogicType } from './settingsSceneLogicType'
+import { settingsLogic } from './settingsLogic'
+
+export const settingsSceneLogic = kea<settingsSceneLogicType>([
+    path(['scenes', 'settings', 'settingsSceneLogic']),
+    connect(() => ({
+        values: [
+            featureFlagLogic,
+            ['featureFlags'],
+            settingsLogic({ logicKey: 'settingsScene' }),
+            ['selectedLevel', 'selectedSectionId', 'sections', 'settings'],
+        ],
+        actions: [settingsLogic({ logicKey: 'settingsScene' }), ['selectLevel', 'selectSection', 'selectSetting']],
+    })),
+
+    selectors({
+        breadcrumbs: [
+            (s) => [s.selectedLevel, s.selectedSectionId, s.sections],
+            (selectedLevel, selectedSectionId): Breadcrumb[] => [
+                {
+                    name: `Settings`,
+                    path: urls.settings('project'),
+                },
+                {
+                    name: selectedSectionId
+                        ? SettingsMap.find((x) => x.id === selectedSectionId)?.title
+                        : capitalizeFirstLetter(selectedLevel),
+                },
+            ],
+        ],
+    }),
+
+    urlToAction(({ actions, values }) => ({
+        '/settings/:section': ({ section }) => {
+            if (!section) {
+                return
+            }
+            if (SettingLevelIds.includes(section as SettingLevelId)) {
+                if (section !== values.selectedLevel) {
+                    actions.selectLevel(section as SettingLevelId)
+                }
+            } else if (section !== values.selectedSectionId) {
+                actions.selectSection(section as SettingSectionId)
+            }
+        },
+    })),
+
+    actionToUrl(({ values }) => ({
+        selectLevel({ level }) {
+            return [urls.settings(level)]
+        },
+        selectSection({ section }) {
+            return [urls.settings(section)]
+        },
+        selectSetting({ setting }) {
+            const url = urls.settings(values.selectedSectionId ?? values.selectedLevel, setting)
+
+            return [url]
+        },
+    })),
+])
diff --git a/frontend/src/scenes/settings/types.ts b/frontend/src/scenes/settings/types.ts
new file mode 100644
index 00000000000000..30ee8324d0ebe7
--- /dev/null
+++ b/frontend/src/scenes/settings/types.ts
@@ -0,0 +1,80 @@
+import { FEATURE_FLAGS } from 'lib/constants'
+import { EitherMembershipLevel } from 'lib/utils/permissioning'
+
+export type SettingLevelId = 'user' | 'project' | 'organization'
+export const SettingLevelIds: SettingLevelId[] = ['project', 'organization', 'user']
+
+export type SettingSectionId =
+    | 'project-details'
+    | 'project-autocapture'
+    | 'project-product-analytics'
+    | 'project-replay'
+    | 'project-surveys'
+    | 'project-toolbar'
+    | 'project-integrations'
+    | 'project-rbac'
+    | 'project-danger-zone'
+    | 'organization-details'
+    | 'organization-members'
+    | 'organization-authentication'
+    | 'organization-rbac'
+    | 'organization-danger-zone'
+    | 'user-profile'
+    | 'user-api-keys'
+    | 'user-notifications'
+
+export type SettingId =
+    | 'display-name'
+    | 'snippet'
+    | 'bookmarklet'
+    | 'variables'
+    | 'autocapture'
+    | 'exception-autocapture'
+    | 'autocapture-data-attributes'
+    | 'date-and-time'
+    | 'internal-user-filtering'
+    | 'correlation-analysis'
+    | 'person-display-name'
+    | 'path-cleaning'
+    | 'datacapture'
+    | 'group-analytics'
+    | 'persons-on-events'
+    | 'replay'
+    | 'replay-authorized-domains'
+    | 'replay-ingestion'
+    | 'surveys-interface'
+    | 'authorized-toolbar-urls'
+    | 'integration-webhooks'
+    | 'integration-slack'
+    | 'project-rbac'
+    | 'project-delete'
+    | 'organization-display-name'
+    | 'invites'
+    | 'members'
+    | 'email-members'
+    | 'authentication-domains'
+    | 'organization-rbac'
+    | 'organization-delete'
+    | 'details'
+    | 'change-password'
+    | '2fa'
+    | 'personal-api-keys'
+    | 'notifications'
+    | 'optout'
+
+export type Setting = {
+    id: SettingId
+    title: string
+    description?: JSX.Element | string
+    component: JSX.Element
+    flag?: keyof typeof FEATURE_FLAGS
+}
+
+export type SettingSection = {
+    id: SettingSectionId
+    title: string
+    level: SettingLevelId
+    settings: Setting[]
+    flag?: keyof typeof FEATURE_FLAGS
+    minimumAccessLevel?: EitherMembershipLevel
+}
diff --git a/frontend/src/scenes/me/Settings/ChangePassword.tsx b/frontend/src/scenes/settings/user/ChangePassword.tsx
similarity index 100%
rename from frontend/src/scenes/me/Settings/ChangePassword.tsx
rename to frontend/src/scenes/settings/user/ChangePassword.tsx
diff --git a/frontend/src/scenes/me/Settings/OptOutCapture.tsx b/frontend/src/scenes/settings/user/OptOutCapture.tsx
similarity index 73%
rename from frontend/src/scenes/me/Settings/OptOutCapture.tsx
rename to frontend/src/scenes/settings/user/OptOutCapture.tsx
index b4cd0ce8b4ccff..4290928ebb5d1b 100644
--- a/frontend/src/scenes/me/Settings/OptOutCapture.tsx
+++ b/frontend/src/scenes/settings/user/OptOutCapture.tsx
@@ -1,6 +1,6 @@
 import { useActions, useValues } from 'kea'
-import { Switch } from 'antd'
 import { userLogic } from 'scenes/userLogic'
+import { LemonSwitch } from '@posthog/lemon-ui'
 
 export function OptOutCapture(): JSX.Element {
     const { user, userLoading } = useValues(userLogic)
@@ -16,21 +16,14 @@ export function OptOutCapture(): JSX.Element {
                 We also understand there are many reasons why people don't want to or aren't allowed to send this usage
                 data. If you would like to anonymize your personal usage data, just tick the box below.
             </p>
-            <Switch
+            <LemonSwitch
+                label={'Anonymize my data'}
                 data-attr="anonymize-data-collection"
                 onChange={(checked) => updateUser({ anonymize_data: checked })}
-                defaultChecked={user?.anonymize_data}
-                loading={userLoading}
+                checked={user?.anonymize_data ?? false}
                 disabled={userLoading}
+                bordered
             />
-            <label
-                htmlFor="anonymize-data-collection"
-                style={{
-                    marginLeft: '10px',
-                }}
-            >
-                Anonymize my data
-            </label>
         </div>
     )
 }
diff --git a/frontend/src/lib/components/PersonalAPIKeys/PersonalAPIKeys.tsx b/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
similarity index 56%
rename from frontend/src/lib/components/PersonalAPIKeys/PersonalAPIKeys.tsx
rename to frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
index 1df2bf94370186..f9f79327e1ba4a 100644
--- a/frontend/src/lib/components/PersonalAPIKeys/PersonalAPIKeys.tsx
+++ b/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
@@ -1,14 +1,11 @@
-import { useState, useCallback, Dispatch, SetStateAction } from 'react'
-import { Table, Popconfirm } from 'antd'
+import { useState, useCallback, Dispatch, SetStateAction, useEffect } from 'react'
 import { useActions, useValues } from 'kea'
-import { ExclamationCircleOutlined } from '@ant-design/icons'
 import { personalAPIKeysLogic } from './personalAPIKeysLogic'
 import { PersonalAPIKeyType } from '~/types'
 import { humanFriendlyDetailedTime } from 'lib/utils'
-import { CopyToClipboardInline } from '../CopyToClipboard'
-import { ColumnsType } from 'antd/lib/table'
+import { CopyToClipboardInline } from '../../../lib/components/CopyToClipboard'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { LemonInput, LemonModal, Link } from '@posthog/lemon-ui'
+import { LemonDialog, LemonInput, LemonModal, LemonTable, Link } from '@posthog/lemon-ui'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { IconPlus } from 'lib/lemon-ui/icons'
 
@@ -71,79 +68,75 @@ function CreateKeyModal({
     )
 }
 
-function RowValue(value: string): JSX.Element {
-    return value ? (
-        <CopyToClipboardInline description="personal API key value">{value}</CopyToClipboardInline>
-    ) : (
-        <i>secret</i>
-    )
-}
-
-function RowActionsCreator(
-    deleteKey: (key: PersonalAPIKeyType) => void
-): (personalAPIKey: PersonalAPIKeyType) => JSX.Element {
-    return function RowActions(personalAPIKey: PersonalAPIKeyType) {
-        return (
-            <Popconfirm
-                title={`Permanently delete key "${personalAPIKey.label}"?`}
-                okText="Delete Key"
-                okType="danger"
-                icon={<ExclamationCircleOutlined style={{ color: 'var(--danger)' }} />}
-                placement="left"
-                onConfirm={() => {
-                    deleteKey(personalAPIKey)
-                }}
-            >
-                <span className="text-danger">Danger</span>
-            </Popconfirm>
-        )
-    }
-}
-
 function PersonalAPIKeysTable(): JSX.Element {
     const { keys } = useValues(personalAPIKeysLogic) as { keys: PersonalAPIKeyType[] }
-    const { deleteKey } = useActions(personalAPIKeysLogic)
+    const { deleteKey, loadKeys } = useActions(personalAPIKeysLogic)
 
-    const columns: ColumnsType<Record<string, any>> = [
-        {
-            title: 'Label',
-            dataIndex: 'label',
-            key: 'label',
-        },
-        {
-            title: 'Value',
-            dataIndex: 'value',
-            key: 'value',
-            className: 'ph-no-capture',
-            render: RowValue,
-        },
-        {
-            title: 'Last Used',
-            dataIndex: 'last_used_at',
-            key: 'lastUsedAt',
-            render: (lastUsedAt: string | null) => humanFriendlyDetailedTime(lastUsedAt, 'MMMM DD, YYYY', 'h A'),
-        },
-        {
-            title: 'Created',
-            dataIndex: 'created_at',
-            key: 'createdAt',
-            render: (createdAt: string | null) => humanFriendlyDetailedTime(createdAt),
-        },
-        {
-            title: '',
-            key: 'actions',
-            align: 'center',
-            render: RowActionsCreator(deleteKey),
-        },
-    ]
+    useEffect(() => loadKeys(), [])
 
     return (
-        <Table
+        <LemonTable
             dataSource={keys}
-            columns={columns}
-            rowKey="id"
-            pagination={{ pageSize: 50, hideOnSinglePage: true }}
-            style={{ marginTop: '1rem' }}
+            className="mt-4"
+            columns={[
+                {
+                    title: 'Label',
+                    dataIndex: 'label',
+                    key: 'label',
+                },
+                {
+                    title: 'Value',
+                    key: 'value',
+                    dataIndex: 'value',
+                    render: function RenderValue(value) {
+                        return value ? (
+                            <CopyToClipboardInline description="personal API key value">{`${value}`}</CopyToClipboardInline>
+                        ) : (
+                            <i>secret</i>
+                        )
+                    },
+                },
+                {
+                    title: 'Last Used',
+                    dataIndex: 'last_used_at',
+                    key: 'lastUsedAt',
+                    render: (_, key) => humanFriendlyDetailedTime(key.last_used_at, 'MMMM DD, YYYY', 'h A'),
+                },
+                {
+                    title: 'Created',
+                    dataIndex: 'created_at',
+                    key: 'createdAt',
+                    render: (_, key) => humanFriendlyDetailedTime(key.created_at),
+                },
+                {
+                    title: '',
+                    key: 'actions',
+                    align: 'right',
+                    width: 0,
+                    render: (_, key) => {
+                        return (
+                            <LemonButton
+                                status="danger"
+                                type="primary"
+                                size="small"
+                                onClick={() => {
+                                    LemonDialog.open({
+                                        title: `Permanently delete key "${key.label}"?`,
+                                        description: 'This action cannot be undone.',
+                                        primaryButton: {
+                                            status: 'danger',
+                                            children: 'Permanently delete',
+                                            onClick: () => deleteKey(key),
+                                        },
+                                    })
+                                }}
+                            >
+                                Delete
+                            </LemonButton>
+                        )
+                    },
+                },
+            ]}
         />
     )
 }
@@ -174,8 +167,10 @@ export function PersonalAPIKeys(): JSX.Element {
             >
                 Create personal API key
             </LemonButton>
-            <CreateKeyModal isOpen={modalIsOpen} setIsOpen={setModalIsOpen} />
+
             <PersonalAPIKeysTable />
+
+            <CreateKeyModal isOpen={modalIsOpen} setIsOpen={setModalIsOpen} />
         </>
     )
 }
diff --git a/frontend/src/scenes/me/Settings/TwoFactorAuthentication.tsx b/frontend/src/scenes/settings/user/TwoFactorAuthentication.tsx
similarity index 96%
rename from frontend/src/scenes/me/Settings/TwoFactorAuthentication.tsx
rename to frontend/src/scenes/settings/user/TwoFactorAuthentication.tsx
index b31e3d92da0b15..a7d71f1bb3d74b 100644
--- a/frontend/src/scenes/me/Settings/TwoFactorAuthentication.tsx
+++ b/frontend/src/scenes/settings/user/TwoFactorAuthentication.tsx
@@ -4,7 +4,7 @@ import { LemonButton, LemonModal } from '@posthog/lemon-ui'
 import { IconCheckmark, IconWarning } from 'lib/lemon-ui/icons'
 import { useState } from 'react'
 import { Setup2FA } from 'scenes/authentication/Setup2FA'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 
 export function TwoFactorAuthentication(): JSX.Element {
     const { user } = useValues(userLogic)
diff --git a/frontend/src/scenes/me/Settings/UpdateEmailPreferences.tsx b/frontend/src/scenes/settings/user/UpdateEmailPreferences.tsx
similarity index 96%
rename from frontend/src/scenes/me/Settings/UpdateEmailPreferences.tsx
rename to frontend/src/scenes/settings/user/UpdateEmailPreferences.tsx
index 4849e56ebb8dc0..5d1387d3763240 100644
--- a/frontend/src/scenes/me/Settings/UpdateEmailPreferences.tsx
+++ b/frontend/src/scenes/settings/user/UpdateEmailPreferences.tsx
@@ -16,7 +16,6 @@ export function UpdateEmailPreferences(): JSX.Element {
                 checked={user?.email_opt_in || false}
                 disabled={userLoading}
                 label="Receive security and feature updates via email. You can easily unsubscribe at any time."
-                fullWidth
                 bordered
             />
             <br />
@@ -35,7 +34,6 @@ export function UpdateEmailPreferences(): JSX.Element {
                 }}
                 checked={user?.notification_settings.plugin_disabled || false}
                 disabled={userLoading}
-                fullWidth
                 bordered
                 label="Get notified when plugins are disabled due to errors."
             />
diff --git a/frontend/src/scenes/me/Settings/UserDetails.tsx b/frontend/src/scenes/settings/user/UserDetails.tsx
similarity index 100%
rename from frontend/src/scenes/me/Settings/UserDetails.tsx
rename to frontend/src/scenes/settings/user/UserDetails.tsx
diff --git a/frontend/src/scenes/me/Settings/changePasswordLogic.ts b/frontend/src/scenes/settings/user/changePasswordLogic.ts
similarity index 100%
rename from frontend/src/scenes/me/Settings/changePasswordLogic.ts
rename to frontend/src/scenes/settings/user/changePasswordLogic.ts
diff --git a/frontend/src/lib/components/PersonalAPIKeys/personalAPIKeysLogic.ts b/frontend/src/scenes/settings/user/personalAPIKeysLogic.ts
similarity index 92%
rename from frontend/src/lib/components/PersonalAPIKeys/personalAPIKeysLogic.ts
rename to frontend/src/scenes/settings/user/personalAPIKeysLogic.ts
index ec44ba725b3773..f500ebe5e05535 100644
--- a/frontend/src/lib/components/PersonalAPIKeys/personalAPIKeysLogic.ts
+++ b/frontend/src/scenes/settings/user/personalAPIKeysLogic.ts
@@ -1,5 +1,5 @@
 import { loaders } from 'kea-loaders'
-import { kea, path, listeners, events } from 'kea'
+import { kea, path, listeners } from 'kea'
 import api from 'lib/api'
 import { PersonalAPIKeyType } from '~/types'
 import type { personalAPIKeysLogicType } from './personalAPIKeysLogicType'
@@ -37,7 +37,4 @@ export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
             lemonToast.success(`Personal API key deleted`)
         },
     })),
-    events(({ actions }) => ({
-        afterMount: [actions.loadKeys],
-    })),
 ])
diff --git a/frontend/src/scenes/surveys/EditSurvey.scss b/frontend/src/scenes/surveys/EditSurvey.scss
index a504bf234d4fcf..2995d066678872 100644
--- a/frontend/src/scenes/surveys/EditSurvey.scss
+++ b/frontend/src/scenes/surveys/EditSurvey.scss
@@ -7,7 +7,3 @@
         background: var(--border-light);
     }
 }
-
-.SurveyFormAppearance {
-    max-width: 320px;
-}
diff --git a/frontend/src/scenes/surveys/SurveyAppearance.scss b/frontend/src/scenes/surveys/SurveyAppearance.scss
index 5c2e1081e8fd58..640e99ec703e00 100644
--- a/frontend/src/scenes/surveys/SurveyAppearance.scss
+++ b/frontend/src/scenes/surveys/SurveyAppearance.scss
@@ -158,6 +158,7 @@
 .multiple-choice-options {
     margin-top: 13px;
     font-size: 14px;
+    color: black;
 }
 .multiple-choice-options .choice-option {
     display: flex;
diff --git a/frontend/src/scenes/surveys/SurveyAppearance.tsx b/frontend/src/scenes/surveys/SurveyAppearance.tsx
index af90fcad98b518..3f1fa5c4074b7a 100644
--- a/frontend/src/scenes/surveys/SurveyAppearance.tsx
+++ b/frontend/src/scenes/surveys/SurveyAppearance.tsx
@@ -23,8 +23,8 @@ import {
 import { surveysLogic } from './surveysLogic'
 import { useValues } from 'kea'
 import React, { useEffect, useRef, useState } from 'react'
-import { sanitize } from 'dompurify'
 import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
+import { sanitizeHTML } from './utils'
 
 interface SurveyAppearanceProps {
     type: SurveyQuestionType
@@ -224,6 +224,7 @@ export function Customization({ appearance, surveyQuestionItem, onAppearanceChan
                         </div>
                     }
                     onChange={(checked) => onAppearanceChange({ ...appearance, whiteLabel: checked })}
+                    checked={appearance?.whiteLabel}
                     disabledReason={!whitelabelAvailable ? 'Upgrade to any paid plan to hide PostHog branding' : null}
                 />
             </div>
@@ -283,12 +284,12 @@ export function BaseAppearance({
                     </div>
                 )}
                 <div className="question-textarea-wrapper">
-                    <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitize(question) }} />
+                    <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitizeHTML(question) }} />
                     {/* Using dangerouslySetInnerHTML is safe here, because it's taking the user's input and showing it to the same user.
                     They can try passing in arbitrary scripts, but it would show up only for them, so it's like trying to XSS yourself, where
                     you already have all the data. Furthermore, sanitization should catch all obvious attempts */}
                     {description && (
-                        <div className="description" dangerouslySetInnerHTML={{ __html: sanitize(description) }} />
+                        <div className="description" dangerouslySetInnerHTML={{ __html: sanitizeHTML(description) }} />
                     )}
                     {type === SurveyQuestionType.Open && (
                         <textarea
@@ -490,9 +491,9 @@ export function SurveyRatingAppearance({
                         </button>
                     </div>
                 )}
-                <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitize(question) }} />
+                <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitizeHTML(question) }} />
                 {description && (
-                    <div className="description" dangerouslySetInnerHTML={{ __html: sanitize(description) }} />
+                    <div className="description" dangerouslySetInnerHTML={{ __html: sanitizeHTML(description) }} />
                 )}
                 <div className="rating-section">
                     <div className="rating-options">
@@ -590,9 +591,9 @@ export function SurveyMultipleChoiceAppearance({
                         </button>
                     </div>
                 )}
-                <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitize(question) }} />
+                <div className="survey-question" dangerouslySetInnerHTML={{ __html: sanitizeHTML(question) }} />
                 {description && (
-                    <div className="description" dangerouslySetInnerHTML={{ __html: sanitize(description) }} />
+                    <div className="description" dangerouslySetInnerHTML={{ __html: sanitizeHTML(description) }} />
                 )}
                 <div className="multiple-choice-options">
                     {(multipleChoiceQuestion.choices || []).map((choice, idx) => (
@@ -603,7 +604,7 @@ export function SurveyMultipleChoiceAppearance({
                                 name="choice"
                                 value={choice}
                             />
-                            <label style={{ color: textColor }}>{choice}</label>
+                            <label>{choice}</label>
                             <span className="choice-check">{check}</span>
                         </div>
                     ))}
@@ -658,11 +659,13 @@ export function SurveyThankYou({ appearance }: { appearance: SurveyAppearanceTyp
                 </div>
                 <h3
                     className="thank-you-message-header"
-                    dangerouslySetInnerHTML={{ __html: sanitize(appearance?.thankYouMessageHeader || 'Thank you!') }}
+                    dangerouslySetInnerHTML={{
+                        __html: sanitizeHTML(appearance?.thankYouMessageHeader || 'Thank you!'),
+                    }}
                 />
                 <div
                     className="thank-you-message-body"
-                    dangerouslySetInnerHTML={{ __html: sanitize(appearance?.thankYouMessageDescription || '') }}
+                    dangerouslySetInnerHTML={{ __html: sanitizeHTML(appearance?.thankYouMessageDescription || '') }}
                 />
                 <Button appearance={appearance} onSubmit={() => undefined}>
                     Close
diff --git a/frontend/src/scenes/surveys/SurveyEdit.tsx b/frontend/src/scenes/surveys/SurveyEdit.tsx
index 5c2f93222462fb..ab9630577ee9f1 100644
--- a/frontend/src/scenes/surveys/SurveyEdit.tsx
+++ b/frontend/src/scenes/surveys/SurveyEdit.tsx
@@ -49,6 +49,7 @@ import { SurveyFormAppearance } from './SurveyFormAppearance'
 import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
 import { surveysLogic } from './surveysLogic'
 import { FlagSelector } from 'lib/components/FlagSelector'
+import clsx from 'clsx'
 
 function PresentationTypeCard({
     title,
@@ -67,8 +68,12 @@ function PresentationTypeCard({
 }): JSX.Element {
     return (
         <div
-            style={{ borderColor: active ? 'var(--primary)' : 'var(--border)', height: 230, width: 260 }}
-            className="border rounded-md relative px-4 py-2 overflow-hidden"
+            // eslint-disable-next-line react/forbid-dom-props
+            style={{ height: 230, width: 260 }}
+            className={clsx(
+                'border rounded-md relative px-4 py-2 overflow-hidden',
+                active ? 'border-primary' : 'border-border'
+            )}
         >
             <p className="font-semibold m-0">{title}</p>
             {description && <p className="m-0 text-xs">{description}</p>}
@@ -694,13 +699,7 @@ export default function SurveyEdit(): JSX.Element {
                                                     description="Use the PostHog API to show/hide your survey programmatically"
                                                     value={SurveyType.API}
                                                 >
-                                                    <div
-                                                        style={{
-                                                            position: 'absolute',
-                                                            left: '1rem',
-                                                            width: 350,
-                                                        }}
-                                                    >
+                                                    <div className="absolute left-4" style={{ width: 350 }}>
                                                         <SurveyAPIEditor survey={survey} />
                                                     </div>
                                                 </PresentationTypeCard>
@@ -924,14 +923,12 @@ export default function SurveyEdit(): JSX.Element {
                 />
             </div>
             <LemonDivider vertical />
-            <div className="px-4">
-                <div className="flex flex-col items-center h-full sticky top-0 pt-8">
-                    <SurveyFormAppearance
-                        activePreview={selectedQuestion || 0}
-                        survey={survey}
-                        setActivePreview={(preview) => setSelectedQuestion(preview)}
-                    />
-                </div>
+            <div className="max-w-80 mx-4 flex flex-col items-center h-full w-full sticky top-0 pt-8">
+                <SurveyFormAppearance
+                    activePreview={selectedQuestion || 0}
+                    survey={survey}
+                    setActivePreview={(preview) => setSelectedQuestion(preview)}
+                />
             </div>
         </div>
     )
diff --git a/frontend/src/scenes/surveys/SurveyFormAppearance.tsx b/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
index 5ff65153a4508c..4ce32f42d61924 100644
--- a/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
+++ b/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
@@ -17,58 +17,54 @@ export function SurveyFormAppearance({
 }: SurveyFormAppearanceProps): JSX.Element {
     const showThankYou = survey.appearance.displayThankYouMessage && activePreview >= survey.questions.length
 
-    return (
-        <div className="SurveyFormAppearance">
-            {survey.type !== SurveyType.API ? (
-                <>
-                    {showThankYou ? (
-                        <SurveyThankYou appearance={survey.appearance} />
-                    ) : (
-                        <SurveyAppearance
-                            type={survey.questions[activePreview].type}
-                            surveyQuestionItem={survey.questions[activePreview]}
-                            question={survey.questions[activePreview].question}
-                            description={survey.questions[activePreview].description}
-                            link={
-                                survey.questions[activePreview].type === SurveyQuestionType.Link
-                                    ? (survey.questions[activePreview] as LinkSurveyQuestion).link
-                                    : undefined
-                            }
-                            appearance={{
-                                ...(survey.appearance || defaultSurveyAppearance),
-                                ...(survey.questions.length > 1 ? { submitButtonText: 'Next' } : null),
-                            }}
-                        />
-                    )}
-                    <LemonSelect
-                        onChange={(activePreview) => {
-                            setActivePreview(activePreview)
-                        }}
-                        className="mt-4 whitespace-nowrap"
-                        fullWidth
-                        value={activePreview}
-                        options={[
-                            ...survey.questions.map((question, index) => ({
-                                label: `${index + 1}. ${question.question ?? ''}`,
-                                value: index,
-                            })),
-                            ...(survey.appearance.displayThankYouMessage
-                                ? [
-                                      {
-                                          label: `${survey.questions.length + 1}. Confirmation message`,
-                                          value: survey.questions.length,
-                                      },
-                                  ]
-                                : []),
-                        ]}
-                    />
-                </>
+    return survey.type !== SurveyType.API ? (
+        <>
+            {showThankYou ? (
+                <SurveyThankYou appearance={survey.appearance} />
             ) : (
-                <div className="flex flex-col">
-                    <h4 className="text-center">API survey response</h4>
-                    <SurveyAPIEditor survey={survey} />
-                </div>
+                <SurveyAppearance
+                    type={survey.questions[activePreview].type}
+                    surveyQuestionItem={survey.questions[activePreview]}
+                    question={survey.questions[activePreview].question}
+                    description={survey.questions[activePreview].description}
+                    link={
+                        survey.questions[activePreview].type === SurveyQuestionType.Link
+                            ? (survey.questions[activePreview] as LinkSurveyQuestion).link
+                            : undefined
+                    }
+                    appearance={{
+                        ...(survey.appearance || defaultSurveyAppearance),
+                        ...(survey.questions.length > 1 ? { submitButtonText: 'Next' } : null),
+                    }}
+                />
             )}
+            <LemonSelect
+                onChange={(activePreview) => {
+                    setActivePreview(activePreview)
+                }}
+                className="mt-4 whitespace-nowrap"
+                fullWidth
+                value={activePreview}
+                options={[
+                    ...survey.questions.map((question, index) => ({
+                        label: `${index + 1}. ${question.question ?? ''}`,
+                        value: index,
+                    })),
+                    ...(survey.appearance.displayThankYouMessage
+                        ? [
+                              {
+                                  label: `${survey.questions.length + 1}. Confirmation message`,
+                                  value: survey.questions.length,
+                              },
+                          ]
+                        : []),
+                ]}
+            />
+        </>
+    ) : (
+        <div className="flex flex-col">
+            <h4 className="text-center">API survey response</h4>
+            <SurveyAPIEditor survey={survey} />
         </div>
     )
 }
diff --git a/frontend/src/scenes/surveys/SurveySettings.tsx b/frontend/src/scenes/surveys/SurveySettings.tsx
index 7214ff17271e57..6278a1530ce52d 100644
--- a/frontend/src/scenes/surveys/SurveySettings.tsx
+++ b/frontend/src/scenes/surveys/SurveySettings.tsx
@@ -31,7 +31,7 @@ export function SurveySettings({ inModal = false }: SurveySettingsProps): JSX.El
 
                 <p>
                     Please note your website needs to have the{' '}
-                    <Link to={urls.projectSettings() + '#snippet'}>PostHog snippet</Link> or at least version 1.81.1 of{' '}
+                    <Link to={urls.settings('project', 'snippet')}>PostHog snippet</Link> or at least version 1.81.1 of{' '}
                     <Link
                         to="https://posthog.com/docs/integrations/js-integration?utm_campaign=surveys&utm_medium=in-product"
                         target="_blank"
diff --git a/frontend/src/scenes/surveys/SurveyView.scss b/frontend/src/scenes/surveys/SurveyView.scss
index a0d2ee7572ed57..173960fa70e1f7 100644
--- a/frontend/src/scenes/surveys/SurveyView.scss
+++ b/frontend/src/scenes/surveys/SurveyView.scss
@@ -24,7 +24,3 @@
     max-height: 305px;
     overflow-y: scroll;
 }
-
-.masonry-item-link {
-    background-color: #fafaf9;
-}
diff --git a/frontend/src/scenes/surveys/SurveyView.tsx b/frontend/src/scenes/surveys/SurveyView.tsx
index 0da16f745b4abc..334027e67ba0de 100644
--- a/frontend/src/scenes/surveys/SurveyView.tsx
+++ b/frontend/src/scenes/surveys/SurveyView.tsx
@@ -213,7 +213,7 @@ export function SurveyView({ id }: { id: string }): JSX.Element {
                                                 </div>
                                             )}
                                             {survey.type !== SurveyType.API ? (
-                                                <div className="mt-6">
+                                                <div className="mt-6 max-w-80">
                                                     <SurveyFormAppearance
                                                         activePreview={selectedQuestion || 0}
                                                         survey={survey}
diff --git a/frontend/src/scenes/surveys/Surveys.stories.tsx b/frontend/src/scenes/surveys/Surveys.stories.tsx
index f7217ccd16db99..6caf5cba7f50a7 100644
--- a/frontend/src/scenes/surveys/Surveys.stories.tsx
+++ b/frontend/src/scenes/surveys/Surveys.stories.tsx
@@ -3,8 +3,15 @@ import { App } from 'scenes/App'
 import { urls } from 'scenes/urls'
 import { mswDecorator } from '~/mocks/browser'
 import { toPaginatedResponse } from '~/mocks/handlers'
-import { PropertyFilterType, PropertyOperator, Survey, SurveyQuestionType, SurveyType } from '~/types'
-import { Meta } from '@storybook/react'
+import {
+    FeatureFlagBasicType,
+    PropertyFilterType,
+    PropertyOperator,
+    Survey,
+    SurveyQuestionType,
+    SurveyType,
+} from '~/types'
+import { Meta, StoryFn } from '@storybook/react'
 import { router } from 'kea-router'
 import { SurveyEditSection, surveyLogic } from './surveyLogic'
 
@@ -103,26 +110,6 @@ const MOCK_SURVEY_WITH_RELEASE_CONS: Survey = {
     archived: false,
 }
 
-// const MOCK_SURVEY_DISMISSED = {
-//     "clickhouse": "SELECT count() AS `survey dismissed` FROM events WHERE and(equals(events.team_id, 1), equals(events.event, %(hogql_val_0)s), equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(events.properties, %(hogql_val_1)s), ''), 'null'), '^\"|\"$', ''), %(hogql_val_2)s)) LIMIT 100 SETTINGS readonly=2, max_execution_time=60",
-//     "columns": [
-//         "survey dismissed"
-//     ],
-//     "hogql": "SELECT count() AS `survey dismissed` FROM events WHERE and(equals(event, 'survey dismissed'), equals(properties.$survey_id, '0188e637-3b72-0000-f407-07a338652af9')) LIMIT 100",
-//     "query": "select count() as 'survey dismissed' from events where event == 'survey dismissed' and properties.$survey_id == '0188e637-3b72-0000-f407-07a338652af9'",
-//     "results": [
-//         [
-//             0
-//         ]
-//     ],
-//     "types": [
-//         [
-//             "survey dismissed",
-//             "UInt64"
-//         ]
-//     ]
-// }
-
 const MOCK_SURVEY_SHOWN = {
     clickhouse:
         "SELECT count() AS `survey shown` FROM events WHERE and(equals(events.team_id, 1), equals(events.event, %(hogql_val_0)s), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(events.properties, %(hogql_val_1)s), ''), 'null'), '^\"|\"$', ''), %(hogql_val_2)s), 0)) LIMIT 100 SETTINGS readonly=2, max_execution_time=60",
@@ -170,34 +157,42 @@ const meta: Meta = {
                 '/api/projects/:team_id/surveys/0187c279-bcae-0000-34f5-4f121921f005/': MOCK_BASIC_SURVEY,
                 '/api/projects/:team_id/surveys/0187c279-bcae-0000-34f5-4f121921f006/': MOCK_SURVEY_WITH_RELEASE_CONS,
                 '/api/projects/:team_id/surveys/responses_count/': MOCK_RESPONSES_COUNT,
+                [`/api/projects/:team_id/feature_flags/${
+                    (MOCK_SURVEY_WITH_RELEASE_CONS.linked_flag as FeatureFlagBasicType).id
+                }`]: toPaginatedResponse([MOCK_SURVEY_WITH_RELEASE_CONS.linked_flag]),
+                [`/api/projects/:team_id/feature_flags/${
+                    (MOCK_SURVEY_WITH_RELEASE_CONS.targeting_flag as FeatureFlagBasicType).id
+                }`]: toPaginatedResponse([MOCK_SURVEY_WITH_RELEASE_CONS.targeting_flag]),
             },
             post: {
-                '/api/projects/:team_id/query/': (req) => {
-                    if ((req.body as any).kind == 'EventsQuery') {
-                        return MOCK_SURVEY_RESULTS
+                '/api/projects/:team_id/query/': async (req, res, ctx) => {
+                    const body = await req.json()
+                    if (body.kind == 'EventsQuery') {
+                        return res(ctx.json(MOCK_SURVEY_RESULTS))
+                    } else {
+                        return res(ctx.json(MOCK_SURVEY_SHOWN))
                     }
-                    return MOCK_SURVEY_SHOWN
                 },
             },
         }),
     ],
 }
 export default meta
-export function SurveysList(): JSX.Element {
+export const SurveysList: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.surveys())
     }, [])
     return <App />
 }
 
-export function NewSurvey(): JSX.Element {
+export const NewSurvey: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('new'))
     }, [])
     return <App />
 }
 
-export function NewSurveyCustomisationSection(): JSX.Element {
+export const NewSurveyCustomisationSection: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('new'))
         surveyLogic({ id: 'new' }).mount()
@@ -206,7 +201,7 @@ export function NewSurveyCustomisationSection(): JSX.Element {
     return <App />
 }
 
-export function NewSurveyPresentationSection(): JSX.Element {
+export const NewSurveyPresentationSection: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('new'))
         surveyLogic({ id: 'new' }).mount()
@@ -215,7 +210,7 @@ export function NewSurveyPresentationSection(): JSX.Element {
     return <App />
 }
 
-export function NewSurveyTargetingSection(): JSX.Element {
+export const NewSurveyTargetingSection: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('new'))
         surveyLogic({ id: 'new' }).mount()
@@ -233,7 +228,7 @@ export function NewSurveyTargetingSection(): JSX.Element {
     return <App />
 }
 
-export function NewSurveyAppearanceSection(): JSX.Element {
+export const NewSurveyAppearanceSection: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('new'))
         surveyLogic({ id: 'new' }).mount()
@@ -242,21 +237,26 @@ export function NewSurveyAppearanceSection(): JSX.Element {
     return <App />
 }
 
-export function SurveyView(): JSX.Element {
+export const SurveyView: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey(MOCK_SURVEY_WITH_RELEASE_CONS.id))
     }, [])
     return <App />
 }
+SurveyView.parameters = {
+    testOptions: {
+        skip: true, // FIXME: Fix the mocked data so that survey results can actually load
+    },
+}
 
-export function SurveyTemplates(): JSX.Element {
+export const SurveyTemplates: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.surveyTemplates())
     }, [])
     return <App />
 }
 
-export function SurveyNotFound(): JSX.Element {
+export const SurveyNotFound: StoryFn = () => {
     useEffect(() => {
         router.actions.push(urls.survey('1234566789'))
     }, [])
diff --git a/frontend/src/scenes/surveys/surveyLogic.tsx b/frontend/src/scenes/surveys/surveyLogic.tsx
index df328e14a22bc3..72a43c98534439 100644
--- a/frontend/src/scenes/surveys/surveyLogic.tsx
+++ b/frontend/src/scenes/surveys/surveyLogic.tsx
@@ -23,7 +23,7 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { featureFlagLogic } from 'scenes/feature-flags/featureFlagLogic'
 import { featureFlagLogic as enabledFlagLogic } from 'lib/logic/featureFlagLogic'
 import { defaultSurveyFieldValues, NEW_SURVEY, NewSurvey } from './constants'
-import { sanitize } from 'dompurify'
+import { sanitizeHTML } from './utils'
 
 export enum SurveyEditSection {
     Steps = 'steps',
@@ -134,7 +134,10 @@ export const surveyLogic = kea<surveyLogicType>([
                         actions.reportSurveyViewed(survey)
                         return survey
                     } catch (error: any) {
-                        actions.setSurveyMissing()
+                        if (error.status === 404) {
+                            actions.setSurveyMissing()
+                            return { ...NEW_SURVEY }
+                        }
                         throw error
                     }
                 }
@@ -733,16 +736,16 @@ function sanitizeQuestions(surveyPayload: Partial<Survey>): Partial<Survey> {
         return surveyPayload
     }
 
-    const sanitizedThankYouHeader = sanitize(surveyPayload.appearance?.thankYouMessageHeader || '')
-    const sanitizedThankYouDescription = sanitize(surveyPayload.appearance?.thankYouMessageDescription || '')
+    const sanitizedThankYouHeader = sanitizeHTML(surveyPayload.appearance?.thankYouMessageHeader || '')
+    const sanitizedThankYouDescription = sanitizeHTML(surveyPayload.appearance?.thankYouMessageDescription || '')
 
     return {
         ...surveyPayload,
         questions: surveyPayload.questions?.map((rawQuestion) => {
             return {
                 ...rawQuestion,
-                description: sanitize(rawQuestion.description || ''),
-                question: sanitize(rawQuestion.question || ''),
+                description: sanitizeHTML(rawQuestion.description || ''),
+                question: sanitizeHTML(rawQuestion.question || ''),
             }
         }),
         appearance: {
diff --git a/frontend/src/scenes/surveys/surveyViewViz.tsx b/frontend/src/scenes/surveys/surveyViewViz.tsx
index 789d46065c6cd4..0b5786ab2c109a 100644
--- a/frontend/src/scenes/surveys/surveyViewViz.tsx
+++ b/frontend/src/scenes/surveys/surveyViewViz.tsx
@@ -65,7 +65,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
         <>
             {total > 0 && (
                 <div className="mb-8">
-                    <div className="w-full mx-auto h-10 mb-4">
+                    <div className="relative w-full mx-auto h-10 mb-4">
                         {[
                             {
                                 count: seen,
@@ -102,6 +102,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
                             >
                                 <div
                                     className={`h-10 text-white text-center absolute cursor-pointer ${classes}`}
+                                    // eslint-disable-next-line react/forbid-dom-props
                                     style={style}
                                 >
                                     <span className="inline-flex font-semibold max-w-full px-1 truncate leading-10">
@@ -121,6 +122,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
                                 ({ count, label, style }) =>
                                     count > 0 && (
                                         <div key={`survey-summary-legend-${label}`} className="flex items-center mr-6">
+                                            {/* eslint-disable-next-line react/forbid-dom-props */}
                                             <div className="w-3 h-3 rounded-full mr-2" style={style} />
                                             <span className="font-semibold text-muted-alt">{`${label} (${(
                                                 (count / total) *
@@ -345,6 +347,7 @@ export function SingleChoiceQuestionPieChart({
                                     >
                                         <div
                                             className="w-3 h-3 rounded-full mr-2"
+                                            // eslint-disable-next-line react/forbid-dom-props
                                             style={{ backgroundColor: colors[i % colors.length] }}
                                         />
                                         <span className="font-semibold text-muted-alt max-w-48 truncate">{`${labels[i]}`}</span>
@@ -483,7 +486,7 @@ export function OpenTextViz({
                                     <div className="masonry-item-text text-center italic font-semibold px-5 py-4">
                                         {event.properties[surveyResponseField]}
                                     </div>
-                                    <div className="masonry-item-link items-center px-5 py-4 border-t rounded-b truncate w-full">
+                                    <div className="bg-bg-light items-center px-5 py-4 border-t rounded-b truncate w-full">
                                         <PersonDisplay
                                             person={personProp}
                                             withIcon={true}
diff --git a/frontend/src/scenes/surveys/utils.ts b/frontend/src/scenes/surveys/utils.ts
new file mode 100644
index 00000000000000..7ab39dc59c6e54
--- /dev/null
+++ b/frontend/src/scenes/surveys/utils.ts
@@ -0,0 +1,7 @@
+import { sanitize } from 'dompurify'
+
+const sanitizeConfig = { ADD_ATTR: ['target'] }
+
+export function sanitizeHTML(html: string): string {
+    return sanitize(html, sanitizeConfig)
+}
diff --git a/frontend/src/scenes/teamLogic.tsx b/frontend/src/scenes/teamLogic.tsx
index be21abb60f6dad..26fadbed4ed66e 100644
--- a/frontend/src/scenes/teamLogic.tsx
+++ b/frontend/src/scenes/teamLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import api from 'lib/api'
 import type { teamLogicType } from './teamLogicType'
 import { CorrelationConfigType, PropertyOperator, TeamPublicType, TeamType } from '~/types'
@@ -222,28 +222,26 @@ export const teamLogic = kea<teamLogicType>([
             lemonToast.success('Project has been deleted')
         },
     })),
-    events(({ actions }) => ({
-        afterMount: () => {
-            const appContext = getAppContext()
-            const currentTeam = appContext?.current_team
-            const switchedTeam = appContext?.switched_team
-            if (switchedTeam) {
-                lemonToast.info(<>You've switched to&nbsp;project {currentTeam?.name}</>, {
-                    button: {
-                        label: 'Switch back',
-                        action: () => userLogic.actions.updateCurrentTeam(switchedTeam),
-                    },
-                    icon: <IconSwapHoriz />,
-                })
-            }
+    afterMount(({ actions }) => {
+        const appContext = getAppContext()
+        const currentTeam = appContext?.current_team
+        const switchedTeam = appContext?.switched_team
+        if (switchedTeam) {
+            lemonToast.info(<>You've switched to&nbsp;project {currentTeam?.name}</>, {
+                button: {
+                    label: 'Switch back',
+                    action: () => userLogic.actions.updateCurrentTeam(switchedTeam),
+                },
+                icon: <IconSwapHoriz />,
+            })
+        }
 
-            if (currentTeam) {
-                // If app context is available (it should be practically always) we can immediately know currentTeam
-                actions.loadCurrentTeamSuccess(currentTeam)
-            } else {
-                // If app context is not available, a traditional request is needed
-                actions.loadCurrentTeam()
-            }
-        },
-    })),
+        if (currentTeam) {
+            // If app context is available (it should be practically always) we can immediately know currentTeam
+            actions.loadCurrentTeamSuccess(currentTeam)
+        } else {
+            // If app context is not available, a traditional request is needed
+            actions.loadCurrentTeam()
+        }
+    }),
 ])
diff --git a/frontend/src/scenes/toolbar-launch/ToolbarLaunch.tsx b/frontend/src/scenes/toolbar-launch/ToolbarLaunch.tsx
index 8dbc985e2d1ada..e844b3d9ab9ec8 100644
--- a/frontend/src/scenes/toolbar-launch/ToolbarLaunch.tsx
+++ b/frontend/src/scenes/toolbar-launch/ToolbarLaunch.tsx
@@ -51,7 +51,7 @@ function ToolbarLaunch(): JSX.Element {
             <AuthorizedUrlList type={AuthorizedUrlListType.TOOLBAR_URLS} addText={'Add authorized URL'} />
 
             <div className="footer-caption text-muted mt-4 text-center">
-                Make sure you're using the <Link to={`${urls.projectSettings()}#snippet`}>HTML snippet</Link> or the
+                Make sure you're using the <Link to={`${urls.settings('project')}#snippet`}>HTML snippet</Link> or the
                 latest <code>posthog-js</code> version.
             </div>
 
diff --git a/frontend/src/scenes/trends/Trends.tsx b/frontend/src/scenes/trends/Trends.tsx
index e73da5d617fda3..8938d477173f10 100644
--- a/frontend/src/scenes/trends/Trends.tsx
+++ b/frontend/src/scenes/trends/Trends.tsx
@@ -8,14 +8,16 @@ import { WorldMap } from 'scenes/insights/views/WorldMap'
 import { BoldNumber } from 'scenes/insights/views/BoldNumber'
 import { LemonButton } from '@posthog/lemon-ui'
 import { trendsDataLogic } from './trendsDataLogic'
+import { QueryContext } from '~/queries/types'
 
 interface Props {
     view: InsightType
+    context?: QueryContext
 }
 
-export function TrendInsight({ view }: Props): JSX.Element {
+export function TrendInsight({ view, context }: Props): JSX.Element {
     const { insightMode } = useValues(insightSceneLogic)
-    const { insightProps } = useValues(insightLogic)
+    const { insightProps, showPersonsModal } = useValues(insightLogic)
 
     const { display, series, breakdown, loadMoreBreakdownUrl, breakdownValuesLoading } = useValues(
         trendsDataLogic(insightProps)
@@ -30,10 +32,10 @@ export function TrendInsight({ view }: Props): JSX.Element {
             display === ChartDisplayType.ActionsAreaGraph ||
             display === ChartDisplayType.ActionsBar
         ) {
-            return <ActionsLineGraph />
+            return <ActionsLineGraph showPersonsModal={showPersonsModal} context={context} />
         }
         if (display === ChartDisplayType.BoldNumber) {
-            return <BoldNumber />
+            return <BoldNumber showPersonsModal={showPersonsModal} context={context} />
         }
         if (display === ChartDisplayType.ActionsTable) {
             const ActionsTable = InsightsTable
@@ -47,13 +49,13 @@ export function TrendInsight({ view }: Props): JSX.Element {
             )
         }
         if (display === ChartDisplayType.ActionsPie) {
-            return <ActionsPie />
+            return <ActionsPie showPersonsModal={showPersonsModal} context={context} />
         }
         if (display === ChartDisplayType.ActionsBarValue) {
-            return <ActionsHorizontalBar />
+            return <ActionsHorizontalBar showPersonsModal={showPersonsModal} context={context} />
         }
         if (display === ChartDisplayType.WorldMap) {
-            return <WorldMap />
+            return <WorldMap showPersonsModal={showPersonsModal} context={context} />
         }
     }
 
diff --git a/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx b/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx
index bb26ecec52e83d..9fe2c882f8dd12 100644
--- a/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx
+++ b/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx
@@ -14,6 +14,8 @@ import { isInsightVizNode, isLifecycleQuery } from '~/queries/utils'
 import { DataTableNode, NodeKind } from '~/queries/schema'
 import { combineUrl, router } from 'kea-router'
 import { urls } from 'scenes/urls'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { FEATURE_FLAGS } from 'lib/constants'
 
 export function ActionsLineGraph({
     inSharedMode = false,
@@ -21,6 +23,7 @@ export function ActionsLineGraph({
     context,
 }: ChartParams): JSX.Element | null {
     const { insightProps, hiddenLegendKeys } = useValues(insightLogic)
+    const { featureFlags } = useValues(featureFlagLogic)
     const { query } = useValues(insightDataLogic(insightProps))
     const {
         indexedResults,
@@ -82,7 +85,15 @@ export function ActionsLineGraph({
                           const day = dataset?.days?.[index] ?? ''
                           const label = dataset?.label ?? dataset?.labels?.[index] ?? ''
 
-                          if (isLifecycle && query && isInsightVizNode(query) && isLifecycleQuery(query.source)) {
+                          const hogQLInsightsFlagEnabled = Boolean(featureFlags[FEATURE_FLAGS.HOGQL_INSIGHTS])
+
+                          if (
+                              hogQLInsightsFlagEnabled &&
+                              isLifecycle &&
+                              query &&
+                              isInsightVizNode(query) &&
+                              isLifecycleQuery(query.source)
+                          ) {
                               const newQuery: DataTableNode = {
                                   kind: NodeKind.DataTableNode,
                                   full: true,
diff --git a/frontend/src/scenes/urls.ts b/frontend/src/scenes/urls.ts
index 3e6823c7fa1b68..7f6fa0c5b03eab 100644
--- a/frontend/src/scenes/urls.ts
+++ b/frontend/src/scenes/urls.ts
@@ -13,6 +13,7 @@ import { ExportOptions } from '~/exporter/types'
 import { AppMetricsUrlParams } from './apps/appMetricsSceneLogic'
 import { PluginTab } from './plugins/types'
 import { toParams } from 'lib/utils'
+import { SettingId, SettingLevelId, SettingSectionId } from './settings/types'
 
 /**
  * To add a new URL to the front end:
@@ -112,12 +113,13 @@ export const urls = {
     survey: (id: ':id' | 'new' | string): string => `/surveys/${id}`,
     surveyTemplates: (): string => '/survey_templates',
     dataWarehouse: (): string => '/data-warehouse',
+    dataWarehouseTable: (): string => `/data-warehouse/new`,
     dataWarehousePosthog: (): string => '/data-warehouse/posthog',
     dataWarehouseExternal: (): string => '/data-warehouse/external',
     dataWarehouseSavedQueries: (): string => '/data-warehouse/views',
     dataWarehouseSettings: (): string => '/data-warehouse/settings',
-    annotations: (): string => '/annotations',
-    annotation: (id: AnnotationType['id'] | ':id'): string => `/annotations/${id}`,
+    annotations: (): string => '/data-management/annotations',
+    annotation: (id: AnnotationType['id'] | ':id'): string => `/data-management/annotations/${id}`,
     projectApps: (tab?: PluginTab): string => `/project/apps${tab ? `?tab=${tab}` : ''}`,
     projectApp: (id: string | number): string => `/project/apps/${id}`,
     projectAppSearch: (name: string): string => `/project/apps?name=${name}`,
@@ -133,9 +135,8 @@ export const urls = {
         combineUrl(`/app/${pluginConfigId}/logs`, searchParams).url,
     projectCreateFirst: (): string => '/project/create',
     projectHomepage: (): string => '/home',
-    projectSettings: (section?: string): string => `/project/settings${section ? `#${section}` : ''}`,
-    mySettings: (): string => '/me/settings',
-    organizationSettings: (): string => '/organization/settings',
+    settings: (section: SettingSectionId | SettingLevelId = 'project', setting?: SettingId): string =>
+        combineUrl(`/settings/${section}`, undefined, setting).url,
     organizationCreationConfirm: (): string => '/organization/confirm-creation',
     organizationCreateFirst: (): string => '/organization/create',
     toolbarLaunch: (): string => '/toolbar',
diff --git a/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx b/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
index 617ec0c62f5f12..a38e6b9164edfb 100644
--- a/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
+++ b/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
@@ -3,7 +3,7 @@ import { supportLogic } from 'lib/components/Support/supportLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { Link } from 'lib/lemon-ui/Link'
-import { IconBugReport, IconFeedback, IconGithub } from 'lib/lemon-ui/icons'
+import { IconBugReport, IconFeedback } from 'lib/lemon-ui/icons'
 
 export const WebAnalyticsNotice = (): JSX.Element => {
     const { openSupportForm } = useActions(supportLogic)
@@ -13,7 +13,7 @@ export const WebAnalyticsNotice = (): JSX.Element => {
 
     return (
         <LemonBanner type={'info'}>
-            <p>PostHog Web Analytics is in closed Alpha. Thanks for taking part! We'd love to hear what you think.</p>
+            <p>PostHog Web Analytics is in opt-in Beta. Thanks for taking part! We'd love to hear what you think.</p>
             {showSupportOptions ? (
                 <p>
                     <Link onClick={() => openSupportForm('bug')}>
@@ -22,10 +22,6 @@ export const WebAnalyticsNotice = (): JSX.Element => {
                     -{' '}
                     <Link onClick={() => openSupportForm('feedback')}>
                         <IconFeedback /> Give feedback
-                    </Link>{' '}
-                    -{' '}
-                    <Link to={'https://github.com/PostHog/posthog/issues/18177'}>
-                        <IconGithub /> View GitHub issue
                     </Link>
                 </p>
             ) : null}
diff --git a/frontend/src/scenes/web-analytics/WebAnalyticsDataTable.tsx b/frontend/src/scenes/web-analytics/WebAnalyticsTile.tsx
similarity index 72%
rename from frontend/src/scenes/web-analytics/WebAnalyticsDataTable.tsx
rename to frontend/src/scenes/web-analytics/WebAnalyticsTile.tsx
index 82263ae63d009c..815e57d583d589 100644
--- a/frontend/src/scenes/web-analytics/WebAnalyticsDataTable.tsx
+++ b/frontend/src/scenes/web-analytics/WebAnalyticsTile.tsx
@@ -1,11 +1,13 @@
 import { QueryContext, QueryContextColumnComponent, QueryContextColumnTitleComponent } from '~/queries/types'
-import { DataTableNode, NodeKind, WebStatsBreakdown } from '~/queries/schema'
+import { DataTableNode, InsightVizNode, NodeKind, WebStatsBreakdown } from '~/queries/schema'
 import { UnexpectedNeverError } from 'lib/utils'
 import { useActions } from 'kea'
 import { webAnalyticsLogic } from 'scenes/web-analytics/webAnalyticsLogic'
 import { useCallback, useMemo } from 'react'
 import { Query } from '~/queries/Query/Query'
 import { countryCodeToFlag, countryCodeToName } from 'scenes/insights/views/WorldMap'
+import { PropertyFilterType } from '~/types'
+import { ChartDisplayType } from '~/types'
 
 const PercentageCell: QueryContextColumnComponent = ({ value }) => {
     if (typeof value === 'number') {
@@ -109,36 +111,38 @@ const BreakdownValueCell: QueryContextColumnComponent = (props) => {
     }
 }
 
-export const webStatsBreakdownToPropertyName = (breakdownBy: WebStatsBreakdown): string => {
+export const webStatsBreakdownToPropertyName = (
+    breakdownBy: WebStatsBreakdown
+): { key: string; type: PropertyFilterType.Person | PropertyFilterType.Event } => {
     switch (breakdownBy) {
         case WebStatsBreakdown.Page:
-            return '$pathname'
+            return { key: '$pathname', type: PropertyFilterType.Event }
         case WebStatsBreakdown.InitialPage:
-            return '$client_session_initial_pathname'
+            return { key: '$initial_pathname', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialReferringDomain:
-            return '$client_session_initial_referring_host'
+            return { key: '$initial_referring_domain', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialUTMSource:
-            return '$client_session_initial_utm_source'
+            return { key: '$initial_utm_source', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialUTMCampaign:
-            return '$client_session_initial_utm_campaign'
+            return { key: '$initial_utm_campaign', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialUTMMedium:
-            return '$client_session_initial_utm_medium'
+            return { key: '$initial_utm_medium', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialUTMContent:
-            return '$client_session_initial_utm_content'
+            return { key: '$initial_utm_content', type: PropertyFilterType.Person }
         case WebStatsBreakdown.InitialUTMTerm:
-            return '$client_session_initial_utm_term'
+            return { key: '$initial_utm_term', type: PropertyFilterType.Person }
         case WebStatsBreakdown.Browser:
-            return '$browser'
+            return { key: '$browser', type: PropertyFilterType.Event }
         case WebStatsBreakdown.OS:
-            return '$os'
+            return { key: '$os', type: PropertyFilterType.Event }
         case WebStatsBreakdown.DeviceType:
-            return '$device_type'
+            return { key: '$device_type', type: PropertyFilterType.Event }
         case WebStatsBreakdown.Country:
-            return '$geoip_country_code'
+            return { key: '$geoip_country_code', type: PropertyFilterType.Event }
         case WebStatsBreakdown.Region:
-            return '$geoip_subdivision_1_code'
+            return { key: '$geoip_subdivision_1_code', type: PropertyFilterType.Event }
         case WebStatsBreakdown.City:
-            return '$geoip_city_name'
+            return { key: '$geoip_city_name', type: PropertyFilterType.Event }
         default:
             throw new UnexpectedNeverError(breakdownBy)
     }
@@ -168,6 +172,32 @@ export const webAnalyticsDataTableQueryContext: QueryContext = {
     },
 }
 
+export const WebStatsTrendTile = ({ query }: { query: InsightVizNode }): JSX.Element => {
+    const { togglePropertyFilter } = useActions(webAnalyticsLogic)
+    const { key: worldMapPropertyName } = webStatsBreakdownToPropertyName(WebStatsBreakdown.Country)
+    const onWorldMapClick = useCallback(
+        (breakdownValue: string) => {
+            togglePropertyFilter(PropertyFilterType.Event, worldMapPropertyName, breakdownValue)
+        },
+        [togglePropertyFilter, worldMapPropertyName]
+    )
+
+    const context = useMemo((): QueryContext => {
+        return {
+            ...webAnalyticsDataTableQueryContext,
+            chartRenderingMetadata: {
+                [ChartDisplayType.WorldMap]: {
+                    countryProps: (countryCode, values) => ({
+                        onClick: values && values.count > 0 ? () => onWorldMapClick(countryCode) : undefined,
+                    }),
+                },
+            },
+        }
+    }, [onWorldMapClick])
+
+    return <Query query={query} readOnly={true} context={context} />
+}
+
 export const WebStatsTableTile = ({
     query,
     breakdownBy,
@@ -176,13 +206,13 @@ export const WebStatsTableTile = ({
     breakdownBy: WebStatsBreakdown
 }): JSX.Element => {
     const { togglePropertyFilter } = useActions(webAnalyticsLogic)
-    const propertyName = webStatsBreakdownToPropertyName(breakdownBy)
+    const { key, type } = webStatsBreakdownToPropertyName(breakdownBy)
 
     const onClick = useCallback(
         (breakdownValue: string) => {
-            togglePropertyFilter(propertyName, breakdownValue)
+            togglePropertyFilter(type, key, breakdownValue)
         },
-        [togglePropertyFilter, propertyName]
+        [togglePropertyFilter, type, key]
     )
 
     const context = useMemo((): QueryContext => {
diff --git a/frontend/src/scenes/web-analytics/WebDashboard.tsx b/frontend/src/scenes/web-analytics/WebDashboard.tsx
index 6838e252b5ebfe..48efb7c9529a9b 100644
--- a/frontend/src/scenes/web-analytics/WebDashboard.tsx
+++ b/frontend/src/scenes/web-analytics/WebDashboard.tsx
@@ -2,11 +2,15 @@ import { Query } from '~/queries/Query/Query'
 import { useActions, useValues } from 'kea'
 import { TabsTile, webAnalyticsLogic } from 'scenes/web-analytics/webAnalyticsLogic'
 import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
-import { isEventPropertyFilter } from 'lib/components/PropertyFilters/utils'
+import { isEventPropertyOrPersonPropertyFilter } from 'lib/components/PropertyFilters/utils'
 import { NodeKind, QuerySchema } from '~/queries/schema'
 import { DateFilter } from 'lib/components/DateFilter/DateFilter'
 import { WebAnalyticsNotice } from 'scenes/web-analytics/WebAnalyticsNotice'
-import { webAnalyticsDataTableQueryContext, WebStatsTableTile } from 'scenes/web-analytics/WebAnalyticsDataTable'
+import {
+    webAnalyticsDataTableQueryContext,
+    WebStatsTableTile,
+    WebStatsTrendTile,
+} from 'scenes/web-analytics/WebAnalyticsTile'
 import { WebTabs } from 'scenes/web-analytics/WebTabs'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 
@@ -18,8 +22,13 @@ const Filters = (): JSX.Element => {
             <div className="flex flex-row flex-wrap gap-2">
                 <DateFilter dateFrom={dateFrom} dateTo={dateTo} onChange={setDates} />
                 <PropertyFilters
-                    taxonomicGroupTypes={[TaxonomicFilterGroupType.EventProperties]}
-                    onChange={(filters) => setWebAnalyticsFilters(filters.filter(isEventPropertyFilter))}
+                    taxonomicGroupTypes={[
+                        TaxonomicFilterGroupType.EventProperties,
+                        TaxonomicFilterGroupType.PersonProperties,
+                    ]}
+                    onChange={(filters) =>
+                        setWebAnalyticsFilters(filters.filter(isEventPropertyOrPersonPropertyFilter))
+                    }
                     propertyFilters={webAnalyticsFilters}
                     pageKey={'web-analytics'}
                     eventNames={['$pageview', '$pageleave', '$autocapture']}
@@ -33,13 +42,23 @@ const Filters = (): JSX.Element => {
                             '$geoip_country_code',
                             '$geoip_subdivision_1_code',
                             '$geoip_city_name',
-                            '$client_session_initial_pathname',
-                            '$client_session_initial_referring_host',
-                            '$client_session_initial_utm_source',
-                            '$client_session_initial_utm_campaign',
-                            '$client_session_initial_utm_medium',
-                            '$client_session_initial_utm_content',
-                            '$client_session_initial_utm_term',
+                            // re-enable after https://github.com/PostHog/posthog-js/pull/875 is merged
+                            // '$client_session_initial_pathname',
+                            // '$client_session_initial_referring_host',
+                            // '$client_session_initial_utm_source',
+                            // '$client_session_initial_utm_campaign',
+                            // '$client_session_initial_utm_medium',
+                            // '$client_session_initial_utm_content',
+                            // '$client_session_initial_utm_term',
+                        ],
+                        [TaxonomicFilterGroupType.PersonProperties]: [
+                            '$initial_pathname',
+                            '$initial_referring_domain',
+                            '$initial_utm_source',
+                            '$initial_utm_campaign',
+                            '$initial_utm_medium',
+                            '$initial_utm_content',
+                            '$initial_utm_term',
                         ],
                     }}
                 />
@@ -100,6 +119,9 @@ const WebQuery = ({ query }: { query: QuerySchema }): JSX.Element => {
     if (query.kind === NodeKind.DataTableNode && query.source.kind === NodeKind.WebStatsTableQuery) {
         return <WebStatsTableTile query={query} breakdownBy={query.source.breakdownBy} />
     }
+    if (query.kind === NodeKind.InsightVizNode) {
+        return <WebStatsTrendTile query={query} />
+    }
 
     return <Query query={query} readOnly={true} context={webAnalyticsDataTableQueryContext} />
 }
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
index dcf7b16b4d45c7..f507a6c4e8d148 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
@@ -1,15 +1,14 @@
 import { actions, connect, kea, listeners, path, reducers, selectors, sharedListeners } from 'kea'
 
 import type { webAnalyticsLogicType } from './webAnalyticsLogicType'
-import { NodeKind, QuerySchema, WebAnalyticsPropertyFilters, WebStatsBreakdown } from '~/queries/schema'
 import {
-    BaseMathType,
-    ChartDisplayType,
-    EventPropertyFilter,
-    HogQLPropertyFilter,
-    PropertyFilterType,
-    PropertyOperator,
-} from '~/types'
+    NodeKind,
+    QuerySchema,
+    WebAnalyticsPropertyFilter,
+    WebAnalyticsPropertyFilters,
+    WebStatsBreakdown,
+} from '~/queries/schema'
+import { BaseMathType, ChartDisplayType, PropertyFilterType, PropertyOperator } from '~/types'
 import { isNotNil } from 'lib/utils'
 
 export interface WebTileLayout {
@@ -39,6 +38,12 @@ export interface TabsTile extends BaseTile {
 
 export type WebDashboardTile = QueryTile | TabsTile
 
+export enum GraphsTab {
+    UNIQUE_USERS = 'UNIQUE_USERS',
+    PAGE_VIEWS = 'PAGE_VIEWS',
+    NUM_SESSION = 'NUM_SESSION',
+}
+
 export enum SourceTab {
     REFERRING_DOMAIN = 'REFERRING_DOMAIN',
     UTM_SOURCE = 'UTM_SOURCE',
@@ -65,17 +70,23 @@ export enum GeographyTab {
 
 export const initialWebAnalyticsFilter = [] as WebAnalyticsPropertyFilters
 
-const setOncePropertyNames = ['$initial_pathname', '$initial_referrer', '$initial_utm_source', '$initial_utm_campaign']
-const hogqlForSetOnceProperty = (key: string, value: string): string => `properties.$set_once.${key} = '${value}'`
-const isHogqlForSetOnceProperty = (key: string, p: HogQLPropertyFilter): boolean =>
-    setOncePropertyNames.includes(key) && p.key.startsWith(`properties.$set_once.${key} = `)
-
 export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
     path(['scenes', 'webAnalytics', 'webAnalyticsSceneLogic']),
     connect({}),
     actions({
         setWebAnalyticsFilters: (webAnalyticsFilters: WebAnalyticsPropertyFilters) => ({ webAnalyticsFilters }),
-        togglePropertyFilter: (key: string, value: string) => ({ key, value }),
+        togglePropertyFilter: (
+            type: PropertyFilterType.Event | PropertyFilterType.Person,
+            key: string,
+            value: string | number
+        ) => ({
+            type,
+            key,
+            value,
+        }),
+        setGraphsTab: (tab: string) => ({
+            tab,
+        }),
         setSourceTab: (tab: string) => ({
             tab,
         }),
@@ -93,80 +104,44 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
             initialWebAnalyticsFilter,
             {
                 setWebAnalyticsFilters: (_, { webAnalyticsFilters }) => webAnalyticsFilters,
-                togglePropertyFilter: (oldPropertyFilters, { key, value }) => {
-                    if (
-                        oldPropertyFilters.some(
-                            (f) =>
-                                (f.type === PropertyFilterType.Event &&
-                                    f.key === key &&
-                                    f.operator === PropertyOperator.Exact) ||
-                                (f.type === PropertyFilterType.HogQL && isHogqlForSetOnceProperty(key, f))
-                        )
-                    ) {
+                togglePropertyFilter: (oldPropertyFilters, { key, value, type }): WebAnalyticsPropertyFilters => {
+                    const similarFilterExists = oldPropertyFilters.some(
+                        (f) => f.type === type && f.key === key && f.operator === PropertyOperator.Exact
+                    )
+                    if (similarFilterExists) {
+                        // if there's already a matching property, turn it off or merge them
                         return oldPropertyFilters
                             .map((f) => {
-                                if (setOncePropertyNames.includes(key)) {
-                                    if (f.type !== PropertyFilterType.HogQL) {
-                                        return f
-                                    }
-                                    if (!isHogqlForSetOnceProperty(key, f)) {
-                                        return f
-                                    }
-                                    // With the hogql properties, we don't even attempt to handle arrays, to avoiding
-                                    // needing a parser on the front end. Instead the logic is much simpler
-                                    const hogql = hogqlForSetOnceProperty(key, value)
-                                    if (f.key === hogql) {
-                                        return null
+                                if (f.key !== key || f.type !== type || f.operator !== PropertyOperator.Exact) {
+                                    return f
+                                }
+                                const oldValue = (Array.isArray(f.value) ? f.value : [f.value]).filter(isNotNil)
+                                let newValue: (string | number)[]
+                                if (oldValue.includes(value)) {
+                                    // If there are multiple values for this filter, reduce that to just the one being clicked
+                                    if (oldValue.length > 1) {
+                                        newValue = [value]
                                     } else {
-                                        return {
-                                            type: PropertyFilterType.HogQL,
-                                            key,
-                                            value: hogql,
-                                        } as const
+                                        return null
                                     }
                                 } else {
-                                    if (
-                                        f.key !== key ||
-                                        f.type !== PropertyFilterType.Event ||
-                                        f.operator !== PropertyOperator.Exact
-                                    ) {
-                                        return f
-                                    }
-                                    const oldValue = (Array.isArray(f.value) ? f.value : [f.value]).filter(isNotNil)
-                                    let newValue: (string | number)[]
-                                    if (oldValue.includes(value)) {
-                                        // If there are multiple values for this filter, reduce that to just the one being clicked
-                                        if (oldValue.length > 1) {
-                                            newValue = [value]
-                                        } else {
-                                            return null
-                                        }
-                                    } else {
-                                        newValue = [...oldValue, value]
-                                    }
-                                    return {
-                                        type: PropertyFilterType.Event,
-                                        key,
-                                        operator: PropertyOperator.Exact,
-                                        value: newValue,
-                                    } as const
+                                    newValue = [...oldValue, value]
                                 }
+                                return {
+                                    type: PropertyFilterType.Event,
+                                    key,
+                                    operator: PropertyOperator.Exact,
+                                    value: newValue,
+                                } as const
                             })
                             .filter(isNotNil)
                     } else {
-                        let newFilter: EventPropertyFilter | HogQLPropertyFilter
-                        if (setOncePropertyNames.includes(key)) {
-                            newFilter = {
-                                type: PropertyFilterType.HogQL,
-                                key: hogqlForSetOnceProperty(key, value),
-                            }
-                        } else {
-                            newFilter = {
-                                type: PropertyFilterType.Event,
-                                key,
-                                value,
-                                operator: PropertyOperator.Exact,
-                            }
+                        // no matching property, so add one
+                        const newFilter: WebAnalyticsPropertyFilter = {
+                            type,
+                            key,
+                            value,
+                            operator: PropertyOperator.Exact,
                         }
 
                         return [...oldPropertyFilters, newFilter]
@@ -174,6 +149,12 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 },
             },
         ],
+        graphsTab: [
+            GraphsTab.UNIQUE_USERS as string,
+            {
+                setGraphsTab: (_, { tab }) => tab,
+            },
+        ],
         sourceTab: [
             SourceTab.REFERRING_DOMAIN as string,
             {
@@ -193,7 +174,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
             },
         ],
         geographyTab: [
-            GeographyTab.COUNTRIES as string,
+            GeographyTab.MAP as string,
             {
                 setGeographyTab: (_, { tab }) => tab,
             },
@@ -205,7 +186,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
             },
         ],
         dateTo: [
-            '-0d' as string | null,
+            null as string | null,
             {
                 setDates: (_, { dateTo }) => dateTo,
             },
@@ -213,9 +194,19 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
     }),
     selectors(({ actions }) => ({
         tiles: [
-            (s) => [s.webAnalyticsFilters, s.pathTab, s.deviceTab, s.sourceTab, s.geographyTab, s.dateFrom, s.dateTo],
+            (s) => [
+                s.webAnalyticsFilters,
+                s.graphsTab,
+                s.pathTab,
+                s.deviceTab,
+                s.sourceTab,
+                s.geographyTab,
+                s.dateFrom,
+                s.dateTo,
+            ],
             (
                 webAnalyticsFilters,
+                graphsTab,
                 pathTab,
                 deviceTab,
                 sourceTab,
@@ -238,6 +229,100 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                             dateRange,
                         },
                     },
+                    {
+                        layout: {
+                            colSpan: 6,
+                        },
+                        activeTabId: graphsTab,
+                        setTabId: actions.setGraphsTab,
+                        tabs: [
+                            {
+                                id: GraphsTab.UNIQUE_USERS,
+                                title: 'Unique Visitors',
+                                linkText: 'Visitors',
+                                query: {
+                                    kind: NodeKind.InsightVizNode,
+                                    source: {
+                                        kind: NodeKind.TrendsQuery,
+                                        dateRange,
+                                        interval: 'day',
+                                        series: [
+                                            {
+                                                event: '$pageview',
+                                                kind: NodeKind.EventsNode,
+                                                math: BaseMathType.UniqueUsers,
+                                                name: '$pageview',
+                                            },
+                                        ],
+                                        trendsFilter: {
+                                            compare: true,
+                                            display: ChartDisplayType.ActionsLineGraph,
+                                        },
+                                        filterTestAccounts: true,
+                                        properties: webAnalyticsFilters,
+                                    },
+                                    hidePersonsModal: true,
+                                },
+                            },
+                            {
+                                id: GraphsTab.PAGE_VIEWS,
+                                title: 'Page Views',
+                                linkText: 'Views',
+                                query: {
+                                    kind: NodeKind.InsightVizNode,
+                                    source: {
+                                        kind: NodeKind.TrendsQuery,
+                                        dateRange,
+                                        interval: 'day',
+                                        series: [
+                                            {
+                                                event: '$pageview',
+                                                kind: NodeKind.EventsNode,
+                                                math: BaseMathType.TotalCount,
+                                                name: '$pageview',
+                                            },
+                                        ],
+                                        trendsFilter: {
+                                            compare: true,
+                                            display: ChartDisplayType.ActionsLineGraph,
+                                        },
+                                        filterTestAccounts: true,
+                                        properties: webAnalyticsFilters,
+                                    },
+                                    hidePersonsModal: true,
+                                },
+                            },
+                            {
+                                id: GraphsTab.NUM_SESSION,
+                                title: 'Sessions',
+                                linkText: 'Sessions',
+                                query: {
+                                    kind: NodeKind.InsightVizNode,
+                                    source: {
+                                        kind: NodeKind.TrendsQuery,
+                                        dateRange,
+                                        interval: 'day',
+                                        series: [
+                                            {
+                                                event: '$pageview',
+                                                kind: NodeKind.EventsNode,
+                                                math: BaseMathType.UniqueSessions,
+                                                name: '$pageview',
+                                            },
+                                        ],
+                                        trendsFilter: {
+                                            compare: true,
+                                            display: ChartDisplayType.ActionsLineGraph,
+                                        },
+                                        filterTestAccounts: true,
+                                        properties: webAnalyticsFilters,
+                                    },
+                                    suppressSessionAnalysisWarning: true,
+                                    hidePersonsModal: true,
+                                },
+                            },
+                        ],
+                    },
                     {
                         layout: {
                             colSpan: 6,
@@ -385,34 +470,6 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                             },
                         ],
                     },
-                    // {
-                    //     title: 'Unique visitors',
-                    //     layout: {
-                    //         colSpan: 6,
-                    //     },
-                    //     query: {
-                    //         kind: NodeKind.InsightVizNode,
-                    //         source: {
-                    //             kind: NodeKind.TrendsQuery,
-                    //             dateRange,
-                    //             interval: 'day',
-                    //             series: [
-                    //                 {
-                    //                     event: '$pageview',
-                    //                     kind: NodeKind.EventsNode,
-                    //                     math: BaseMathType.UniqueUsers,
-                    //                     name: '$pageview',
-                    //                 },
-                    //             ],
-                    //             trendsFilter: {
-                    //                 compare: true,
-                    //                 display: ChartDisplayType.ActionsLineGraph,
-                    //             },
-                    //             filterTestAccounts: true,
-                    //             properties: webAnalyticsFilters,
-                    //         },
-                    //     },
-                    // },
                     {
                         layout: {
                             colSpan: 6,
@@ -446,6 +503,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                                         filterTestAccounts: true,
                                         properties: webAnalyticsFilters,
                                     },
+                                    hidePersonsModal: true,
                                 },
                             },
                             {
diff --git a/frontend/src/stories/How to add tabs to a scene.stories.mdx b/frontend/src/stories/How to add tabs to a scene.stories.mdx
new file mode 100644
index 00000000000000..328bd664e7cb20
--- /dev/null
+++ b/frontend/src/stories/How to add tabs to a scene.stories.mdx	
@@ -0,0 +1,129 @@
+import { Meta } from '@storybook/addon-docs'
+
+<Meta title="How to add tabs to a scene?" />
+
+# How to add tabs to a scene?
+
+This guide follows on from ["How to build a scene"](/docs/how-to-build-a-scene--page) – we'll be adding tabs to that guide's Dashboards scene.
+
+1. Add an enum to `frontend/src/types.ts` to define the tabs:
+
+```ts title="frontend/src/types.ts"
+export enum DashboardsTabs {
+    First = 'first',
+    Second = 'second',
+}
+```
+
+2. Update the URL in `frontend/src/scenes/urls.ts` to handle tabs:
+
+```ts title="frontend/src/scenes/urls.ts"
+dashboards: (tab: DashboardsTabs = DashboardsTabs.First): string => `/dashboards/${tab}`
+```
+
+3. Add entries to routes per tab in `frontend/src/scenes/scenes.ts`:
+
+```ts title="frontend/src/scenes/scenes.ts"
+     // One entry for every available tab
+    ...Object.fromEntries(
+        Object.values(DashboardsTabs).map((tab) => [urls.dashboards(tab), Scene.Dashboards])
+    ) as Record<string, Scene>,
+```
+
+4. Update `dashboardsLogic` to handle tab changes in `frontend/src/scenes/dashboards/dashboardsLogic.ts`:
+
+```ts title="frontend/src/scenes/dashboards/dashboardsLogic.ts"
+import { kea, reducers, path, actions, selectors } from 'kea'
+import { actionToUrl, urlToAction } from 'kea-router'
+
+import { Breadcrumb, DashboardsTabs } from '~/types'
+import { urls } from 'scenes/urls'
+
+export const DASHBOARDS_TAB_TO_NAME: Record<DashboardsTabs, string> = {
+    [DashboardsTabs.First]: 'First',
+    [DashboardsTabs.Second]: 'Second',
+}
+
+export const dashboardsLogic = kea([
+    path(['scenes', 'dashboard', 'dashboardsLogic']),
+    actions({
+        setCurrentTab: (tab: DashboardsTabs = DashboardsTabs.First) => ({ tab }),
+    }),
+    reducers({
+        currentTab: [
+            DashboardsTabs.First as DashboardsTabs,
+            {
+                setCurrentTab: (_, { tab }) => tab,
+            },
+        ],
+    }),
+    selectors(() => ({
+        breadcrumbs: [
+            // Optional if you'd like the breadcrumbs to show the current tab
+            (s) => [s.currentTab],
+            (tab): Breadcrumb[] => {
+                const breadcrumbs: Breadcrumb[] = [{ name: 'Dashboards' }]
+                breadcrumbs.push({
+                    name: DASHBOARDS_TAB_TO_NAME[tab],
+                })
+
+                return breadcrumbs
+            },
+        ],
+    })),
+    actionToUrl(({ values }) => {
+        return {
+            setCurrentTab: () => [urls.dashboards(values.currentTab)],
+        }
+    }),
+    urlToAction(({ actions, values }) => ({
+        '/dashboards/:tab': ({ tab }) => {
+            if (tab !== values.currentTab) {
+                actions.setCurrentTab(tab as DashboardsTabs)
+            }
+        },
+    })),
+])
+```
+
+5. Update `frontend/src/scenes/dashboards/Dashboards.tsx` to render the tabs:
+
+```tsx title="frontend/src/scenes/dashboards/Dashboards.tsx"
+import { useValues } from 'kea'
+import { router } from 'kea-router'
+import { DashboardsTabs } from '~/types'
+import { SceneExport } from 'scenes/sceneTypes'
+import { PageHeader } from 'lib/components/PageHeader'
+import { LemonTabs } from 'lib/lemon-ui/LemonTabs/LemonTabs'
+import { urls } from 'scenes/urls'
+import { dashboardsLogic, humanFriendlyTabName } from './dashboardsLogic'
+
+const DASHBOARDS_TAB_TO_CONTENT: Record<DashboardsTabs, JSX.Element> = {
+    [DashboardsTabs.First]: <div>First tab content</div>,
+    [DashboardsTabs.Second]: <div>Second tab content</div>,
+}
+
+export const scene: SceneExport = {
+    component: Dashboards,
+    logic: dashboardsLogic,
+}
+
+export function Dashboards(): JSX.Element {
+    const { currentTab } = useValues(dashboardsLogic)
+
+    return (
+        <div>
+            <PageHeader title="Dashboards" />
+            <LemonTabs
+                activeKey={currentTab}
+                onChange={(tab) => router.actions.push(urls.dashboards(tab as DashboardsTabs))}
+                tabs={Object.values(DashboardsTabs).map((tab) => ({
+                    label: DASHBOARDS_TAB_TO_NAME[tab],
+                    key: tab,
+                    content: DASHBOARDS_TAB_TO_CONTENT[tab],
+                }))}
+            />
+        </div>
+    )
+}
+```
diff --git a/frontend/src/stories/How to build a scene.stories.mdx b/frontend/src/stories/How to build a scene.stories.mdx
index f394caa8de19fd..7bd650313eeebf 100644
--- a/frontend/src/stories/How to build a scene.stories.mdx	
+++ b/frontend/src/stories/How to build a scene.stories.mdx	
@@ -6,11 +6,11 @@ import { Meta } from '@storybook/addon-docs';
 
 If you want to add a new scene in the PostHog App frontend, here are 7 easy steps for fun and profit.
 
-## 1. Create the component, logic and styles.
-
 But first, you must answer one question: Does your scene depend on an `id` in the URL, like `/dashboard/:id`?
 
-## 1.1. I'm buliding a global scene that does not depend on an `id` in the URL.
+## Option A: I'm buliding a global scene that does not depend on an `id` in the URL.
+
+### 1. Create the component, logic and styles.
 
 Create a component like: `frontend/src/scenes/dashboard/Dashboards.tsx`
 
@@ -22,13 +22,13 @@ import { useValues } from 'kea'
 
 export function Dashboards (): JSX.Element {
     const {
-        dashboard: dashboard
-    } = useValues(dashboardLogic)
+        counter
+    } = useValues(dashboardsLogic)
 
     return (
         // TODO: consolidate on a recommended naming convention
         <div className='dashboard-scene'>
-            Dashboard Scene!
+            Dashboard Scene {counter}!
         </div>
     )
 }
@@ -42,11 +42,14 @@ export const scene: SceneExport = {
 Create the logic: `frontend/src/scenes/dashboard/dashboardsLogic.tsx`
 
 ```ts
-import { dashboardsLogicType } from './dashboardsLogicType'
-
-export const dashboardsLogic = kea<dashboardsLogicType>({
-    path: ['scenes', 'dashboard', 'dashboardsLogic'],
-})
+import { kea, reducers, path } from 'kea'
+
+export const dashboardsLogic = kea([
+    path(['scenes', 'dashboard', 'dashboardsLogic']),
+    reducers({
+        counter: [1, {}],
+    }),
+])
 ```
 
 Create the styles `frontend/src/scenes/dashboard/Dashboards.scss`.
@@ -57,7 +60,62 @@ Create the styles `frontend/src/scenes/dashboard/Dashboards.scss`.
 }
 ```
 
-## 1.2. My scene depends on an `id` in the URL (`/dashboard/:id`).
+Run kea type generation and check, which will created `dashboardsLogicType.ts` and update imports in `dashboardsLogic.tsx`
+
+```bash
+pnpm typegen:write && pnpm typescript:check
+```
+
+### 2. Add a URL function
+
+in `frontend/src/scenes/urls.ts`
+
+```ts
+export const urls = {
+    dashboards: () => `/dashboard`,
+}
+```
+
+### 3. Add a scene to the enum
+
+in `frontend/src/scenes/sceneTypes.ts`
+
+```ts
+export enum Scene {
+    Dashboards = 'Dashboards',
+}
+```
+
+### 4. Add a scene configuration and a route to scene mapping
+
+in `frontend/src/scenes/scenes.ts`
+
+```ts
+export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
+    [Scene.Dashboards]: {
+        projectBased: true,
+        name: 'Dashboards',
+    },
+}
+
+export const routes: Record<string, Scene> = {
+    [urls.dashboards()]: Scene.Dashboards,
+}
+```
+
+### 5. Add a scene import
+
+in `frontend/src/scenes/appScenes.ts`
+
+```ts
+export const appScenes: Record<Scene, () => any> = {
+    [Scene.Dashboards]: () => import('./dashboard/Dashboards'),
+}
+```
+
+## Option B: My scene depends on an `id` in the URL (`/dashboard/:id`).
+
+### 1. Create the component, logic and styles.
 
 Create a component like: `frontend/src/scenes/dashboard/Dashboard.tsx`
 
@@ -65,7 +123,7 @@ Create a component like: `frontend/src/scenes/dashboard/Dashboard.tsx`
 import './Dashboard.scss'
 import { dashboardLogic } from './dashboardLogic'
 import { SceneExport } from 'scenes/sceneTypes'
-import { useActions, useValues } from 'kea'
+import { useValues } from 'kea'
 
 export const scene: SceneExport = {
     component: Dashboard,
@@ -73,17 +131,19 @@ export const scene: SceneExport = {
     // paramsToProps - Convert url _string_ params to logic props.
     // This mounts the right logic with turbo mode before the component renders.
     // This wraps the scene's logic in <BindLogic />
-    paramsToProps: ({ id }) => ({ id: id ? parseInt(id) : 'new' }),
+    paramsToProps: ({ params: {id} }:{ params: { id?: string }}) => ({ id: id ? parseInt(id) : 'new' }),
 }
 
 export function Dashboard ({ id }: { id?: string } = {}): JSX.Element {
     // dashboardLogic is automatically bound to the props above with BindLogic
-    const { dashboard } = useValues(dashboardLogic)
-    const { reloadDashboard } = useActions(dashboardLogic)
+    const {
+        counter
+    } = useValues(dashboardLogic)
+
     return (
         // TODO: consolidate on a recommended naming convention
         <div className='dashboard-scene'>
-            Dashboard Scene!
+            Dashboard Scene {id} {counter}!
         </div>
     )
 }
@@ -92,18 +152,20 @@ export function Dashboard ({ id }: { id?: string } = {}): JSX.Element {
 Create the logic: `frontend/src/scenes/dashboard/dashboardLogic.tsx`
 
 ```ts
-import { dashboardLogicType } from './dashboardLogicType'
+import { kea, reducers, path, props, key } from 'kea'
 
 export interface DashboardLogicProps {
     id: number | 'new'
 }
 
-export const dashboardLogic = kea<dashboardLogicType<DashboardLogicProps>>({
-    path: ['scenes', 'dashboard', 'dashboardLogic'],
-    props: {} as DashboardLogicProps,
-    key: (props) => props.id,
-
-})
+export const dashboardLogic = kea([
+    props({} as DashboardLogicProps),
+    key(({ id }) => id),
+    path((id) => ['scenes', 'dashboard', 'dashboardLogic', id]),
+    reducers({
+        counter: [1, {}],
+    }),
+])
 ```
 
 Create the styles `frontend/src/scenes/dashboard/Dashboard.scss`.
@@ -114,18 +176,23 @@ Create the styles `frontend/src/scenes/dashboard/Dashboard.scss`.
 }
 ```
 
-## 2. Add a URL function
+Run kea type generation and check, which will created `dashboardLogicType.ts` and update imports in `dashboardLogic.tsx`
+
+```bash
+pnpm typegen:write && pnpm typescript:check
+```
+
+### 2. Add a URL function
 
 in `frontend/src/scenes/urls.ts`
 
 ```ts
 export const urls = {
     dashboard: (id: string | number) => `/dashboard{id ? `/${id}` : ''}`,
-    dashboards: () => `/dashboard`,
 }
 ```
 
-## 3. Add a scene to the enum
+### 3. Add a scene to the enum
 
 in `frontend/src/scenes/sceneTypes.ts`
 
@@ -135,7 +202,7 @@ export enum Scene {
 }
 ```
 
-## 4. Add a scene configuration and a route to scene mapping
+### 4. Add a scene configuration and a route to scene mapping
 
 in `frontend/src/scenes/scenes.ts`
 
@@ -150,11 +217,10 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
 export const routes: Record<string, Scene> = {
     // this `:id` gets used in "params" in "paramsToProps" and passed to the <Dashboard /> component
     [urls.dashboard(':id')]: Scene.Dashboard,
-    [urls.dashboards()]: Scene.Dashboard,
 }
 ```
 
-## 5. Add a scene import
+### 5. Add a scene import
 
 in `frontend/src/scenes/appScenes.ts`
 
@@ -213,3 +279,4 @@ export function NewDashboard (): JSX.Element {
 Read next:
 - [How to use components](/docs/how-to-use-components--page)
 - [How to build a form](/docs/how-to-build-a-form--page)
+- [How to add tabs to a scene](/docs/how-to-add-tabs-to-a-scene--page)
diff --git a/frontend/src/styles/global.scss b/frontend/src/styles/global.scss
index 37496036686a68..34e9a52383925c 100644
--- a/frontend/src/styles/global.scss
+++ b/frontend/src/styles/global.scss
@@ -522,12 +522,6 @@ input::-ms-clear {
     }
 }
 
-.lemonade-tag {
-    color: var(--primary-alt) !important;
-    background-color: var(--mid) !important;
-    border-color: var(--border) !important;
-}
-
 // Main app/body styles
 
 .fullscreen-scroll {
@@ -710,6 +704,19 @@ body {
     }
     .ant-select-dropdown {
         z-index: var(--z-ant-select-dropdown);
+        background-color: var(--bg-3000);
+
+        .ant-select-item.ant-select-item-option {
+            background-color: var(--bg-3000);
+
+            &.ant-select-item-option-active {
+                background-color: var(--border-3000);
+            }
+        }
+    }
+
+    .ant-input-number-group-addon {
+        background: var(--bg-3000);
     }
 
     .ant-picker-dropdown {
@@ -794,3 +801,13 @@ body {
         border-color: transparent;
     }
 }
+
+.posthog-3000[theme='dark'] {
+    .ant-empty-img-simple-path {
+        fill: var(--border-3000);
+    }
+
+    .ant-empty-img-simple-ellipse {
+        fill: var(--border-3000);
+    }
+}
diff --git a/frontend/src/styles/vars.scss b/frontend/src/styles/vars.scss
index 45adf1ab8d3428..0c6f648551d2ff 100644
--- a/frontend/src/styles/vars.scss
+++ b/frontend/src/styles/vars.scss
@@ -264,7 +264,6 @@ $_lifecycle_dormant: $_danger;
     --z-ant-modal-wrap: 1060;
     --z-hedgehog-buddy: 1059;
     --z-ant-modal-mask: 1050;
-    --z-plugins-popconfirm: 1001;
     --z-drawer: 950;
     --z-notifications-popover: 949; // below the TZ aware popover but over the main-nav
     --z-main-nav: 948;
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index c515f2e22af3d3..b94c51e0aa4428 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -2251,6 +2251,18 @@ export interface FeatureFlagType extends Omit<FeatureFlagBasicType, 'id' | 'team
     has_enriched_analytics?: boolean
 }
 
+export interface OrganizationFeatureFlagsCopyBody {
+    feature_flag_key: FeatureFlagType['key']
+    from_project: TeamType['id']
+    target_project_ids: TeamType['id'][]
+}
+
+export type OrganizationFeatureFlags = {
+    flag_id: FeatureFlagType['id']
+    team_id: TeamType['id']
+    active: FeatureFlagType['active']
+}[]
+
 export interface FeatureFlagRollbackConditions {
     threshold: number
     threshold_type: string
@@ -3075,6 +3087,7 @@ export type NotebookType = NotebookListItemType & {
 }
 
 export enum NotebookNodeType {
+    Mention = 'ph-mention',
     Query = 'ph-query',
     Recording = 'ph-recording',
     RecordingPlaylist = 'ph-recording-playlist',
@@ -3101,7 +3114,7 @@ export type NotebookNodeResource = {
 
 export enum NotebookTarget {
     Popover = 'popover',
-    Auto = 'auto',
+    Scene = 'scene',
 }
 
 export type NotebookSyncStatus = 'synced' | 'saving' | 'unsaved' | 'local'
@@ -3319,3 +3332,11 @@ export enum SDKTag {
 }
 
 export type SDKInstructionsMap = Partial<Record<SDKKey, React.ReactNode>>
+
+export enum SidePanelTab {
+    Notebooks = 'notebook',
+    Feedback = 'feedback',
+    Docs = 'docs',
+    Activation = 'activation',
+    Settings = 'settings',
+}
diff --git a/latest_migrations.manifest b/latest_migrations.manifest
index 814bf32751eb35..92d33d07ec998f 100644
--- a/latest_migrations.manifest
+++ b/latest_migrations.manifest
@@ -5,7 +5,7 @@ contenttypes: 0002_remove_content_type_name
 ee: 0015_add_verified_properties
 otp_static: 0002_throttling
 otp_totp: 0002_auto_20190420_0723
-posthog: 0360_externaldatasource_destination_id
+posthog: 0362_alter_experiment_feature_flag
 sessions: 0001_initial
 social_django: 0010_uid_db_index
 two_factor: 0007_auto_20201201_1019
diff --git a/package.json b/package.json
index 86ae28bf5e5a03..ae692d85114dc9 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "test:visual-regression:legacy:docker": "STORYBOOK_URL=http://host.docker.internal:6006 playwright test -u",
         "test:visual-regression:legacy:ci:update": "playwright test -u",
         "test:visual-regression:legacy:ci:verify": "playwright test",
-        "test:visual-regression:stories": "docker compose -f docker-compose.playwright.yml run --rm -it --build playwright pnpm test:visual-regression:stories:docker",
+        "test:visual-regression:stories": "rm -rf frontend/__snapshots__/__failures__/ && docker compose -f docker-compose.playwright.yml run --rm -it --build playwright pnpm test:visual-regression:stories:docker",
         "test:visual-regression:stories:docker": "NODE_OPTIONS=--max-old-space-size=6144 test-storybook -u --no-index-json --browsers chromium webkit --url http://host.docker.internal:6006",
         "test:visual-regression:stories:ci:update": "test-storybook -u --no-index-json --maxWorkers=2",
         "test:visual-regression:stories:ci:verify": "test-storybook --ci --no-index-json --maxWorkers=2",
@@ -74,8 +74,8 @@
         "@medv/finder": "^2.1.0",
         "@microlink/react-json-view": "^1.21.3",
         "@monaco-editor/react": "4.4.6",
-        "@posthog/icons": "0.1.25",
-        "@posthog/plugin-scaffold": "^1.4.3",
+        "@posthog/icons": "^0.1.31",
+        "@posthog/plugin-scaffold": "^1.4.4",
         "@react-hook/size": "^2.1.2",
         "@rrweb/types": "^2.0.0-alpha.11",
         "@sentry/react": "7.22.0",
@@ -134,7 +134,7 @@
         "monaco-editor": "^0.39.0",
         "papaparse": "^5.4.1",
         "pmtiles": "^2.11.0",
-        "posthog-js": "1.88.1",
+        "posthog-js": "1.88.4",
         "posthog-js-lite": "2.0.0-alpha5",
         "prettier": "^2.8.8",
         "prop-types": "^15.7.2",
@@ -303,8 +303,7 @@
         "!(posthog/hogql/grammar/*)*.{py,pyi}": [
             "ruff format",
             "ruff check"
-        ],
-        "!(HogQL*)*.{c,cpp,h,hpp}": "clang-format -i"
+        ]
     },
     "browserslist": {
         "development": [
diff --git a/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png b/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png
index 42cc00ad95c9a8..e411cd14514335 100644
Binary files a/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png and b/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png differ
diff --git a/plugin-server/functional_tests/exports-v2.test.ts b/plugin-server/functional_tests/exports-v2.test.ts
deleted file mode 100644
index 9914aa2b56f350..00000000000000
--- a/plugin-server/functional_tests/exports-v2.test.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-import { uuid4 } from '@sentry/utils'
-import { createServer, Server } from 'http'
-
-import { UUIDT } from '../src/utils/utils'
-import { capture, createAndReloadPluginConfig, createOrganization, createPlugin, createTeam, getMetric } from './api'
-import { waitForExpect } from './expectations'
-import { produce } from './kafka'
-
-// Exports are coordinated by a scheduled task that runs every minute, so we
-// increase the wait time to give us a bit of leeway.
-jest.setTimeout(120_000)
-
-let organizationId: string
-let server: Server
-const webHookCalledWith: any = {}
-
-beforeAll(async () => {
-    organizationId = await createOrganization()
-
-    server = createServer((req, res) => {
-        let body = ''
-        req.on('data', (chunk) => {
-            body += chunk
-        })
-        req.on('end', () => {
-            webHookCalledWith[req.url!] = webHookCalledWith[req.url!] ?? []
-            webHookCalledWith[req.url!].push(JSON.parse(body))
-            res.writeHead(200, { 'Content-Type': 'text/plain' })
-            res.end()
-        })
-    })
-
-    await new Promise((resolve) => {
-        server.on('listening', resolve)
-        server.listen()
-    })
-})
-
-afterAll(() => {
-    server.close()
-})
-
-test.concurrent(`exports: historical exports v2`, async () => {
-    // This test runs through checking:
-    //
-    //  1. the payload we send for "live" events i.e. events we are exporting as
-    //     they are ingested
-    //  2. running an historical export, and checking the payload is
-    //     sufficiently the same as the live event export
-    //  3. running an historical export again, and checking the payload is the
-    //     same as the previous historical export
-    //
-    // It's important the the timestamp and sent_at are the same, as otherwise
-    // the event time committed to the database will be different, and will
-    // result in duplicates.
-    //
-    // The way the merging in ClickHouse works means that we will not be able to
-    // guarantee events with the same sorting key will be dedpulicated, but we
-    // should do a best effort at ensuring they are the same.
-
-    const teamId = await createTeam(organizationId)
-    const distinctId = new UUIDT().toString()
-    const uuid = new UUIDT().toString()
-    const testUuid = new UUIDT().toString()
-
-    const plugin = await createPlugin({
-        organization_id: organizationId,
-        name: 'export plugin',
-        plugin_type: 'source',
-        is_global: false,
-        source__index_ts: `
-            export const exportEvents = async (events, { global, config }) => {
-                await fetch(
-                    "http://localhost:${server.address()?.port}/${testUuid}", 
-                    {method: "POST", body: JSON.stringify(events)}
-                )
-            }
-        `,
-    })
-    const pluginConfig = await createAndReloadPluginConfig(teamId, plugin.id)
-
-    // First let's capture an event and wait for it to be ingested so
-    // so we can check that the historical event is the same as the one
-    // passed to processEvent on initial ingestion.
-    const eventTime = new Date('2022-01-01T05:08:00.000Z')
-    const sentAt = new Date('2022-01-01T05:10:00.000Z')
-    const now = new Date('2022-01-01T05:00:00.000Z')
-    const skewAdjustedTimestamp = new Date('2022-01-01T04:58:00.000Z')
-    const properties = {
-        name: 'hehe',
-        uuid: new UUIDT().toString(),
-        $elements: [{ tag_name: 'div', nth_child: 1, nth_of_type: 2, $el_text: '💻' }],
-    }
-    await capture({ teamId, distinctId, uuid, event: '$autocapture', properties, token: null, sentAt, eventTime, now })
-
-    // Then check that the exportEvents function was called
-    const [exportedEvent] = await waitForExpect(() => {
-        const [exportEvents] = webHookCalledWith[`/${testUuid}`]
-        expect(exportEvents.length).toBe(1)
-        return exportEvents
-    }, 20_000)
-
-    expect(exportedEvent).toEqual(
-        expect.objectContaining({
-            event: '$autocapture',
-            // NOTE: this timestamp takes into account the time skew between
-            // `now` and `sent_at`.
-            timestamp: skewAdjustedTimestamp.toISOString(),
-            uuid: uuid,
-            distinct_id: distinctId,
-            properties: expect.objectContaining({
-                name: properties.name,
-                // TODO: do not override uuid property with event id
-                uuid: uuid, // NOTE: uuid added to properties is overridden by the event uuid
-            }),
-            elements: [
-                {
-                    tag_name: 'div',
-                    nth_child: 1,
-                    nth_of_type: 2,
-                    order: 0,
-                    $el_text: '💻',
-                    text: '💻',
-                    attributes: {},
-                },
-            ],
-            team_id: teamId,
-        })
-    )
-
-    await createHistoricalExportJob({
-        teamId,
-        pluginConfigId: pluginConfig.id,
-        dateRange: [
-            new Date(skewAdjustedTimestamp.getTime() - 10000).toISOString(),
-            new Date(skewAdjustedTimestamp.getTime() + 10000).toISOString(),
-        ],
-    })
-
-    // Then check that the exportEvents function was called with the
-    // same data that was used with the non-historical export, with the
-    // additions of details related to the historical export.
-    const firstExportedEvent = await waitForExpect(
-        () => {
-            const [historicallyExportedEvents] = webHookCalledWith[`/${testUuid}`].filter((events) => {
-                return events.some((event) => event.properties['$$is_historical_export_event'])
-            })
-
-            expect(historicallyExportedEvents.length).toBe(1)
-
-            return historicallyExportedEvents[0]
-        },
-        // NOTE: exports are driven by a scheduled task that runs every minute,
-        // so we need to wait a while.
-        90_000,
-        1_000
-    )
-
-    expect(firstExportedEvent).toEqual({
-        ...exportedEvent,
-        ip: '', // NOTE: for some reason this is "" when exported historically, but null otherwise.
-        // NOTE: it's important that event, sent_at, uuid, and distinct_id
-        // are preserved and are stable for ClickHouse deduplication to
-        // function as expected.
-        site_url: '',
-        // NOTE: we get a now attribute which is set to the time the
-        // event was converted from the ClickHouse event. We do not
-        // use the `now` attribute in the /capture endpoint, so this
-        // should be ok to leave.
-        now: expect.any(String),
-        properties: {
-            ...exportedEvent.properties,
-            $$is_historical_export_event: true,
-            $$historical_export_timestamp: expect.any(String),
-            $$historical_export_source_db: 'clickhouse',
-        },
-    })
-
-    // Run the export again to ensure we get the same results, such that we can
-    // re-run exports without creating duplicates. We use a different plugin
-    // config as otherwise it seems the second export doesn't start.
-    const secondTestUuid = uuid4()
-    const secondPlugin = await createPlugin({
-        organization_id: organizationId,
-        name: 'export plugin',
-        plugin_type: 'source',
-        is_global: false,
-        source__index_ts: `
-            export const exportEvents = async (events, { global, config }) => {
-                await fetch(
-                    "http://localhost:${server.address()?.port}/${secondTestUuid}", 
-                    {method: "POST", body: JSON.stringify(events)}
-                )
-            }
-        `,
-    })
-    const secondPluginConfig = await createAndReloadPluginConfig(teamId, secondPlugin.id)
-
-    await createHistoricalExportJob({
-        teamId,
-        pluginConfigId: secondPluginConfig.id,
-        dateRange: [
-            new Date(skewAdjustedTimestamp.getTime() - 10000).toISOString(),
-            new Date(skewAdjustedTimestamp.getTime() + 10000).toISOString(),
-        ],
-    })
-
-    const historicallyExportedEvents = await waitForExpect(
-        () => {
-            const [historicallyExportedEvents] = webHookCalledWith[`/${secondTestUuid}`]
-            expect(historicallyExportedEvents.length).toBe(1)
-            return historicallyExportedEvents
-        },
-        // NOTE: exports are driven by a scheduled task that runs every minute,
-        // so we need to wait a while.
-        90_000,
-        1_000
-    )
-
-    expect(historicallyExportedEvents).toEqual([
-        {
-            ...firstExportedEvent,
-            // NOTE: we get a now attribute which is set to the time the
-            // event was converted from the ClickHouse event. We do not
-            // use the `now` attribute in the /capture endpoint, so this
-            // should be ok to leave.
-            now: expect.any(String),
-            properties: { ...firstExportedEvent.properties, $$historical_export_timestamp: expect.any(String) },
-        },
-    ])
-})
-
-test.concurrent('consumer updates timestamp exported to prometheus', async () => {
-    // NOTE: it may be another event other than the one we emit here that causes
-    // the gauge to increase, but pushing this event through should at least
-    // ensure that the gauge is updated.
-    const teamId = await createTeam(organizationId)
-    const distinctId = new UUIDT().toString()
-    const uuid = new UUIDT().toString()
-
-    const metricBefore = await getMetric({
-        name: 'latest_processed_timestamp_ms',
-        type: 'GAUGE',
-        labels: { topic: 'clickhouse_events_json', partition: '0', groupId: 'async_handlers_on_event' },
-    })
-
-    await capture({
-        teamId,
-        distinctId,
-        uuid,
-        event: '$autocapture',
-        properties: {
-            name: 'hehe',
-            uuid: new UUIDT().toString(),
-            $elements: [{ tag_name: 'div', nth_child: 1, nth_of_type: 2, $el_text: '💻' }],
-        },
-    })
-
-    await waitForExpect(async () => {
-        const metricAfter = await getMetric({
-            name: 'latest_processed_timestamp_ms',
-            type: 'GAUGE',
-            labels: { topic: 'clickhouse_events_json', partition: '0', groupId: 'async_handlers_on_event' },
-        })
-        expect(metricAfter).toBeGreaterThan(metricBefore)
-        expect(metricAfter).toBeLessThan(Date.now()) // Make sure, e.g. we're not setting micro seconds
-        expect(metricAfter).toBeGreaterThan(Date.now() - 60_000) // Make sure, e.g. we're not setting seconds
-    }, 10_000)
-})
-
-const createHistoricalExportJob = async ({ teamId, pluginConfigId, dateRange }) => {
-    // Queues an historical export for the specified pluginConfigId and date
-    // range.
-    //
-    // NOTE: the frontend doesn't actually push to this queue but rather
-    // adds directly to PostgreSQL using the graphile-worker stored
-    // procedure `add_job`. I'd rather keep these tests graphile
-    // unaware.
-    await produce({
-        topic: 'jobs',
-        message: Buffer.from(
-            JSON.stringify({
-                type: 'Export historical events V2',
-                pluginConfigId: pluginConfigId,
-                pluginConfigTeam: teamId,
-                payload: {
-                    dateRange: dateRange,
-                    $job_id: uuid4(),
-                    parallelism: 1,
-                },
-            })
-        ),
-        key: teamId.toString(),
-    })
-}
diff --git a/plugin-server/functional_tests/plugins.test.ts b/plugin-server/functional_tests/plugins.test.ts
index c19f9ee2a1d161..9542d59476831c 100644
--- a/plugin-server/functional_tests/plugins.test.ts
+++ b/plugin-server/functional_tests/plugins.test.ts
@@ -389,23 +389,31 @@ test.concurrent(
             properties: properties,
         }
 
-        await capture({ teamId, distinctId, uuid, event: event.event, properties: event.properties })
-
         await waitForExpect(async () => {
+            // We might have not completed the setup properly in time, so to avoid flaky tests, we'll
+            // try sending messages and checking the last log message until we get the expected result.
+            await capture({ teamId, distinctId, uuid, event: event.event, properties: event.properties })
             const logEntries = await fetchPluginConsoleLogEntries(pluginConfig.id)
             const onEvent = logEntries.filter(({ message: [method] }) => method === 'onEvent')
-            expect(onEvent.length).toBeGreaterThan(0)
-
-            const onEventEvent = onEvent[0].message[1]
-            expect(onEventEvent.elements).toEqual([
+            const lastLogEntry = onEvent.length > 0 ? onEvent[onEvent.length - 1] : null
+            expect(lastLogEntry).toEqual(
                 expect.objectContaining({
-                    attributes: {},
-                    nth_child: 1,
-                    nth_of_type: 2,
-                    tag_name: 'div',
-                    text: '💻',
-                }),
-            ])
+                    message: [
+                        'onEvent',
+                        expect.objectContaining({
+                            elements: [
+                                expect.objectContaining({
+                                    attributes: {},
+                                    nth_child: 1,
+                                    nth_of_type: 2,
+                                    tag_name: 'div',
+                                    text: '💻',
+                                }),
+                            ],
+                        }),
+                    ],
+                })
+            )
         })
     },
     20000
diff --git a/plugin-server/package.json b/plugin-server/package.json
index 8608c8a92688ec..0770f481d8a3ae 100644
--- a/plugin-server/package.json
+++ b/plugin-server/package.json
@@ -49,7 +49,7 @@
         "@maxmind/geoip2-node": "^3.4.0",
         "@posthog/clickhouse": "^1.7.0",
         "@posthog/plugin-contrib": "^0.0.5",
-        "@posthog/plugin-scaffold": "1.4.3",
+        "@posthog/plugin-scaffold": "1.4.4",
         "@sentry/node": "^7.49.0",
         "@sentry/profiling-node": "^0.3.0",
         "@sentry/tracing": "^7.17.4",
diff --git a/plugin-server/pnpm-lock.yaml b/plugin-server/pnpm-lock.yaml
index c061059038306a..a58ab8c3b5e1c8 100644
--- a/plugin-server/pnpm-lock.yaml
+++ b/plugin-server/pnpm-lock.yaml
@@ -53,8 +53,8 @@ dependencies:
     specifier: ^0.0.5
     version: 0.0.5
   '@posthog/plugin-scaffold':
-    specifier: 1.4.3
-    version: 1.4.3
+    specifier: 1.4.4
+    version: 1.4.4
   '@sentry/node':
     specifier: ^7.49.0
     version: 7.49.0
@@ -3611,8 +3611,8 @@ packages:
     resolution: {integrity: sha512-ic2JsfFUdLGF+fGYJPatWEB6gEFNoD89qz92FN1RE2QfLpr6YdyPNuMowzahya3hfC/jaLZ8QdPG/j5pSOgT7A==}
     dev: false
 
-  /@posthog/plugin-scaffold@1.4.3:
-    resolution: {integrity: sha512-fzWJ8lvAUlbTcffaFVcfhV9QiAVGL4j1OnXDc+p+bqWMP/yTwvljXDiwV96w3mti9r40E1NBz/yQRykyB78+EA==}
+  /@posthog/plugin-scaffold@1.4.4:
+    resolution: {integrity: sha512-3z1ENm1Ys5lEQil0H7TVOqHvD24+ydiZFk5hggpbHRx1iOxAK+Eu5qFyAROwPUcCo7NOYjmH2xL1C4B1vaHilg==}
     dependencies:
       '@maxmind/geoip2-node': 3.5.0
     dev: false
diff --git a/plugin-server/src/main/ingestion-queues/batch-processing/each-batch-onevent.ts b/plugin-server/src/main/ingestion-queues/batch-processing/each-batch-onevent.ts
index 0277757ff53b9c..a53c6b0578ec2e 100644
--- a/plugin-server/src/main/ingestion-queues/batch-processing/each-batch-onevent.ts
+++ b/plugin-server/src/main/ingestion-queues/batch-processing/each-batch-onevent.ts
@@ -1,10 +1,13 @@
 import * as Sentry from '@sentry/node'
 import { EachBatchPayload, KafkaMessage } from 'kafkajs'
 
-import { RawClickHouseEvent } from '../../../types'
-import { convertToIngestionEvent } from '../../../utils/event'
+import { PluginConfig, PluginMethod, RawClickHouseEvent } from '../../../types'
+import { convertToIngestionEvent, convertToPostHogEvent } from '../../../utils/event'
 import { status } from '../../../utils/status'
-import { processOnEventStep } from '../../../worker/ingestion/event-pipeline/runAsyncHandlersStep'
+import {
+    processComposeWebhookStep,
+    processOnEventStep,
+} from '../../../worker/ingestion/event-pipeline/runAsyncHandlersStep'
 import { runInstrumentedFunction } from '../../utils'
 import { KafkaJSIngestionConsumer } from '../kafka-queue'
 import { eventDroppedCounter, latestOffsetTimestampGauge } from '../metrics'
@@ -13,28 +16,57 @@ import { eachBatchHandlerHelper } from './each-batch-webhooks'
 // Must require as `tsc` strips unused `import` statements and just requiring this seems to init some globals
 require('@sentry/tracing')
 
+export async function handleOnEventPlugins(
+    pluginConfigs: PluginConfig[],
+    clickHouseEvent: RawClickHouseEvent,
+    queue: KafkaJSIngestionConsumer
+): Promise<void> {
+    // Elements parsing can be extremely slow, so we skip it for some plugins
+    // # SKIP_ELEMENTS_PARSING_PLUGINS
+    const skipElementsChain = pluginConfigs.every((pluginConfig) =>
+        queue.pluginsServer.pluginConfigsToSkipElementsParsing?.(pluginConfig.plugin_id)
+    )
+
+    const event = convertToIngestionEvent(clickHouseEvent, skipElementsChain)
+    await runInstrumentedFunction({
+        func: () => processOnEventStep(queue.pluginsServer, event),
+        statsKey: `kafka_queue.process_async_handlers_on_event`,
+        timeoutMessage: 'After 30 seconds still running runAppsOnEventPipeline',
+        timeoutContext: () => ({
+            event: JSON.stringify(event),
+        }),
+        teamId: event.teamId,
+    })
+}
+
+export async function handleComposeWebhookPlugins(
+    clickHouseEvent: RawClickHouseEvent,
+    queue: KafkaJSIngestionConsumer
+): Promise<void> {
+    const event = convertToPostHogEvent(clickHouseEvent)
+    await runInstrumentedFunction({
+        func: () => processComposeWebhookStep(queue.pluginsServer, event),
+        statsKey: `kafka_queue.process_async_handlers_on_event`,
+        timeoutMessage: 'After 30 seconds still running runAppsOnEventPipeline',
+        timeoutContext: () => ({
+            event: JSON.stringify(event),
+        }),
+        teamId: event.team_id,
+    })
+}
+
 export async function eachMessageAppsOnEventHandlers(
     clickHouseEvent: RawClickHouseEvent,
     queue: KafkaJSIngestionConsumer
 ): Promise<void> {
     const pluginConfigs = queue.pluginsServer.pluginConfigsPerTeam.get(clickHouseEvent.team_id)
     if (pluginConfigs) {
-        // Elements parsing can be extremely slow, so we skip it for some plugins
-        // # SKIP_ELEMENTS_PARSING_PLUGINS
-        const skipElementsChain = pluginConfigs.every((pluginConfig) =>
-            queue.pluginsServer.pluginConfigsToSkipElementsParsing?.(pluginConfig.plugin_id)
-        )
-
-        const event = convertToIngestionEvent(clickHouseEvent, skipElementsChain)
-        await runInstrumentedFunction({
-            func: () => processOnEventStep(queue.pluginsServer, event),
-            statsKey: `kafka_queue.process_async_handlers_on_event`,
-            timeoutMessage: 'After 30 seconds still running runAppsOnEventPipeline',
-            timeoutContext: () => ({
-                event: JSON.stringify(event),
-            }),
-            teamId: event.teamId,
-        })
+        // Split between onEvent and composeWebhook plugins
+        const onEventPlugins = pluginConfigs.filter((pluginConfig) => pluginConfig.method === PluginMethod.onEvent)
+        await Promise.all([
+            handleOnEventPlugins(onEventPlugins, clickHouseEvent, queue),
+            handleComposeWebhookPlugins(clickHouseEvent, queue),
+        ])
     } else {
         eventDroppedCounter
             .labels({
diff --git a/plugin-server/src/main/ingestion-queues/session-recording/services/session-manager.ts b/plugin-server/src/main/ingestion-queues/session-recording/services/session-manager.ts
index 2a384b86c23bd7..c0869e773ca78d 100644
--- a/plugin-server/src/main/ingestion-queues/session-recording/services/session-manager.ts
+++ b/plugin-server/src/main/ingestion-queues/session-recording/services/session-manager.ts
@@ -17,7 +17,7 @@ import { status } from '../../../../utils/status'
 import { asyncTimeoutGuard } from '../../../../utils/timing'
 import { ObjectStorage } from '../../../services/object_storage'
 import { IncomingRecordingMessage } from '../types'
-import { bufferFileDir, convertToPersistedMessage, getLagMultipler, maxDefined, minDefined, now } from '../utils'
+import { bufferFileDir, convertToPersistedMessage, getLagMultiplier, maxDefined, minDefined, now } from '../utils'
 import { OffsetHighWaterMarker } from './offset-high-water-marker'
 import { RealtimeManager } from './realtime-manager'
 
@@ -217,7 +217,7 @@ export class SessionManager {
             return
         }
 
-        const lagMultiplier = getLagMultipler(partitionLag)
+        const lagMultiplier = getLagMultiplier(partitionLag)
 
         const flushThresholdMs = this.serverConfig.SESSION_RECORDING_MAX_BUFFER_AGE_SECONDS * 1000
         const flushThresholdJitteredMs = flushThresholdMs * this.flushJitterMultiplier
diff --git a/plugin-server/src/main/ingestion-queues/session-recording/session-recordings-consumer.ts b/plugin-server/src/main/ingestion-queues/session-recording/session-recordings-consumer.ts
index 530814010efb96..470827f569422b 100644
--- a/plugin-server/src/main/ingestion-queues/session-recording/session-recordings-consumer.ts
+++ b/plugin-server/src/main/ingestion-queues/session-recording/session-recordings-consumer.ts
@@ -1,4 +1,4 @@
-import { captureException, captureMessage } from '@sentry/node'
+import { captureException } from '@sentry/node'
 import { mkdirSync, rmSync } from 'node:fs'
 import { CODES, features, KafkaConsumer, librdkafkaVersion, Message, TopicPartition } from 'node-rdkafka'
 import { Counter, Gauge, Histogram } from 'prom-client'
@@ -7,7 +7,7 @@ import { sessionRecordingConsumerConfig } from '../../../config/config'
 import { KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS } from '../../../config/kafka-topics'
 import { BatchConsumer, startBatchConsumer } from '../../../kafka/batch-consumer'
 import { createRdConnectionConfigFromEnvVars } from '../../../kafka/config'
-import { PipelineEvent, PluginsServerConfig, RawEventMessage, RedisPool, RRWebEvent, TeamId } from '../../../types'
+import { PluginsServerConfig, RedisPool, TeamId } from '../../../types'
 import { BackgroundRefresher } from '../../../utils/background-refresher'
 import { PostgresRouter } from '../../../utils/db/postgres'
 import { status } from '../../../utils/status'
@@ -23,7 +23,7 @@ import { RealtimeManager } from './services/realtime-manager'
 import { ReplayEventsIngester } from './services/replay-events-ingester'
 import { BUCKETS_KB_WRITTEN, SessionManager } from './services/session-manager'
 import { IncomingRecordingMessage } from './types'
-import { bufferFileDir, getPartitionsForTopic, now, queryWatermarkOffsets } from './utils'
+import { bufferFileDir, getPartitionsForTopic, now, parseKafkaMessage, queryWatermarkOffsets } from './utils'
 
 // Must require as `tsc` strips unused `import` statements and just requiring this seems to init some globals
 require('@sentry/tracing')
@@ -251,119 +251,6 @@ export class SessionRecordingIngester {
         await this.sessions[key]?.add(event)
     }
 
-    public async parseKafkaMessage(
-        message: Message,
-        getTeamFn: (s: string) => Promise<TeamIDWithConfig | null>
-    ): Promise<IncomingRecordingMessage | void> {
-        const statusWarn = (reason: string, extra?: Record<string, any>) => {
-            status.warn('⚠️', 'invalid_message', {
-                reason,
-                partition: message.partition,
-                offset: message.offset,
-                ...(extra || {}),
-            })
-        }
-
-        if (!message.value || !message.timestamp) {
-            // Typing says this can happen but in practice it shouldn't
-            return statusWarn('message value or timestamp is empty')
-        }
-
-        let messagePayload: RawEventMessage
-        let event: PipelineEvent
-
-        try {
-            messagePayload = JSON.parse(message.value.toString())
-            event = JSON.parse(messagePayload.data)
-        } catch (error) {
-            return statusWarn('invalid_json', { error })
-        }
-
-        const { $snapshot_items, $session_id, $window_id } = event.properties || {}
-
-        // NOTE: This is simple validation - ideally we should do proper schema based validation
-        if (event.event !== '$snapshot_items' || !$snapshot_items || !$session_id) {
-            status.warn('🙈', 'Received non-snapshot message, ignoring')
-            return
-        }
-
-        if (messagePayload.team_id == null && !messagePayload.token) {
-            return statusWarn('no_token')
-        }
-
-        let teamIdWithConfig: TeamIDWithConfig | null = null
-        const token = messagePayload.token
-
-        if (token) {
-            teamIdWithConfig = await getTeamFn(token)
-        }
-
-        // NB `==` so we're comparing undefined and null
-        if (teamIdWithConfig == null || teamIdWithConfig.teamId == null) {
-            eventDroppedCounter
-                .labels({
-                    event_type: 'session_recordings_blob_ingestion',
-                    drop_cause: 'team_missing_or_disabled',
-                })
-                .inc()
-
-            return statusWarn('team_missing_or_disabled', {
-                token: messagePayload.token,
-                teamId: messagePayload.team_id,
-                payloadTeamSource: messagePayload.team_id ? 'team' : messagePayload.token ? 'token' : 'unknown',
-            })
-        }
-
-        const invalidEvents: any[] = []
-        const events: RRWebEvent[] = $snapshot_items.filter((event: any) => {
-            if (!event || !event.timestamp) {
-                invalidEvents.push(event)
-                return false
-            }
-            return true
-        })
-
-        if (invalidEvents.length) {
-            captureMessage('[session-manager]: invalid rrweb events filtered out from message', {
-                extra: {
-                    invalidEvents,
-                    eventsCount: events.length,
-                    invalidEventsCount: invalidEvents.length,
-                    event,
-                },
-                tags: {
-                    team_id: teamIdWithConfig.teamId,
-                    session_id: $session_id,
-                },
-            })
-        }
-
-        if (!events.length) {
-            status.warn('🙈', 'Event contained no valid rrweb events, ignoring')
-
-            return statusWarn('invalid_rrweb_events', {
-                token: messagePayload.token,
-                teamId: messagePayload.team_id,
-            })
-        }
-
-        return {
-            metadata: {
-                partition: message.partition,
-                topic: message.topic,
-                offset: message.offset,
-                timestamp: message.timestamp,
-                consoleLogIngestionEnabled: teamIdWithConfig.consoleLogIngestionEnabled,
-            },
-
-            team_id: teamIdWithConfig.teamId,
-            distinct_id: messagePayload.distinct_id,
-            session_id: $session_id,
-            window_id: $window_id,
-            events: events,
-        }
-    }
-
     public async handleEachBatch(messages: Message[]): Promise<void> {
         status.info('🔁', `blob_ingester_consumer - handling batch`, {
             size: messages.length,
@@ -395,7 +282,7 @@ export class SessionRecordingIngester {
 
                             counterKafkaMessageReceived.inc({ partition })
 
-                            const recordingMessage = await this.parseKafkaMessage(message, (token) =>
+                            const recordingMessage = await parseKafkaMessage(message, (token) =>
                                 this.teamsRefresher.get().then((teams) => ({
                                     teamId: teams[token]?.teamId || null,
                                     consoleLogIngestionEnabled: teams[token]?.consoleLogIngestionEnabled ?? true,
@@ -646,7 +533,7 @@ export class SessionRecordingIngester {
             partitionsToDrop[partition] = this.partitionMetrics[partition] ?? {}
             delete this.partitionMetrics[partition]
 
-            // Revoke the high water mark for this partition so we are essentially "reset"
+            // Revoke the high watermark for this partition, so we are essentially "reset"
             this.sessionHighWaterMarker.revoke(topicPartition)
             this.persistentHighWaterMarker.revoke(topicPartition)
         })
diff --git a/plugin-server/src/main/ingestion-queues/session-recording/utils.ts b/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
index a13fed116b5bf2..64476d57c3cee0 100644
--- a/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
+++ b/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
@@ -1,10 +1,13 @@
-import { captureException } from '@sentry/node'
+import { captureException, captureMessage } from '@sentry/node'
 import { DateTime } from 'luxon'
-import { KafkaConsumer, PartitionMetadata, TopicPartition } from 'node-rdkafka'
+import { KafkaConsumer, Message, MessageHeader, PartitionMetadata, TopicPartition } from 'node-rdkafka'
 import path from 'path'
 
 import { KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS } from '../../../config/kafka-topics'
+import { PipelineEvent, RawEventMessage, RRWebEvent } from '../../../types'
 import { status } from '../../../utils/status'
+import { eventDroppedCounter } from '../metrics'
+import { TeamIDWithConfig } from './session-recordings-consumer'
 import { IncomingRecordingMessage, PersistedRecordingMessage } from './types'
 
 export const convertToPersistedMessage = (message: IncomingRecordingMessage): PersistedRecordingMessage => {
@@ -102,10 +105,159 @@ export const getPartitionsForTopic = (
     })
 }
 
-export const getLagMultipler = (lag: number, threshold = 1000000) => {
+export const getLagMultiplier = (lag: number, threshold = 1000000) => {
     if (lag < threshold) {
         return 1
     }
 
     return Math.max(0.1, 1 - (lag - threshold) / (threshold * 10))
 }
+
+export async function readTokenFromHeaders(
+    headers: MessageHeader[] | undefined,
+    getTeamFn: (s: string) => Promise<TeamIDWithConfig | null>
+) {
+    const tokenHeader = headers?.find((header: MessageHeader) => {
+        // each header in the array is an object of key to value
+        // because it's possible to have multiple headers with the same key
+        // but, we don't support that. the first truthy match we find is the one we use
+        return header.token
+    })?.token
+
+    const token = typeof tokenHeader === 'string' ? tokenHeader : tokenHeader?.toString()
+
+    let teamIdWithConfig: TeamIDWithConfig | null = null
+
+    if (token) {
+        teamIdWithConfig = await getTeamFn(token)
+    }
+    return { token, teamIdWithConfig }
+}
+
+export const parseKafkaMessage = async (
+    message: Message,
+    getTeamFn: (s: string) => Promise<TeamIDWithConfig | null>
+): Promise<IncomingRecordingMessage | void> => {
+    const dropMessage = (reason: string, extra?: Record<string, any>) => {
+        eventDroppedCounter
+            .labels({
+                event_type: 'session_recordings_blob_ingestion',
+                drop_cause: reason,
+            })
+            .inc()
+
+        status.warn('⚠️', 'invalid_message', {
+            reason,
+            partition: message.partition,
+            offset: message.offset,
+            ...(extra || {}),
+        })
+    }
+
+    if (!message.value || !message.timestamp) {
+        // Typing says this can happen but in practice it shouldn't
+        return dropMessage('message_value_or_timestamp_is_empty')
+    }
+
+    const headerResult = await readTokenFromHeaders(message.headers, getTeamFn)
+    const token: string | undefined = headerResult.token
+    let teamIdWithConfig: null | TeamIDWithConfig = headerResult.teamIdWithConfig
+
+    // NB `==` so we're comparing undefined and null
+    // if token was in the headers but, we could not load team config
+    // then, we can return early
+    if (!!token && (teamIdWithConfig == null || teamIdWithConfig.teamId == null)) {
+        return dropMessage('header_token_present_team_missing_or_disabled', {
+            token: token,
+        })
+    }
+
+    let messagePayload: RawEventMessage
+    let event: PipelineEvent
+
+    try {
+        messagePayload = JSON.parse(message.value.toString())
+        event = JSON.parse(messagePayload.data)
+    } catch (error) {
+        return dropMessage('invalid_json', { error })
+    }
+
+    const { $snapshot_items, $session_id, $window_id } = event.properties || {}
+
+    // NOTE: This is simple validation - ideally we should do proper schema based validation
+    if (event.event !== '$snapshot_items' || !$snapshot_items || !$session_id) {
+        return dropMessage('received_non_snapshot_message')
+    }
+
+    // TODO this mechanism is deprecated for blobby ingestion, we should remove it
+    // once we're happy that the new mechanism is working
+    // if there was not a token in the header then we try to load one from the message payload
+    if (teamIdWithConfig == null && messagePayload.team_id == null && !messagePayload.token) {
+        return dropMessage('no_token_in_header_or_payload')
+    }
+
+    if (teamIdWithConfig == null) {
+        const token = messagePayload.token
+
+        if (token) {
+            teamIdWithConfig = await getTeamFn(token)
+        }
+    }
+
+    // NB `==` so we're comparing undefined and null
+    if (teamIdWithConfig == null || teamIdWithConfig.teamId == null) {
+        return dropMessage('token_fallback_team_missing_or_disabled', {
+            token: messagePayload.token,
+            teamId: messagePayload.team_id,
+            payloadTeamSource: messagePayload.team_id ? 'team' : messagePayload.token ? 'token' : 'unknown',
+        })
+    }
+    // end of deprecated mechanism
+
+    const invalidEvents: any[] = []
+    const events: RRWebEvent[] = $snapshot_items.filter((event: any) => {
+        if (!event || !event.timestamp) {
+            invalidEvents.push(event)
+            return false
+        }
+        return true
+    })
+
+    if (invalidEvents.length) {
+        captureMessage('[session-manager]: invalid rrweb events filtered out from message', {
+            extra: {
+                invalidEvents,
+                eventsCount: events.length,
+                invalidEventsCount: invalidEvents.length,
+                event,
+            },
+            tags: {
+                team_id: teamIdWithConfig.teamId,
+                session_id: $session_id,
+            },
+        })
+    }
+
+    if (!events.length) {
+        return dropMessage('message_contained_no_valid_rrweb_events', {
+            token: messagePayload.token,
+            teamId: messagePayload.team_id,
+        })
+    }
+
+    return {
+        metadata: {
+            partition: message.partition,
+            topic: message.topic,
+            offset: message.offset,
+            timestamp: message.timestamp,
+            consoleLogIngestionEnabled: teamIdWithConfig.consoleLogIngestionEnabled,
+        },
+
+        team_id: teamIdWithConfig.teamId,
+        distinct_id: messagePayload.distinct_id,
+        session_id: $session_id,
+        window_id: $window_id,
+        events: events,
+    }
+}
diff --git a/plugin-server/src/types.ts b/plugin-server/src/types.ts
index e295f5414e05ab..700bf4f6cef895 100644
--- a/plugin-server/src/types.ts
+++ b/plugin-server/src/types.ts
@@ -7,8 +7,10 @@ import {
     PluginConfigSchema,
     PluginEvent,
     PluginSettings,
+    PostHogEvent,
     ProcessedPluginEvent,
     Properties,
+    Webhook,
 } from '@posthog/plugin-scaffold'
 import { Pool as GenericPool } from 'generic-pool'
 import { StatsD } from 'hot-shots'
@@ -381,6 +383,11 @@ export interface PluginCapabilities {
     methods?: string[]
 }
 
+export enum PluginMethod {
+    onEvent = 'onEvent',
+    composeWebhook = 'composeWebhook',
+}
+
 export interface PluginConfig {
     id: number
     team_id: TeamId
@@ -394,6 +401,10 @@ export interface PluginConfig {
     vm?: LazyPluginVM | null
     created_at: string
     updated_at?: string
+    // We're migrating to a new functions that take PostHogEvent instead of PluginEvent
+    // we'll need to know which method this plugin is using to call it the right way
+    // undefined for old plugins with multiple or deprecated methods
+    method?: PluginMethod
 }
 
 export interface PluginJsonConfig {
@@ -410,7 +421,7 @@ export interface PluginError {
     time: string
     name?: string
     stack?: string
-    event?: PluginEvent | ProcessedPluginEvent | null
+    event?: PluginEvent | ProcessedPluginEvent | PostHogEvent | null
 }
 
 export interface PluginAttachmentDB {
@@ -457,12 +468,6 @@ export interface PluginLogEntry {
     instance_id: string
 }
 
-export enum PluginSourceFileStatus {
-    Transpiled = 'TRANSPILED',
-    Locked = 'LOCKED',
-    Error = 'ERROR',
-}
-
 export enum PluginTaskType {
     Job = 'job',
     Schedule = 'schedule',
@@ -482,6 +487,7 @@ export type VMMethods = {
     getSettings?: () => PluginSettings
     onEvent?: (event: ProcessedPluginEvent) => Promise<void>
     exportEvents?: (events: PluginEvent[]) => Promise<void>
+    composeWebhook?: (event: PostHogEvent) => Webhook | null
     processEvent?: (event: PluginEvent) => Promise<PluginEvent>
 }
 
diff --git a/plugin-server/src/utils/db/db.ts b/plugin-server/src/utils/db/db.ts
index e456335afcc8c6..cf64f86b600a29 100644
--- a/plugin-server/src/utils/db/db.ts
+++ b/plugin-server/src/utils/db/db.ts
@@ -36,7 +36,6 @@ import {
     PluginLogEntrySource,
     PluginLogEntryType,
     PluginLogLevel,
-    PluginSourceFileStatus,
     PropertiesLastOperation,
     PropertiesLastUpdatedAt,
     PropertyDefinitionType,
@@ -1532,38 +1531,4 @@ export class DB {
         )
         return rows[0]?.source ?? null
     }
-
-    public async setPluginTranspiled(pluginId: Plugin['id'], filename: string, transpiled: string): Promise<void> {
-        await this.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            `INSERT INTO posthog_pluginsourcefile (id, plugin_id, filename, status, transpiled, updated_at) VALUES($1, $2, $3, $4, $5, NOW())
-                ON CONFLICT ON CONSTRAINT unique_filename_for_plugin
-                DO UPDATE SET status = $4, transpiled = $5, error = NULL, updated_at = NOW()`,
-            [new UUIDT().toString(), pluginId, filename, PluginSourceFileStatus.Transpiled, transpiled],
-            'setPluginTranspiled'
-        )
-    }
-
-    public async setPluginTranspiledError(pluginId: Plugin['id'], filename: string, error: string): Promise<void> {
-        await this.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            `INSERT INTO posthog_pluginsourcefile (id, plugin_id, filename, status, error, updated_at) VALUES($1, $2, $3, $4, $5, NOW())
-                ON CONFLICT ON CONSTRAINT unique_filename_for_plugin
-                DO UPDATE SET status = $4, error = $5, transpiled = NULL, updated_at = NOW()`,
-            [new UUIDT().toString(), pluginId, filename, PluginSourceFileStatus.Error, error],
-            'setPluginTranspiledError'
-        )
-    }
-
-    public async getPluginTranspilationLock(pluginId: Plugin['id'], filename: string): Promise<boolean> {
-        const response = await this.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            `INSERT INTO posthog_pluginsourcefile (id, plugin_id, filename, status, transpiled, updated_at) VALUES($1, $2, $3, $4, NULL, NOW())
-                ON CONFLICT ON CONSTRAINT unique_filename_for_plugin
-                DO UPDATE SET status = $4, updated_at = NOW() WHERE (posthog_pluginsourcefile.status IS NULL OR posthog_pluginsourcefile.status = $5) RETURNING status`,
-            [new UUIDT().toString(), pluginId, filename, PluginSourceFileStatus.Locked, ''],
-            'getPluginTranspilationLock'
-        )
-        return response.rowCount > 0
-    }
 }
diff --git a/plugin-server/src/utils/db/error.ts b/plugin-server/src/utils/db/error.ts
index d8ff6dc3cf7999..f161fa289bc48a 100644
--- a/plugin-server/src/utils/db/error.ts
+++ b/plugin-server/src/utils/db/error.ts
@@ -1,4 +1,4 @@
-import { PluginEvent, ProcessedPluginEvent } from '@posthog/plugin-scaffold'
+import { PluginEvent, PostHogEvent, ProcessedPluginEvent } from '@posthog/plugin-scaffold'
 import { captureException } from '@sentry/node'
 
 import { Hub, PluginConfig, PluginError } from '../../types'
@@ -30,7 +30,7 @@ export async function processError(
     server: Hub,
     pluginConfig: PluginConfig | null,
     error: Error | string,
-    event?: PluginEvent | ProcessedPluginEvent | null
+    event?: PluginEvent | ProcessedPluginEvent | PostHogEvent | null
 ): Promise<void> {
     if (!pluginConfig) {
         captureException(new Error('Tried to process error for nonexistent plugin config!'), {
diff --git a/plugin-server/src/utils/db/utils.ts b/plugin-server/src/utils/db/utils.ts
index ca9035e29fcf67..a4f940defdefb3 100644
--- a/plugin-server/src/utils/db/utils.ts
+++ b/plugin-server/src/utils/db/utils.ts
@@ -2,6 +2,7 @@ import { Properties } from '@posthog/plugin-scaffold'
 import * as Sentry from '@sentry/node'
 import { ProducerRecord } from 'kafkajs'
 import { DateTime } from 'luxon'
+import { Counter } from 'prom-client'
 
 import { defaultConfig } from '../../config/config'
 import { KAFKA_PERSON } from '../../config/kafka-topics'
@@ -150,6 +151,7 @@ export function shouldStoreLog(
 export function safeClickhouseString(str: string): string {
     // character is a surrogate
     return str.replace(/[\ud800-\udfff]/gu, (match) => {
+        surrogatesSubstitutedCounter.inc()
         const res = JSON.stringify(match)
         return res.slice(1, res.length - 1) + `\\`
     })
@@ -173,3 +175,8 @@ export function sanitizeJsonbValue(value: any): any {
         return value
     }
 }
+
+export const surrogatesSubstitutedCounter = new Counter({
+    name: 'surrogates_substituted_total',
+    help: 'Stray UTF16 surrogates detected and removed from user input.',
+})
diff --git a/plugin-server/src/utils/event.ts b/plugin-server/src/utils/event.ts
index 3c05b7894974b3..ca6ff219880c37 100644
--- a/plugin-server/src/utils/event.ts
+++ b/plugin-server/src/utils/event.ts
@@ -1,4 +1,4 @@
-import { PluginEvent, ProcessedPluginEvent } from '@posthog/plugin-scaffold'
+import { PluginEvent, PostHogEvent, ProcessedPluginEvent } from '@posthog/plugin-scaffold'
 import { DateTime } from 'luxon'
 import { Message } from 'node-rdkafka'
 
@@ -61,6 +61,18 @@ export function parseRawClickHouseEvent(rawEvent: RawClickHouseEvent): ClickHous
             : null,
     }
 }
+export function convertToPostHogEvent(event: RawClickHouseEvent): PostHogEvent {
+    const properties = event.properties ? JSON.parse(event.properties) : {}
+    properties['$elements_chain'] = event.elements_chain // TODO: tests
+    return {
+        uuid: event.uuid,
+        event: event.event!,
+        team_id: event.team_id,
+        distinct_id: event.distinct_id,
+        properties,
+        timestamp: new Date(clickHouseTimestampToISO(event.timestamp)),
+    }
+}
 
 export function convertToIngestionEvent(event: RawClickHouseEvent, skipElementsChain = false): PostIngestionEvent {
     const properties = event.properties ? JSON.parse(event.properties) : {}
diff --git a/plugin-server/src/worker/frontend/transpile.ts b/plugin-server/src/worker/frontend/transpile.ts
deleted file mode 100644
index 96372df98dfd58..00000000000000
--- a/plugin-server/src/worker/frontend/transpile.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { transform } from '@babel/standalone'
-
-export function transpileFrontend(rawCode: string): string {
-    const { code } = transform(rawCode, {
-        envName: 'production',
-        code: true,
-        babelrc: false,
-        configFile: false,
-        filename: 'frontend.tsx',
-        plugins: ['transform-react-jsx'],
-        presets: [
-            ['typescript', { isTSX: true, allExtensions: true }],
-            ['env', { targets: { esmodules: false } }],
-        ],
-    })
-    if (!code) {
-        throw new Error('Could not transpile frontend code')
-    }
-    return `"use strict";\nexport function getFrontendApp (require) { let exports = {}; ${code}; return exports; }`
-}
-
-export function transpileSite(rawCode: string): string {
-    const { code } = transform(rawCode, {
-        envName: 'production',
-        code: true,
-        babelrc: false,
-        configFile: false,
-        filename: 'site.ts',
-        presets: [['typescript', { isTSX: false, allExtensions: true }], 'env'],
-    })
-    if (!code) {
-        throw new Error('Could not transpile web code')
-    }
-    return `(function () {let exports={};${code};return exports;})`
-}
diff --git a/plugin-server/src/worker/ingestion/app-metrics.ts b/plugin-server/src/worker/ingestion/app-metrics.ts
index 7b79eb163ae804..ffa139e250f7bb 100644
--- a/plugin-server/src/worker/ingestion/app-metrics.ts
+++ b/plugin-server/src/worker/ingestion/app-metrics.ts
@@ -15,7 +15,7 @@ export interface AppMetricIdentifier {
     pluginConfigId: number
     jobId?: string
     // Keep in sync with posthog/queries/app_metrics/serializers.py
-    category: 'processEvent' | 'onEvent' | 'exportEvents' | 'scheduledTask' | 'webhook'
+    category: 'processEvent' | 'onEvent' | 'exportEvents' | 'scheduledTask' | 'webhook' | 'composeWebhook'
 }
 
 export interface AppMetric extends AppMetricIdentifier {
diff --git a/plugin-server/src/worker/ingestion/event-pipeline/populateTeamDataStep.ts b/plugin-server/src/worker/ingestion/event-pipeline/populateTeamDataStep.ts
index 740177e2c4f617..23f1e2c418a646 100644
--- a/plugin-server/src/worker/ingestion/event-pipeline/populateTeamDataStep.ts
+++ b/plugin-server/src/worker/ingestion/event-pipeline/populateTeamDataStep.ts
@@ -3,6 +3,8 @@ import { Counter } from 'prom-client'
 
 import { eventDroppedCounter } from '../../../main/ingestion-queues/metrics'
 import { PipelineEvent } from '../../../types'
+import { UUID } from '../../../utils/utils'
+import { captureIngestionWarning } from '../utils'
 import { EventPipelineRunner } from './runner'
 
 export const tokenOrTeamPresentCounter = new Counter({
@@ -23,6 +25,8 @@ export async function populateTeamDataStep(
      * For these, we trust the team_id field value.
      */
 
+    const { db } = runner.hub
+
     // Collect statistics on the shape of events we are ingesting.
     tokenOrTeamPresentCounter
         .labels({
@@ -30,6 +34,7 @@ export async function populateTeamDataStep(
             token_present: event.token ? 'true' : 'false',
         })
         .inc()
+
     // statsd copy as prometheus is currently not supported in worker threads.
     runner.hub.statsd?.increment('ingestion_event_hasauthinfo', {
         team_id_present: event.team_id ? 'true' : 'false',
@@ -38,6 +43,14 @@ export async function populateTeamDataStep(
 
     // If a team_id is present (event captured from an app), trust it and return the event as is.
     if (event.team_id) {
+        // Check for an invalid UUID, which should be blocked by capture, when team_id is present
+        if (!UUID.validateString(event.uuid, false)) {
+            await captureIngestionWarning(db, event.team_id, 'skipping_event_invalid_uuid', {
+                eventUuid: JSON.stringify(event.uuid),
+            })
+            throw new Error(`Not a valid UUID: "${event.uuid}"`)
+        }
+
         return event as PluginEvent
     }
 
@@ -69,6 +82,14 @@ export async function populateTeamDataStep(
         return null
     }
 
+    // Check for an invalid UUID, which should be blocked by capture, when team_id is present
+    if (!UUID.validateString(event.uuid, false)) {
+        await captureIngestionWarning(db, team.id, 'skipping_event_invalid_uuid', {
+            eventUuid: JSON.stringify(event.uuid),
+        })
+        throw new Error(`Not a valid UUID: "${event.uuid}"`)
+    }
+
     event = {
         ...event,
         team_id: team.id,
diff --git a/plugin-server/src/worker/ingestion/event-pipeline/runAsyncHandlersStep.ts b/plugin-server/src/worker/ingestion/event-pipeline/runAsyncHandlersStep.ts
index 4fcc4d1bd2a494..21f5b5306a7744 100644
--- a/plugin-server/src/worker/ingestion/event-pipeline/runAsyncHandlersStep.ts
+++ b/plugin-server/src/worker/ingestion/event-pipeline/runAsyncHandlersStep.ts
@@ -1,7 +1,9 @@
+import { PostHogEvent } from '@posthog/plugin-scaffold'
+
 import { runInstrumentedFunction } from '../../../main/utils'
 import { Hub, PostIngestionEvent } from '../../../types'
 import { convertToProcessedPluginEvent } from '../../../utils/event'
-import { runOnEvent } from '../../plugins/run'
+import { runComposeWebhook, runOnEvent } from '../../plugins/run'
 import { ActionMatcher } from '../action-matcher'
 import { HookCommander, instrumentWebhookStep } from '../hooks'
 
@@ -21,6 +23,20 @@ export async function processOnEventStep(hub: Hub, event: PostIngestionEvent) {
     return null
 }
 
+export async function processComposeWebhookStep(hub: Hub, event: PostHogEvent) {
+    await runInstrumentedFunction({
+        timeoutContext: () => ({
+            team_id: event.team_id,
+            event_uuid: event.uuid,
+        }),
+        func: () => runComposeWebhook(hub, event),
+        statsKey: `kafka_queue.single_compose_webhook`,
+        timeoutMessage: `After 30 seconds still running composeWebhook`,
+        teamId: event.team_id,
+    })
+    return null
+}
+
 export async function processWebhooksStep(
     event: PostIngestionEvent,
     actionMatcher: ActionMatcher,
diff --git a/plugin-server/src/worker/ingestion/process-event.ts b/plugin-server/src/worker/ingestion/process-event.ts
index 22997a7f857a1e..b85f13dd6e53a0 100644
--- a/plugin-server/src/worker/ingestion/process-event.ts
+++ b/plugin-server/src/worker/ingestion/process-event.ts
@@ -28,7 +28,7 @@ import { KafkaProducerWrapper } from '../../utils/db/kafka-producer-wrapper'
 import { safeClickhouseString, sanitizeEventName, timeoutGuard } from '../../utils/db/utils'
 import { status } from '../../utils/status'
 import { MessageSizeTooLargeWarningLimiter } from '../../utils/token-bucket'
-import { castTimestampOrNow, UUID } from '../../utils/utils'
+import { castTimestampOrNow } from '../../utils/utils'
 import { GroupTypeManager } from './group-type-manager'
 import { addGroupProperties } from './groups'
 import { upsertGroup } from './properties-updater'
@@ -68,12 +68,6 @@ export class EventsProcessor {
         timestamp: DateTime,
         eventUuid: string
     ): Promise<PreIngestionEvent> {
-        if (!UUID.validateString(eventUuid, false)) {
-            await captureIngestionWarning(this.db, teamId, 'skipping_event_invalid_uuid', {
-                eventUuid: JSON.stringify(eventUuid),
-            })
-            throw new Error(`Not a valid UUID: "${eventUuid}"`)
-        }
         const singleSaveTimer = new Date()
         const timeout = timeoutGuard('Still inside "EventsProcessor.processEvent". Timeout warning after 30 sec!', {
             event: JSON.stringify(data),
diff --git a/plugin-server/src/worker/plugins/loadPlugin.ts b/plugin-server/src/worker/plugins/loadPlugin.ts
index b5581ef545d42a..26a7d45f97e626 100644
--- a/plugin-server/src/worker/plugins/loadPlugin.ts
+++ b/plugin-server/src/worker/plugins/loadPlugin.ts
@@ -3,9 +3,7 @@ import * as path from 'path'
 
 import { Hub, Plugin, PluginConfig, PluginJsonConfig } from '../../types'
 import { processError } from '../../utils/db/error'
-import { status } from '../../utils/status'
 import { pluginDigest } from '../../utils/utils'
-import { transpileFrontend, transpileSite } from '../frontend/transpile'
 
 function readFileIfExists(baseDir: string, plugin: Plugin, file: string): string | null {
     const fullPath = path.resolve(baseDir, plugin.url!.substring(5), file)
@@ -40,62 +38,6 @@ export async function loadPlugin(hub: Hub, pluginConfig: PluginConfig): Promise<
             }
         }
 
-        const transpileIfNeeded = async ({
-            type,
-            filename,
-            pluginKey,
-            transpile,
-        }: {
-            type: 'frontend' | 'site'
-            filename: 'frontend.tsx' | 'site.ts'
-            pluginKey: 'source__frontend_tsx' | 'source__site_ts'
-            transpile: (source: string) => string
-        }): Promise<boolean> => {
-            const source = isLocalPlugin ? readFileIfExists(hub.BASE_DIR, plugin, filename) : plugin[pluginKey]
-            if (source && hub.capabilities.transpileFrontendApps) {
-                if (await hub.db.getPluginTranspilationLock(plugin.id, filename)) {
-                    status.info('🔌', `Transpiling ${pluginDigest(plugin)}`)
-                    const transpilationStartTimer = new Date()
-                    try {
-                        const transpiled = transpile(source)
-                        await hub.db.setPluginTranspiled(plugin.id, filename, transpiled)
-                    } catch (error: any) {
-                        await processError(hub, pluginConfig, error)
-                        await hub.db.setPluginTranspiledError(
-                            plugin.id,
-                            filename,
-                            typeof error === 'string'
-                                ? error
-                                : [error.message, error.stack].filter((a) => !!a).join('\n')
-                        )
-                        hub.statsd?.increment(`transpile_${type}.ERROR`, {
-                            plugin: plugin.name ?? '?',
-                            pluginId: `${plugin.id ?? '?'}`,
-                        })
-                    }
-                    hub.statsd?.timing(`transpile_${type}`, transpilationStartTimer, {
-                        plugin: plugin.name ?? '?',
-                        pluginId: `${plugin.id ?? '?'}`,
-                    })
-                }
-            }
-            return !!source
-        }
-
-        const hasFrontend = await transpileIfNeeded({
-            type: 'frontend',
-            filename: 'frontend.tsx',
-            pluginKey: 'source__frontend_tsx',
-            transpile: transpileFrontend,
-        })
-
-        const hasSite = await transpileIfNeeded({
-            type: 'site',
-            filename: 'site.ts',
-            pluginKey: 'source__site_ts',
-            transpile: transpileSite,
-        })
-
         // setup "backend" app
         const pluginSource = isLocalPlugin
             ? config['main']
@@ -110,7 +52,14 @@ export async function loadPlugin(hub: Hub, pluginConfig: PluginConfig): Promise<
             // always call this if no backend app present, will signal that the VM is done
             pluginConfig.vm?.failInitialization!()
 
-            // if we transpiled a frontend app, don't save an error if no backend app
+            // if there is a frontend or site app, don't save an error if no backend app
+            const hasFrontend = isLocalPlugin
+                ? readFileIfExists(hub.BASE_DIR, plugin, 'frontend.tsx')
+                : plugin['source__frontend_tsx']
+            const hasSite = isLocalPlugin
+                ? readFileIfExists(hub.BASE_DIR, plugin, 'site.ts')
+                : plugin['source__site_ts']
+
             if (!hasFrontend && !hasSite) {
                 await processError(
                     hub,
diff --git a/plugin-server/src/worker/plugins/loadPluginsFromDB.ts b/plugin-server/src/worker/plugins/loadPluginsFromDB.ts
index 7dc3a14cec6ae9..d17dd0d2ba851a 100644
--- a/plugin-server/src/worker/plugins/loadPluginsFromDB.ts
+++ b/plugin-server/src/worker/plugins/loadPluginsFromDB.ts
@@ -1,6 +1,6 @@
 import { PluginAttachment } from '@posthog/plugin-scaffold'
 
-import { Hub, Plugin, PluginConfig, PluginConfigId, PluginId, TeamId } from '../../types'
+import { Hub, Plugin, PluginConfig, PluginConfigId, PluginId, PluginMethod, TeamId } from '../../types'
 import { getPluginAttachmentRows, getPluginConfigRows, getPluginRows } from '../../utils/db/sql'
 
 export async function loadPluginsFromDB(
@@ -43,11 +43,21 @@ export async function loadPluginsFromDB(
         if (!plugin) {
             continue
         }
+        let method = undefined
+        if (plugin.capabilities?.methods) {
+            const methods = plugin.capabilities.methods
+            if (methods?.some((method) => [PluginMethod.onEvent.toString(), 'exportEvents'].includes(method))) {
+                method = PluginMethod.onEvent
+            } else if (methods?.some((method) => [PluginMethod.composeWebhook.toString()].includes(method))) {
+                method = PluginMethod.composeWebhook
+            }
+        }
         const pluginConfig: PluginConfig = {
             ...row,
             plugin: plugin,
             attachments: attachmentsPerConfig.get(row.id) || {},
             vm: null,
+            method,
         }
         pluginConfigs.set(row.id, pluginConfig)
 
diff --git a/plugin-server/src/worker/plugins/run.ts b/plugin-server/src/worker/plugins/run.ts
index 2d5a982ab8532e..9775e9c1ef8602 100644
--- a/plugin-server/src/worker/plugins/run.ts
+++ b/plugin-server/src/worker/plugins/run.ts
@@ -1,7 +1,8 @@
-import { PluginEvent, ProcessedPluginEvent } from '@posthog/plugin-scaffold'
+import { PluginEvent, PostHogEvent, ProcessedPluginEvent, Webhook } from '@posthog/plugin-scaffold'
 
 import { Hub, PluginConfig, PluginTaskType, VMMethods } from '../../types'
 import { processError } from '../../utils/db/error'
+import { trackedFetch } from '../../utils/fetch'
 import { instrument } from '../../utils/metrics'
 import { status } from '../../utils/status'
 import { IllegalOperationError } from '../../utils/utils'
@@ -75,6 +76,111 @@ export async function runOnEvent(hub: Hub, event: ProcessedPluginEvent): Promise
     )
 }
 
+async function runSingleTeamPluginComposeWebhook(
+    hub: Hub,
+    event: PostHogEvent,
+    pluginConfig: PluginConfig,
+    composeWebhook: any
+): Promise<void> {
+    const slowWarningTimeout = hub.EXTERNAL_REQUEST_TIMEOUT_MS * 0.7
+    const timeout = setTimeout(() => {
+        status.warn(
+            '⌛',
+            `Still running single composeWebhook plugin for team ${event.team_id} for plugin ${pluginConfig.id}`
+        )
+    }, slowWarningTimeout)
+    try {
+        // Runs composeWebhook for a single plugin without any retries
+        const metricName = 'plugin.compose_webhook'
+        const metricTags = {
+            plugin: pluginConfig.plugin?.name ?? '?',
+            teamId: event.team_id.toString(),
+        }
+        const timer = new Date()
+        try {
+            const webhook: Webhook | null = await composeWebhook!(event)
+            if (!webhook) {
+                // TODO: ideally we'd queryMetric it as skipped, but that's not an option atm
+                status.debug('Skipping composeWebhook returned null', {
+                    teamId: event.team_id,
+                    pluginConfigId: pluginConfig.id,
+                    eventUuid: event.uuid,
+                })
+                return
+            }
+            const request = await trackedFetch(webhook.url, {
+                method: webhook.method || 'POST',
+                body: JSON.stringify(webhook.body, undefined, 4),
+                headers: { 'Content-Type': 'application/json' },
+                timeout: hub.EXTERNAL_REQUEST_TIMEOUT_MS,
+            })
+            if (request.ok) {
+                await hub.appMetrics.queueMetric({
+                    teamId: event.team_id,
+                    pluginConfigId: pluginConfig.id,
+                    category: 'composeWebhook',
+                    successes: 1,
+                })
+            } else {
+                hub.statsd?.increment(`${metricName}.ERROR`, metricTags)
+                const error = `Fetch to ${webhook.url} failed with ${request.statusText}`
+                await processError(hub, pluginConfig, error, event)
+                await hub.appMetrics.queueError(
+                    {
+                        teamId: event.team_id,
+                        pluginConfigId: pluginConfig.id,
+                        category: 'composeWebhook',
+                        failures: 1,
+                    },
+                    {
+                        error,
+                        event,
+                    }
+                )
+            }
+        } catch (error) {
+            hub.statsd?.increment(`${metricName}.ERROR`, metricTags)
+            await processError(hub, pluginConfig, error, event)
+            await hub.appMetrics.queueError(
+                {
+                    teamId: event.team_id,
+                    pluginConfigId: pluginConfig.id,
+                    category: 'composeWebhook',
+                    failures: 1,
+                },
+                {
+                    error,
+                    event,
+                }
+            )
+        }
+        hub.statsd?.timing(metricName, timer, metricTags)
+    } finally {
+        clearTimeout(timeout)
+    }
+}
+
+export async function runComposeWebhook(hub: Hub, event: PostHogEvent): Promise<void> {
+    // Runs composeWebhook for all plugins for this team in parallel
+    const pluginMethodsToRun = await getPluginMethodsForTeam(hub, event.team_id, 'composeWebhook')
+
+    await Promise.all(
+        pluginMethodsToRun
+            .filter(([, method]) => !!method)
+            .map(([pluginConfig, composeWebhook]) =>
+                instrument(
+                    hub.statsd,
+                    {
+                        metricName: 'plugin.runComposeWebhook',
+                        key: 'plugin',
+                        tag: pluginConfig.plugin?.name || '?',
+                    },
+                    () => runSingleTeamPluginComposeWebhook(hub, event, pluginConfig, composeWebhook)
+                )
+            )
+    )
+}
+
 export async function runProcessEvent(hub: Hub, event: PluginEvent): Promise<PluginEvent | null> {
     const teamId = event.team_id
     const pluginMethodsToRun = await getPluginMethodsForTeam(hub, teamId, 'processEvent')
diff --git a/plugin-server/src/worker/vm/capabilities.ts b/plugin-server/src/worker/vm/capabilities.ts
index a3b80db2590758..d4144665b8735c 100644
--- a/plugin-server/src/worker/vm/capabilities.ts
+++ b/plugin-server/src/worker/vm/capabilities.ts
@@ -47,7 +47,9 @@ function shouldSetupPlugin(serverCapability: keyof PluginServerCapabilities, plu
         return (pluginCapabilities.jobs || []).length > 0
     }
     if (serverCapability === 'processAsyncOnEventHandlers') {
-        return pluginCapabilities.methods?.some((method) => ['onEvent', 'exportEvents'].includes(method))
+        return pluginCapabilities.methods?.some((method) =>
+            ['onEvent', 'exportEvents', 'composeWebhook'].includes(method)
+        )
     }
 
     return false
diff --git a/plugin-server/src/worker/vm/vm.ts b/plugin-server/src/worker/vm/vm.ts
index eb6141942d8c02..e12d114ec0b22d 100644
--- a/plugin-server/src/worker/vm/vm.ts
+++ b/plugin-server/src/worker/vm/vm.ts
@@ -183,6 +183,7 @@ export function createPluginConfigVM(
                 exportEvents: __asyncFunctionGuard(__bindMeta('exportEvents'), 'exportEvents'),
                 onEvent: __asyncFunctionGuard(__bindMeta('onEvent'), 'onEvent'),
                 processEvent: __asyncFunctionGuard(__bindMeta('processEvent'), 'processEvent'),
+                composeWebhook: __bindMeta('composeWebhook'),
                 getSettings: __bindMeta('getSettings'),
             };
 
diff --git a/plugin-server/tests/main/ingestion-queues/each-batch.test.ts b/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
index 19b43173340352..c25062008eaeea 100644
--- a/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
+++ b/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
@@ -14,6 +14,7 @@ import {
     ClickHouseTimestamp,
     ClickHouseTimestampSecondPrecision,
     ISOTimestamp,
+    PluginMethod,
     PostIngestionEvent,
     RawClickHouseEvent,
 } from '../../../src/types'
@@ -173,8 +174,8 @@ describe('eachBatchX', () => {
         })
         it('parses elements when useful', async () => {
             queue.pluginsServer.pluginConfigsPerTeam.set(2, [
-                { ...pluginConfig39, plugin_id: 60 },
-                { ...pluginConfig39, plugin_id: 33 },
+                { ...pluginConfig39, plugin_id: 60, method: PluginMethod.onEvent },
+                { ...pluginConfig39, plugin_id: 33, method: PluginMethod.onEvent },
             ])
             queue.pluginsServer.pluginConfigsToSkipElementsParsing = buildIntegerMatcher('12,60,100', true)
             await eachBatchAppsOnEventHandlers(
@@ -193,8 +194,8 @@ describe('eachBatchX', () => {
         })
         it('skips elements parsing when not useful', async () => {
             queue.pluginsServer.pluginConfigsPerTeam.set(2, [
-                { ...pluginConfig39, plugin_id: 60 },
-                { ...pluginConfig39, plugin_id: 100 },
+                { ...pluginConfig39, plugin_id: 60, method: PluginMethod.onEvent },
+                { ...pluginConfig39, plugin_id: 100, method: PluginMethod.onEvent },
             ])
             queue.pluginsServer.pluginConfigsToSkipElementsParsing = buildIntegerMatcher('12,60,100', true)
             await eachBatchAppsOnEventHandlers(
diff --git a/plugin-server/tests/main/ingestion-queues/run-ingestion-pipeline.test.ts b/plugin-server/tests/main/ingestion-queues/run-ingestion-pipeline.test.ts
index d938b95078c68f..4ea08342eda2bb 100644
--- a/plugin-server/tests/main/ingestion-queues/run-ingestion-pipeline.test.ts
+++ b/plugin-server/tests/main/ingestion-queues/run-ingestion-pipeline.test.ts
@@ -5,6 +5,7 @@ import { Hub } from '../../../src/types'
 import { DependencyUnavailableError } from '../../../src/utils/db/error'
 import { createHub } from '../../../src/utils/db/hub'
 import { PostgresUse } from '../../../src/utils/db/postgres'
+import { UUIDT } from '../../../src/utils/utils'
 import { runEventPipeline } from '../../../src/worker/ingestion/event-pipeline/runner'
 import { createOrganization, createTeam, POSTGRES_DELETE_TABLES_QUERY } from '../../helpers/sql'
 
@@ -57,7 +58,7 @@ describe('workerTasks.runEventPipeline()', () => {
                 properties: {},
                 site_url: 'https://example.com',
                 now: new Date().toISOString(),
-                uuid: 'uuid',
+                uuid: new UUIDT().toString(),
             })
         ).rejects.toEqual(new DependencyUnavailableError(errorMessage, 'Postgres', new Error(errorMessage)))
         pgQueryMock.mockRestore()
diff --git a/plugin-server/tests/main/ingestion-queues/session-recording/session-recordings-consumer.test.ts b/plugin-server/tests/main/ingestion-queues/session-recording/session-recordings-consumer.test.ts
index e247f7c8f1dfeb..508e85faa7ebfa 100644
--- a/plugin-server/tests/main/ingestion-queues/session-recording/session-recordings-consumer.test.ts
+++ b/plugin-server/tests/main/ingestion-queues/session-recording/session-recordings-consumer.test.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto'
 import { mkdirSync, readdirSync, rmSync } from 'node:fs'
-import { Message, TopicPartition, TopicPartitionOffset } from 'node-rdkafka'
+import { TopicPartition, TopicPartitionOffset } from 'node-rdkafka'
 import path from 'path'
 
 import { waitForExpect } from '../../../../functional_tests/expectations'
@@ -89,7 +89,7 @@ describe('ingester', () => {
             })
         })
 
-        mockConsumer.committed.mockImplementation((topicPartitions: TopicPartition[], timeout, cb) => {
+        mockConsumer.committed.mockImplementation((topicPartitions: TopicPartition[], _timeout, cb) => {
             const tpos: TopicPartitionOffset[] = topicPartitions.map((tp) => ({
                 topic: tp.topic,
                 partition: tp.partition,
@@ -196,153 +196,6 @@ describe('ingester', () => {
         }, 10000)
     })
 
-    describe('parsing the message', () => {
-        it('can handle numeric distinct_ids', async () => {
-            const numeric_id = 12345
-
-            const parsedMessage = await ingester.parseKafkaMessage(
-                {
-                    value: Buffer.from(
-                        JSON.stringify({
-                            uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
-                            distinct_id: String(numeric_id),
-                            ip: '127.0.0.1',
-                            site_url: 'http://127.0.0.1:8000',
-                            data: JSON.stringify({
-                                uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
-                                event: '$snapshot_items',
-                                properties: {
-                                    distinct_id: numeric_id,
-                                    $session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
-                                    $window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
-                                    $snapshot_items: [
-                                        {
-                                            type: 6,
-                                            data: {
-                                                plugin: 'rrweb/console@1',
-                                                payload: {
-                                                    level: 'log',
-                                                    trace: [
-                                                        'HedgehogActor.setAnimation (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105543:17)',
-                                                        'HedgehogActor.setRandomAnimation (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105550:14)',
-                                                        'HedgehogActor.update (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105572:16)',
-                                                        'loop (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105754:15)',
-                                                    ],
-                                                    payload: ['"Hedgehog: Will \'jump\' for 2916.6666666666665ms"'],
-                                                },
-                                            },
-                                            timestamp: 1693422950693,
-                                        },
-                                    ],
-                                    $snapshot_consumer: 'v2',
-                                },
-                                offset: 2187,
-                            }),
-                            now: '2023-08-30T19:15:54.887316+00:00',
-                            sent_at: '2023-08-30T19:15:54.882000+00:00',
-                            token: 'the_token',
-                        })
-                    ),
-                    timestamp: 1,
-                    size: 1,
-                    topic: 'the_topic',
-                    offset: 1,
-                    partition: 1,
-                } satisfies Message,
-                () => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
-            )
-            expect(parsedMessage).toEqual({
-                distinct_id: '12345',
-                events: expect.any(Array),
-                metadata: {
-                    offset: 1,
-                    partition: 1,
-                    timestamp: 1,
-                    topic: 'the_topic',
-                    consoleLogIngestionEnabled: false,
-                },
-                session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
-                team_id: 1,
-                window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
-            })
-        })
-
-        it('filters out invalid rrweb events', async () => {
-            const numeric_id = 12345
-
-            const createMessage = ($snapshot_items: unknown[]) => {
-                return {
-                    value: Buffer.from(
-                        JSON.stringify({
-                            uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
-                            distinct_id: String(numeric_id),
-                            ip: '127.0.0.1',
-                            site_url: 'http://127.0.0.1:8000',
-                            data: JSON.stringify({
-                                uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
-                                event: '$snapshot_items',
-                                properties: {
-                                    distinct_id: numeric_id,
-                                    $session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
-                                    $window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
-                                    $snapshot_items: $snapshot_items,
-                                },
-                            }),
-                            token: 'the_token',
-                        })
-                    ),
-                    timestamp: 1,
-                    size: 1,
-                    topic: 'the_topic',
-                    offset: 1,
-                    partition: 1,
-                } satisfies Message
-            }
-
-            const parsedMessage = await ingester.parseKafkaMessage(
-                createMessage([
-                    {
-                        type: 6,
-                        data: {},
-                        timestamp: null,
-                    },
-                ]),
-                () => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: true })
-            )
-            expect(parsedMessage).toEqual(undefined)
-
-            const parsedMessage2 = await ingester.parseKafkaMessage(
-                createMessage([
-                    {
-                        type: 6,
-                        data: {},
-                        timestamp: null,
-                    },
-                    {
-                        type: 6,
-                        data: {},
-                        timestamp: 123,
-                    },
-                ]),
-                () => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: true })
-            )
-            expect(parsedMessage2).toMatchObject({
-                events: [
-                    {
-                        data: {},
-                        timestamp: 123,
-                        type: 6,
-                    },
-                ],
-            })
-
-            const parsedMessage3 = await ingester.parseKafkaMessage(createMessage([null]), () =>
-                Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
-            )
-            expect(parsedMessage3).toEqual(undefined)
-        })
-    })
-
     describe('offset committing', () => {
         it('should commit offsets in simple cases', async () => {
             await ingester.handleEachBatch([createMessage('sid1'), createMessage('sid1')])
@@ -687,7 +540,7 @@ describe('ingester', () => {
 
     describe('lag reporting', () => {
         it('should return the latest offsets', async () => {
-            mockConsumer.queryWatermarkOffsets.mockImplementation((topic, partition, timeout, cb) => {
+            mockConsumer.queryWatermarkOffsets.mockImplementation((_topic, partition, _timeout, cb) => {
                 cb(null, { highOffset: 1000 + partition, lowOffset: 0 })
             })
 
diff --git a/plugin-server/tests/main/ingestion-queues/session-recording/utils.test.ts b/plugin-server/tests/main/ingestion-queues/session-recording/utils.test.ts
index 4c6d77cc750d84..44d6fa2c2fb5e9 100644
--- a/plugin-server/tests/main/ingestion-queues/session-recording/utils.test.ts
+++ b/plugin-server/tests/main/ingestion-queues/session-recording/utils.test.ts
@@ -1,6 +1,207 @@
-import { getLagMultipler, maxDefined, minDefined } from '../../../../src/main/ingestion-queues/session-recording/utils'
+import { Message, MessageHeader } from 'node-rdkafka'
+
+import {
+    getLagMultiplier,
+    maxDefined,
+    minDefined,
+    parseKafkaMessage,
+} from '../../../../src/main/ingestion-queues/session-recording/utils'
 
 describe('session-recording utils', () => {
+    const validMessage = (distinctId: number | string, headers?: MessageHeader[], value?: Record<string, any>) =>
+        ({
+            headers,
+            value: Buffer.from(
+                JSON.stringify({
+                    uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
+                    distinct_id: String(distinctId),
+                    ip: '127.0.0.1',
+                    site_url: 'http://127.0.0.1:8000',
+                    data: JSON.stringify({
+                        uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
+                        event: '$snapshot_items',
+                        properties: {
+                            distinct_id: distinctId,
+                            $session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
+                            $window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
+                            $snapshot_items: [
+                                {
+                                    type: 6,
+                                    data: {
+                                        plugin: 'rrweb/console@1',
+                                        payload: {
+                                            level: 'log',
+                                            trace: [
+                                                'HedgehogActor.setAnimation (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105543:17)',
+                                                'HedgehogActor.setRandomAnimation (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105550:14)',
+                                                'HedgehogActor.update (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105572:16)',
+                                                'loop (http://127.0.0.1:8000/static/toolbar.js?_ts=1693421010000:105754:15)',
+                                            ],
+                                            payload: ['"Hedgehog: Will \'jump\' for 2916.6666666666665ms"'],
+                                        },
+                                    },
+                                    timestamp: 1693422950693,
+                                },
+                            ],
+                            $snapshot_consumer: 'v2',
+                        },
+                        offset: 2187,
+                    }),
+                    now: '2023-08-30T19:15:54.887316+00:00',
+                    sent_at: '2023-08-30T19:15:54.882000+00:00',
+                    token: 'the_token',
+                    ...value,
+                })
+            ),
+            timestamp: 1,
+            size: 1,
+            topic: 'the_topic',
+            offset: 1,
+            partition: 1,
+        } satisfies Message)
+
+    describe('parsing the message', () => {
+        it('can handle numeric distinct_ids', async () => {
+            const numericId = 12345
+            const parsedMessage = await parseKafkaMessage(validMessage(numericId), () =>
+                Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
+            )
+            expect(parsedMessage).toEqual({
+                distinct_id: String(numericId),
+                events: expect.any(Array),
+                metadata: {
+                    offset: 1,
+                    partition: 1,
+                    timestamp: 1,
+                    topic: 'the_topic',
+                    consoleLogIngestionEnabled: false,
+                },
+                session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
+                team_id: 1,
+                window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
+            })
+        })
+
+        it('filters out invalid rrweb events', async () => {
+            const numeric_id = 12345
+
+            const createMessage = ($snapshot_items: unknown[]) => {
+                return {
+                    value: Buffer.from(
+                        JSON.stringify({
+                            uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
+                            distinct_id: String(numeric_id),
+                            ip: '127.0.0.1',
+                            site_url: 'http://127.0.0.1:8000',
+                            data: JSON.stringify({
+                                uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
+                                event: '$snapshot_items',
+                                properties: {
+                                    distinct_id: numeric_id,
+                                    $session_id: '018a47c2-2f4a-70a8-b480-5e51d8b8d070',
+                                    $window_id: '018a47c2-2f4a-70a8-b480-5e52f5480448',
+                                    $snapshot_items: $snapshot_items,
+                                },
+                            }),
+                            token: 'the_token',
+                        })
+                    ),
+                    timestamp: 1,
+                    size: 1,
+                    topic: 'the_topic',
+                    offset: 1,
+                    partition: 1,
+                } satisfies Message
+            }
+
+            const parsedMessage = await parseKafkaMessage(
+                createMessage([
+                    {
+                        type: 6,
+                        data: {},
+                        timestamp: null,
+                    },
+                ]),
+                () => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: true })
+            )
+            expect(parsedMessage).toEqual(undefined)
+
+            const parsedMessage2 = await parseKafkaMessage(
+                createMessage([
+                    {
+                        type: 6,
+                        data: {},
+                        timestamp: null,
+                    },
+                    {
+                        type: 6,
+                        data: {},
+                        timestamp: 123,
+                    },
+                ]),
+                () => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: true })
+            )
+            expect(parsedMessage2).toMatchObject({
+                events: [
+                    {
+                        data: {},
+                        timestamp: 123,
+                        type: 6,
+                    },
+                ],
+            })
+
+            const parsedMessage3 = await parseKafkaMessage(createMessage([null]), () =>
+                Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
+            )
+            expect(parsedMessage3).toEqual(undefined)
+        })
+
+        describe('team token can be in header or body', () => {
+            const mockTeamResolver = jest.fn()
+
+            beforeEach(() => {
+                mockTeamResolver.mockReset()
+                mockTeamResolver.mockResolvedValue({ teamId: 1, consoleLogIngestionEnabled: false })
+            })
+
+            test.each([
+                [
+                    'calls the team id resolver once when token is in header, not in the body',
+                    'the_token',
+                    undefined,
+                    ['the_token'],
+                ],
+                [
+                    'calls the team id resolver once when token is in header, and in the body',
+                    'the_token',
+                    'the body token',
+                    ['the_token'],
+                ],
+                [
+                    'does not call the team id resolver when token is not in header, and not in body',
+                    undefined,
+                    undefined,
+                    undefined,
+                ],
+                [
+                    'calls the team id resolver twice when token is not in header, and is in body',
+                    undefined,
+                    'the body token',
+                    ['the body token'],
+                ],
+            ])('%s', async (_name, headerToken, payloadToken, expectedCalls) => {
+                await parseKafkaMessage(
+                    validMessage(12345, headerToken ? [{ token: Buffer.from(headerToken) }] : undefined, {
+                        token: payloadToken,
+                    }),
+                    mockTeamResolver
+                )
+                expect(mockTeamResolver.mock.calls).toEqual([expectedCalls])
+            })
+        })
+    })
+
     it('minDefined', () => {
         expect(minDefined(1, 2, 3)).toEqual(1)
         expect(minDefined(1, undefined, 3)).toEqual(1)
@@ -14,32 +215,32 @@ describe('session-recording utils', () => {
         expect(maxDefined(undefined, undefined, undefined)).toEqual(undefined)
         expect(maxDefined()).toEqual(undefined)
     })
-})
 
-describe('getLagMultipler', () => {
-    const threshold = 1000
-    it('returns 1 when lag is 0', () => {
-        expect(getLagMultipler(0, threshold)).toEqual(1)
-    })
+    describe('getLagMultiplier', () => {
+        const threshold = 1000
+        it('returns 1 when lag is 0', () => {
+            expect(getLagMultiplier(0, threshold)).toEqual(1)
+        })
 
-    it('returns 1 when lag is under threshold', () => {
-        expect(getLagMultipler(threshold - 1, threshold)).toEqual(1)
-    })
+        it('returns 1 when lag is under threshold', () => {
+            expect(getLagMultiplier(threshold - 1, threshold)).toEqual(1)
+        })
 
-    it('returns 0.9 when lag is double threshold', () => {
-        expect(getLagMultipler(threshold * 2, threshold)).toEqual(0.9)
-    })
+        it('returns 0.9 when lag is double threshold', () => {
+            expect(getLagMultiplier(threshold * 2, threshold)).toEqual(0.9)
+        })
 
-    it('returns 0.6 when lag is 5 times the threshold', () => {
-        expect(getLagMultipler(threshold * 5, threshold)).toEqual(0.6)
-    })
+        it('returns 0.6 when lag is 5 times the threshold', () => {
+            expect(getLagMultiplier(threshold * 5, threshold)).toEqual(0.6)
+        })
 
-    it('returns 0.9 when lag is 9 times the threshold', () => {
-        expect(getLagMultipler(threshold * 9, threshold)).toBeGreaterThanOrEqual(0.19)
-        expect(getLagMultipler(threshold * 9, threshold)).toBeLessThanOrEqual(0.2)
-    })
+        it('returns 0.9 when lag is 9 times the threshold', () => {
+            expect(getLagMultiplier(threshold * 9, threshold)).toBeGreaterThanOrEqual(0.19)
+            expect(getLagMultiplier(threshold * 9, threshold)).toBeLessThanOrEqual(0.2)
+        })
 
-    it('returns 0.1 when lag is 100 times the threshold', () => {
-        expect(getLagMultipler(threshold * 100, threshold)).toEqual(0.1)
+        it('returns 0.1 when lag is 100 times the threshold', () => {
+            expect(getLagMultiplier(threshold * 100, threshold)).toEqual(0.1)
+        })
     })
 })
diff --git a/plugin-server/tests/main/process-event.test.ts b/plugin-server/tests/main/process-event.test.ts
index 786acbbd7698e4..d284ea3c4d9d09 100644
--- a/plugin-server/tests/main/process-event.test.ts
+++ b/plugin-server/tests/main/process-event.test.ts
@@ -2459,26 +2459,45 @@ test('long event name substr', async () => {
     expect(event.event?.length).toBe(200)
 })
 
-test('throws with bad uuid', async () => {
-    await expect(
-        eventsProcessor.processEvent(
-            'xxx',
-            { event: 'E', properties: { price: 299.99, name: 'AirPods Pro' } } as any as PluginEvent,
-            team.id,
-            DateTime.utc(),
-            'this is not an uuid'
-        )
-    ).rejects.toEqual(new Error('Not a valid UUID: "this is not an uuid"'))
+describe('validates eventUuid', () => {
+    test('invalid uuid string returns an error', async () => {
+        const pluginEvent: PluginEvent = {
+            distinct_id: 'i_am_a_distinct_id',
+            site_url: '',
+            team_id: team.id,
+            timestamp: DateTime.utc().toISO(),
+            now: now.toUTC().toISO(),
+            ip: '',
+            uuid: 'i_am_not_a_uuid',
+            event: 'eVeNt',
+            properties: { price: 299.99, name: 'AirPods Pro' },
+        }
 
-    await expect(
-        eventsProcessor.processEvent(
-            'xxx',
-            { event: 'E', properties: { price: 299.99, name: 'AirPods Pro' } } as any as PluginEvent,
-            team.id,
-            DateTime.utc(),
-            null as any
-        )
-    ).rejects.toEqual(new Error('Not a valid UUID: "null"'))
+        const runner = new EventPipelineRunner(hub, pluginEvent)
+        const result = await runner.runEventPipeline(pluginEvent)
+
+        expect(result.error).toBeDefined()
+        expect(result.error).toEqual('Not a valid UUID: "i_am_not_a_uuid"')
+    })
+    test('null value in eventUUID returns an error', async () => {
+        const pluginEvent: PluginEvent = {
+            distinct_id: 'i_am_a_distinct_id',
+            site_url: '',
+            team_id: team.id,
+            timestamp: DateTime.utc().toISO(),
+            now: now.toUTC().toISO(),
+            ip: '',
+            uuid: null as any,
+            event: 'eVeNt',
+            properties: { price: 299.99, name: 'AirPods Pro' },
+        }
+
+        const runner = new EventPipelineRunner(hub, pluginEvent)
+        const result = await runner.runEventPipeline(pluginEvent)
+
+        expect(result.error).toBeDefined()
+        expect(result.error).toEqual('Not a valid UUID: "null"')
+    })
 })
 
 test('any event can do $set on props (user exists)', async () => {
diff --git a/plugin-server/tests/worker/plugins.test.ts b/plugin-server/tests/worker/plugins.test.ts
index 1b5bbd48efc283..4b169eb9f33a63 100644
--- a/plugin-server/tests/worker/plugins.test.ts
+++ b/plugin-server/tests/worker/plugins.test.ts
@@ -3,7 +3,6 @@ import { PluginEvent } from '@posthog/plugin-scaffold/src/types'
 import { Hub, LogLevel } from '../../src/types'
 import { processError } from '../../src/utils/db/error'
 import { createHub } from '../../src/utils/db/hub'
-import { PostgresUse } from '../../src/utils/db/postgres'
 import { delay, IllegalOperationError } from '../../src/utils/utils'
 import { loadPlugin } from '../../src/worker/plugins/loadPlugin'
 import { loadSchedule } from '../../src/worker/plugins/loadSchedule'
@@ -82,6 +81,7 @@ describe('plugins', () => {
         expect(pluginConfig.vm).toBeDefined()
         const vm = await pluginConfig.vm!.resolveInternalVm
         expect(Object.keys(vm!.methods).sort()).toEqual([
+            'composeWebhook',
             'exportEvents',
             'getSettings',
             'onEvent',
@@ -628,91 +628,6 @@ describe('plugins', () => {
         expect(pluginConfig.plugin!.capabilities!.scheduled_tasks).toEqual([])
     })
 
-    test('plugin with frontend source transpiles it', async () => {
-        getPluginRows.mockReturnValueOnce([
-            { ...mockPluginSourceCode(), source__frontend_tsx: `export const scene = {}` },
-        ])
-        getPluginConfigRows.mockReturnValueOnce([pluginConfig39])
-        getPluginAttachmentRows.mockReturnValueOnce([pluginAttachment1])
-        await setupPlugins(hub)
-        const {
-            rows: [{ transpiled }],
-        } = await hub.db.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            `SELECT transpiled FROM posthog_pluginsourcefile WHERE plugin_id = $1 AND filename = $2`,
-            [60, 'frontend.tsx'],
-            ''
-        )
-        expect(transpiled).toEqual(`"use strict";
-export function getFrontendApp (require) { let exports = {}; "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.scene = void 0;
-var scene = {};
-exports.scene = scene;; return exports; }`)
-    })
-
-    test('plugin with frontend source with error', async () => {
-        getPluginRows.mockReturnValueOnce([
-            { ...mockPluginSourceCode(), source__frontend_tsx: `export const scene = {}/` },
-        ])
-        getPluginConfigRows.mockReturnValueOnce([pluginConfig39])
-        getPluginAttachmentRows.mockReturnValueOnce([pluginAttachment1])
-        await setupPlugins(hub)
-        const {
-            rows: [plugin],
-        } = await hub.db.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            `SELECT * FROM posthog_pluginsourcefile WHERE plugin_id = $1 AND filename = $2`,
-            [60, 'frontend.tsx'],
-            ''
-        )
-        expect(plugin.transpiled).toEqual(null)
-        expect(plugin.status).toEqual('ERROR')
-        expect(plugin.error).toContain(`SyntaxError: /frontend.tsx: Unexpected token (1:24)`)
-        expect(plugin.error).toContain(`export const scene = {}/`)
-    })
-
-    test('getTranspilationLock returns just once', async () => {
-        getPluginRows.mockReturnValueOnce([
-            {
-                ...mockPluginSourceCode(),
-                source__index_ts: `function processEvent (event, meta) { event.properties={"x": 1}; return event }`,
-                source__frontend_tsx: `export const scene = {}`,
-            },
-        ])
-        getPluginConfigRows.mockReturnValueOnce([pluginConfig39])
-        getPluginAttachmentRows.mockReturnValueOnce([pluginAttachment1])
-
-        await setupPlugins(hub)
-        const getStatus = async () =>
-            (
-                await hub.db.postgres.query(
-                    PostgresUse.COMMON_WRITE,
-                    `SELECT status FROM posthog_pluginsourcefile WHERE plugin_id = $1 AND filename = $2`,
-                    [60, 'frontend.tsx'],
-                    ''
-                )
-            )?.rows?.[0]?.status || null
-
-        expect(await getStatus()).toEqual('TRANSPILED')
-        expect(await hub.db.getPluginTranspilationLock(60, 'frontend.tsx')).toEqual(false)
-        expect(await hub.db.getPluginTranspilationLock(60, 'frontend.tsx')).toEqual(false)
-
-        await hub.db.postgres.query(
-            PostgresUse.COMMON_WRITE,
-            'UPDATE posthog_pluginsourcefile SET transpiled = NULL, status = NULL WHERE filename = $1',
-            ['frontend.tsx'],
-            ''
-        )
-
-        expect(await hub.db.getPluginTranspilationLock(60, 'frontend.tsx')).toEqual(true)
-        expect(await hub.db.getPluginTranspilationLock(60, 'frontend.tsx')).toEqual(false)
-        expect(await getStatus()).toEqual('LOCKED')
-    })
-
     test('reloading plugins after config changes', async () => {
         const makePlugin = (id: number, updated_at = '2020-11-02'): any => ({
             ...plugin60,
diff --git a/plugin-server/tests/worker/vm.test.ts b/plugin-server/tests/worker/vm.test.ts
index 138c813d5c70b5..8bf73b2d550511 100644
--- a/plugin-server/tests/worker/vm.test.ts
+++ b/plugin-server/tests/worker/vm.test.ts
@@ -58,6 +58,7 @@ describe('vm tests', () => {
 
         expect(Object.keys(vm).sort()).toEqual(['methods', 'tasks', 'vm', 'vmResponseVariable'])
         expect(Object.keys(vm.methods).sort()).toEqual([
+            'composeWebhook',
             'exportEvents',
             'getSettings',
             'onEvent',
diff --git a/plugin-transpiler/README.md b/plugin-transpiler/README.md
new file mode 100644
index 00000000000000..eab9d78b4c44cc
--- /dev/null
+++ b/plugin-transpiler/README.md
@@ -0,0 +1,3 @@
+## Plugin Transpiler
+
+This project transpiles frontend plugins and site apps.
diff --git a/plugin-transpiler/build.mjs b/plugin-transpiler/build.mjs
new file mode 100755
index 00000000000000..c748c3bddc751f
--- /dev/null
+++ b/plugin-transpiler/build.mjs
@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+import * as esbuild from 'esbuild'
+;(async function build() {
+    let result = await esbuild.build({
+        entryPoints: ['src/index.ts'],
+        bundle: true,
+        outdir: 'dist',
+    })
+    if (!result.errors.length) {
+        // eslint-disable-next-line no-console
+        console.log('Build succeeded')
+    }
+})()
diff --git a/plugin-transpiler/package.json b/plugin-transpiler/package.json
new file mode 100644
index 00000000000000..a36609f09fc801
--- /dev/null
+++ b/plugin-transpiler/package.json
@@ -0,0 +1,21 @@
+{
+    "name": "plugin-transpiler",
+    "version": "1.0.0",
+    "description": "Transpiles site apps TSX to browser JS via stdin/stdout",
+    "main": "transpile.mjs",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "build": "tsc -b && node build.mjs",
+        "start:dist": "node dist/index.js",
+        "start": "npm run build && npm run start:dist"
+    },
+    "author": "PostHog Inc.",
+    "license": "MIT",
+    "devDependencies": {
+        "@babel/standalone": "^7.23.2",
+        "@types/babel__standalone": "^7.1.6",
+        "@types/node": "^20.8.9",
+        "esbuild": "^0.19.5",
+        "typescript": "^5.2.2"
+    }
+}
diff --git a/plugin-transpiler/pnpm-lock.yaml b/plugin-transpiler/pnpm-lock.yaml
new file mode 100644
index 00000000000000..4363b1cc475857
--- /dev/null
+++ b/plugin-transpiler/pnpm-lock.yaml
@@ -0,0 +1,340 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+devDependencies:
+  '@babel/standalone':
+    specifier: ^7.23.2
+    version: 7.23.2
+  '@types/babel__standalone':
+    specifier: ^7.1.6
+    version: 7.1.6
+  '@types/node':
+    specifier: ^20.8.9
+    version: 20.8.9
+  esbuild:
+    specifier: ^0.19.5
+    version: 0.19.5
+  typescript:
+    specifier: ^5.2.2
+    version: 5.2.2
+
+packages:
+
+  /@babel/helper-string-parser@7.22.5:
+    resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-identifier@7.22.20:
+    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/parser@7.23.0:
+    resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.23.0
+    dev: true
+
+  /@babel/standalone@7.23.2:
+    resolution: {integrity: sha512-VJNw7OS26JvB6rE9XpbT6uQeQIEBWU5eeHGS4VR/+/4ZoKdLBXLcy66ZVJ/9IBkK1RMp8B0cohvhzdKWtJAGmg==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/types@7.23.0:
+    resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@esbuild/android-arm64@0.19.5:
+    resolution: {integrity: sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm@0.19.5:
+    resolution: {integrity: sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64@0.19.5:
+    resolution: {integrity: sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-arm64@0.19.5:
+    resolution: {integrity: sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-x64@0.19.5:
+    resolution: {integrity: sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-arm64@0.19.5:
+    resolution: {integrity: sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-x64@0.19.5:
+    resolution: {integrity: sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm64@0.19.5:
+    resolution: {integrity: sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm@0.19.5:
+    resolution: {integrity: sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.19.5:
+    resolution: {integrity: sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-loong64@0.19.5:
+    resolution: {integrity: sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-mips64el@0.19.5:
+    resolution: {integrity: sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ppc64@0.19.5:
+    resolution: {integrity: sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-riscv64@0.19.5:
+    resolution: {integrity: sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-s390x@0.19.5:
+    resolution: {integrity: sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-x64@0.19.5:
+    resolution: {integrity: sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/netbsd-x64@0.19.5:
+    resolution: {integrity: sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/openbsd-x64@0.19.5:
+    resolution: {integrity: sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/sunos-x64@0.19.5:
+    resolution: {integrity: sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-arm64@0.19.5:
+    resolution: {integrity: sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-ia32@0.19.5:
+    resolution: {integrity: sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-x64@0.19.5:
+    resolution: {integrity: sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@types/babel__core@7.20.3:
+    resolution: {integrity: sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==}
+    dependencies:
+      '@babel/parser': 7.23.0
+      '@babel/types': 7.23.0
+      '@types/babel__generator': 7.6.6
+      '@types/babel__template': 7.4.3
+      '@types/babel__traverse': 7.20.3
+    dev: true
+
+  /@types/babel__generator@7.6.6:
+    resolution: {integrity: sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==}
+    dependencies:
+      '@babel/types': 7.23.0
+    dev: true
+
+  /@types/babel__standalone@7.1.6:
+    resolution: {integrity: sha512-JRVq2H02irW6GDxkHepsdZVjor87SZo4eDsxoBtSbswf7HWtVYNxCmJDBkJbFNFWGOuzsxATZV8xZ2PI9sBiIw==}
+    dependencies:
+      '@types/babel__core': 7.20.3
+    dev: true
+
+  /@types/babel__template@7.4.3:
+    resolution: {integrity: sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==}
+    dependencies:
+      '@babel/parser': 7.23.0
+      '@babel/types': 7.23.0
+    dev: true
+
+  /@types/babel__traverse@7.20.3:
+    resolution: {integrity: sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==}
+    dependencies:
+      '@babel/types': 7.23.0
+    dev: true
+
+  /@types/node@20.8.9:
+    resolution: {integrity: sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==}
+    dependencies:
+      undici-types: 5.26.5
+    dev: true
+
+  /esbuild@0.19.5:
+    resolution: {integrity: sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.19.5
+      '@esbuild/android-arm64': 0.19.5
+      '@esbuild/android-x64': 0.19.5
+      '@esbuild/darwin-arm64': 0.19.5
+      '@esbuild/darwin-x64': 0.19.5
+      '@esbuild/freebsd-arm64': 0.19.5
+      '@esbuild/freebsd-x64': 0.19.5
+      '@esbuild/linux-arm': 0.19.5
+      '@esbuild/linux-arm64': 0.19.5
+      '@esbuild/linux-ia32': 0.19.5
+      '@esbuild/linux-loong64': 0.19.5
+      '@esbuild/linux-mips64el': 0.19.5
+      '@esbuild/linux-ppc64': 0.19.5
+      '@esbuild/linux-riscv64': 0.19.5
+      '@esbuild/linux-s390x': 0.19.5
+      '@esbuild/linux-x64': 0.19.5
+      '@esbuild/netbsd-x64': 0.19.5
+      '@esbuild/openbsd-x64': 0.19.5
+      '@esbuild/sunos-x64': 0.19.5
+      '@esbuild/win32-arm64': 0.19.5
+      '@esbuild/win32-ia32': 0.19.5
+      '@esbuild/win32-x64': 0.19.5
+    dev: true
+
+  /to-fast-properties@2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /typescript@5.2.2:
+    resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+    dev: true
+
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    dev: true
diff --git a/plugin-transpiler/src/index.ts b/plugin-transpiler/src/index.ts
new file mode 100644
index 00000000000000..f5c910f3456cd9
--- /dev/null
+++ b/plugin-transpiler/src/index.ts
@@ -0,0 +1,46 @@
+import { transform } from '@babel/standalone'
+import { presets } from './presets'
+
+process.stdin.setEncoding('utf8')
+
+let type: 'site' | 'frontend' = 'site'
+
+for (let i = 2; i < process.argv.length; i++) {
+    const arg = process.argv[i]
+    if (arg === '--type' && process.argv[i + 1]) {
+        type = process.argv[++i] as any
+        if (type !== 'site' && type !== 'frontend') {
+            console.error(`Unknown app type: ${type}`)
+            process.exit(1)
+        }
+    } else {
+        console.error(`Unknown argument: ${arg}`)
+        process.exit(1)
+    }
+}
+const { wrapper, ...options } = presets[type]
+
+let code = ''
+process.stdin.on('readable', () => {
+    let chunk: string | Buffer
+    while ((chunk = process.stdin.read())) {
+        code += chunk
+    }
+})
+
+process.stdin.on('end', () => {
+    try {
+        let output = transform(code, options).code
+        if (output) {
+            if (wrapper) {
+                output = wrapper(output)
+            }
+            process.stdout.write(output, 'utf8')
+        } else {
+            throw new Error('Could not transpile code')
+        }
+    } catch (error: any) {
+        console.error(error.message)
+        process.exit(1)
+    }
+})
diff --git a/plugin-transpiler/src/presets.ts b/plugin-transpiler/src/presets.ts
new file mode 100644
index 00000000000000..8cc9d051cc1092
--- /dev/null
+++ b/plugin-transpiler/src/presets.ts
@@ -0,0 +1,25 @@
+export const presets = {
+    site: {
+        envName: 'production',
+        code: true,
+        babelrc: false,
+        configFile: false,
+        filename: 'site.ts',
+        presets: [['typescript', { isTSX: false, allExtensions: true }], 'env'],
+        wrapper: (code: string): string => `(function () {let exports={};${code};return exports;})`,
+    },
+    frontend: {
+        envName: 'production',
+        code: true,
+        babelrc: false,
+        configFile: false,
+        filename: 'frontend.tsx',
+        plugins: ['transform-react-jsx'],
+        presets: [
+            ['typescript', { isTSX: true, allExtensions: true }],
+            ['env', { targets: { esmodules: false } }],
+        ],
+        wrapper: (code: string): string =>
+            `"use strict";\nexport function getFrontendApp (require) { let exports = {}; ${code}; return exports; }`,
+    },
+}
diff --git a/plugin-transpiler/tsconfig.json b/plugin-transpiler/tsconfig.json
new file mode 100644
index 00000000000000..b13f56c7d6e453
--- /dev/null
+++ b/plugin-transpiler/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "target": "ES2020", // Target a recent version of ECMAScript.
+        "module": "CommonJS", // Use CommonJS module system for Node.js.
+        "outDir": "./dist", // Output directory for the compiled JavaScript files.
+        "strict": true, // Enable all strict type-checking options.
+        "esModuleInterop": true, // Allows default imports from modules with no default export.
+        "skipLibCheck": true, // Skip type checking of declaration files.
+        "forceConsistentCasingInFileNames": true, // Disallow inconsistently-cased references to the same file.
+        "resolveJsonModule": true, // Allow importing .json files as modules.
+        "moduleResolution": "node" // Use Node.js-style module resolution.
+    },
+    "include": [
+        "src/**/*.ts", // Include all TypeScript files in the 'src' directory and its subdirectories.
+        "src/**/*.tsx" // Include all TSX files, if you have any.
+    ],
+    "exclude": [
+        "node_modules" // Exclude node_modules from the compilation.
+    ]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f80eb20b9d2c67..390209826d3a9e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: true
@@ -36,11 +36,11 @@ dependencies:
     specifier: 4.4.6
     version: 4.4.6(monaco-editor@0.39.0)(react-dom@18.2.0)(react@18.2.0)
   '@posthog/icons':
-    specifier: 0.1.25
-    version: 0.1.25(react-dom@18.2.0)(react@18.2.0)
+    specifier: ^0.1.31
+    version: 0.1.33(react-dom@18.2.0)(react@18.2.0)
   '@posthog/plugin-scaffold':
-    specifier: ^1.4.3
-    version: 1.4.3
+    specifier: ^1.4.4
+    version: 1.4.4
   '@react-hook/size':
     specifier: ^2.1.2
     version: 2.1.2(react@18.2.0)
@@ -216,8 +216,8 @@ dependencies:
     specifier: ^2.11.0
     version: 2.11.0
   posthog-js:
-    specifier: 1.88.1
-    version: 1.88.1
+    specifier: 1.88.4
+    version: 1.88.4
   posthog-js-lite:
     specifier: 2.0.0-alpha5
     version: 2.0.0-alpha5
@@ -602,7 +602,7 @@ devDependencies:
     version: 7.0.1(monaco-editor@0.39.0)(webpack@5.88.2)
   msw:
     specifier: ^0.49.0
-    version: 0.49.3(typescript@4.9.5)
+    version: 0.49.0(typescript@4.9.5)
   path-browserify:
     specifier: ^1.0.1
     version: 1.0.1
@@ -635,7 +635,7 @@ devDependencies:
     version: 7.5.1
   storybook-addon-pseudo-states:
     specifier: 2.1.2
-    version: 2.1.2(@storybook/components@7.5.1)(@storybook/core-events@7.5.1)(@storybook/manager-api@7.5.2)(@storybook/preview-api@7.5.2)(@storybook/theming@7.5.1)(react-dom@18.2.0)(react@18.2.0)
+    version: 2.1.2(@storybook/components@7.5.1)(@storybook/core-events@7.5.1)(@storybook/manager-api@7.5.3)(@storybook/preview-api@7.5.3)(@storybook/theming@7.5.1)(react-dom@18.2.0)(react@18.2.0)
   style-loader:
     specifier: ^2.0.0
     version: 2.0.0(webpack@5.88.2)
@@ -991,6 +991,14 @@ packages:
     dependencies:
       '@babel/types': 7.23.0
 
+  /@babel/parser@7.23.3:
+    resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.23.3
+    dev: true
+
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.10):
     resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
     engines: {node: '>=6.9.0'}
@@ -2105,6 +2113,15 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.23.3:
+    resolution: {integrity: sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
+      to-fast-properties: 2.0.0
+    dev: true
+
   /@base2/pretty-print-object@1.0.1:
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
     dev: true
@@ -3237,16 +3254,16 @@ packages:
       set-cookie-parser: 2.5.1
     dev: true
 
-  /@mswjs/interceptors@0.17.6:
-    resolution: {integrity: sha512-201pBIWehTURb6q8Gheu4Zhvd3Ox1U4BJq5KiOQsYzkWyfiOG4pwcz5hPZIEryztgrf8/sdwABpvY757xMmfrQ==}
+  /@mswjs/interceptors@0.17.10:
+    resolution: {integrity: sha512-N8x7eSLGcmUFNWZRxT1vsHvypzIRgQYdG0rJey/rZCy6zT/30qDt8Joj7FxzGNLSwXbeZqJOMqDurp7ra4hgbw==}
     engines: {node: '>=14'}
     dependencies:
       '@open-draft/until': 1.0.3
       '@types/debug': 4.1.7
       '@xmldom/xmldom': 0.8.6
       debug: 4.3.4(supports-color@8.1.1)
-      headers-polyfill: 3.1.2
-      outvariant: 1.3.0
+      headers-polyfill: 3.2.5
+      outvariant: 1.4.0
       strict-event-emitter: 0.2.8
       web-encoding: 1.1.5
     transitivePeerDependencies:
@@ -3357,8 +3374,8 @@ packages:
     resolution: {integrity: sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==}
     dev: false
 
-  /@posthog/icons@0.1.25(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ISDPLehrNPx5b1HYlTJZsS2kK7wC1tRmt2dobwfPeH1UuxC+aUoqspFv+PvVsYgrmz+iYRp8oPrg+4lS9PmRnQ==}
+  /@posthog/icons@0.1.33(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-VjQXuy48kcBXhgNN7vAuvEiM/fQULTIzWs4ntGZ6PqAbL95GGsGJAcDWZ+aoHLPOGqhfE+gM7vpWm8MUNduq1A==}
     peerDependencies:
       react: '>=16.14.0'
       react-dom: '>=16.14.0'
@@ -3367,8 +3384,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@posthog/plugin-scaffold@1.4.3:
-    resolution: {integrity: sha512-fzWJ8lvAUlbTcffaFVcfhV9QiAVGL4j1OnXDc+p+bqWMP/yTwvljXDiwV96w3mti9r40E1NBz/yQRykyB78+EA==}
+  /@posthog/plugin-scaffold@1.4.4:
+    resolution: {integrity: sha512-3z1ENm1Ys5lEQil0H7TVOqHvD24+ydiZFk5hggpbHRx1iOxAK+Eu5qFyAROwPUcCo7NOYjmH2xL1C4B1vaHilg==}
     dependencies:
       '@maxmind/geoip2-node': 3.5.0
     dev: false
@@ -4593,11 +4610,11 @@ packages:
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/channels@7.5.2:
-    resolution: {integrity: sha512-3SgqWq9NS0XX1QxK3riuaOLrReHWwVhI63u6q1ryDD3SttpmAezZETibOAtzDuk2FKgsyHTmAlmcGQf4ZxhOJA==}
+  /@storybook/channels@7.5.3:
+    resolution: {integrity: sha512-dhWuV2o2lmxH0RKuzND8jxYzvSQTSmpE13P0IT/k8+I1up/rSNYOBQJT6SalakcNWXFAMXguo/8E7ApmnKKcEw==}
     dependencies:
-      '@storybook/client-logger': 7.5.2
-      '@storybook/core-events': 7.5.2
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
       '@storybook/global': 5.0.0
       qs: 6.11.2
       telejson: 7.2.0
@@ -4662,8 +4679,8 @@ packages:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/client-logger@7.5.2:
-    resolution: {integrity: sha512-7YgLItlmiYDzWYexTaRNuHhtFarh9krsI+8l7Yjn9ryoHSTJUcTWx+yPJm1II+PQR8v/x5UgsxzultjgEurfRQ==}
+  /@storybook/client-logger@7.5.3:
+    resolution: {integrity: sha512-vUFYALypjix5FoJ5M/XUP6KmyTnQJNW1poHdW7WXUVSg+lBM6E5eAtjTm0hdxNNDH8KSrdy24nCLra5h0X0BWg==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
@@ -4756,8 +4773,8 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/core-events@7.5.2:
-    resolution: {integrity: sha512-DV8bFEFVKDEvaH87KYPXDE0YEV+Y9yjFv2xxmC9pF8l+MWCtVW72RBLhB+gU5NM1bkHrRDNb0lOJfVGKlhxOog==}
+  /@storybook/core-events@7.5.3:
+    resolution: {integrity: sha512-DFOpyQ22JD5C1oeOFzL8wlqSWZzrqgDfDbUGP8xdO4wJu+FVTxnnWN6ZYLdTPB1u27DOhd7TzjQMfLDHLu7kbQ==}
     dependencies:
       ts-dedent: 2.2.0
     dev: true
@@ -4910,20 +4927,20 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/manager-api@7.5.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-WX8GjBkITRQzhQ08WEAVjdDW8QqqIQhWOpFzXUYCxCNzt1eSALI31QQ+M1/MYymw+TOkotC/SMcn/puIAm4rdA==}
+  /@storybook/manager-api@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-d8mVLr/5BEG4bAS2ZeqYTy/aX4jPEpZHdcLaWoB4mAM+PAL9wcWsirUyApKtDVYLITJf/hd8bb2Dm2ok6E45gA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/channels': 7.5.2
-      '@storybook/client-logger': 7.5.2
-      '@storybook/core-events': 7.5.2
+      '@storybook/channels': 7.5.3
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
       '@storybook/csf': 0.1.1
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.5.2(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/theming': 7.5.2(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.5.2
+      '@storybook/router': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.5.3
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -5019,16 +5036,16 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview-api@7.5.2:
-    resolution: {integrity: sha512-rpmHR/09UBSnorDBTcE7JgHUQjZLO146NCI+vbI7Pqfb4QX/8lhwkFr4cuHRAR16mv6DAJbDVoPETO0Z/CH9aw==}
+  /@storybook/preview-api@7.5.3:
+    resolution: {integrity: sha512-LNmEf7oBRnZ1wG3bQ+P+TO29+NN5pSDJiAA6FabZBrtIVm+psc2lxBCDQvFYyAFzQSlt60toGKNW8+RfFNdR5Q==}
     dependencies:
-      '@storybook/channels': 7.5.2
-      '@storybook/client-logger': 7.5.2
-      '@storybook/core-events': 7.5.2
+      '@storybook/channels': 7.5.3
+      '@storybook/client-logger': 7.5.3
+      '@storybook/core-events': 7.5.3
       '@storybook/csf': 0.1.1
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.5.2
-      '@types/qs': 6.9.9
+      '@storybook/types': 7.5.3
+      '@types/qs': 6.9.10
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -5054,7 +5071,7 @@ packages:
       flat-cache: 3.0.4
       micromatch: 4.0.5
       react-docgen-typescript: 2.2.2(typescript@4.9.5)
-      tslib: 2.4.1
+      tslib: 2.6.2
       typescript: 4.9.5
       webpack: 5.88.2(@swc/core@1.3.93)(esbuild@0.14.54)(webpack-cli@5.1.4)
     transitivePeerDependencies:
@@ -5162,13 +5179,13 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/router@7.5.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-jlh48TVUlqvGkU8MnkVp9SrCHomWGtQGx1WMK94NMyOPVPTLWzM6LjIybgmHz0MTe4lpzmbiIOfSlU3pPX054w==}
+  /@storybook/router@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-/iNYCFore7R5n6eFHbBYoB0P2/sybTVpA+uXTNUd3UEt7Ro6CEslTaFTEiH2RVQwOkceBp/NpyWon74xZuXhMg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 7.5.2
+      '@storybook/client-logger': 7.5.3
       memoizerific: 1.11.3
       qs: 6.11.2
       react: 18.2.0
@@ -5261,14 +5278,14 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/theming@7.5.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-DZBTcYErSYvmTYsGz7lKtiIcBe8flBw5Ojp52r3O4GcRYG4AbuUwwVvehz+O1cWaS+UW3HavrcgapERH7ZHd1A==}
+  /@storybook/theming@7.5.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Cjmthe1MAk0z4RKCZ7m72gAD8YD0zTAH97z5ryM1Qv84QXjiCQ143fGOmYz1xEQdNFpOThPcwW6FEccLHTkVcg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
-      '@storybook/client-logger': 7.5.2
+      '@storybook/client-logger': 7.5.3
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       react: 18.2.0
@@ -5284,12 +5301,12 @@ packages:
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/types@7.5.2:
-    resolution: {integrity: sha512-RDKHo6WUES+4nt7uZMfankjxdpYX2EI2GpJ2n2RPcnhzmb/ub1huNTjbzDEYMqY24SppljZeIN57m3Ar6L6f9A==}
+  /@storybook/types@7.5.3:
+    resolution: {integrity: sha512-iu5W0Kdd6nysN5CPkY4GRl+0BpxRTdSfBIJak7mb6xCIHSB5t1tw4BOuqMQ5EgpikRY3MWJ4gY647QkWBX3MNQ==}
     dependencies:
-      '@storybook/channels': 7.5.2
-      '@types/babel__core': 7.20.3
-      '@types/express': 4.17.20
+      '@storybook/channels': 7.5.3
+      '@types/babel__core': 7.20.4
+      '@types/express': 4.17.21
       file-system-cache: 2.3.0
     dev: true
 
@@ -5833,12 +5850,28 @@ packages:
       '@types/babel__traverse': 7.20.3
     dev: true
 
+  /@types/babel__core@7.20.4:
+    resolution: {integrity: sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==}
+    dependencies:
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.3
+      '@types/babel__generator': 7.6.7
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.20.4
+    dev: true
+
   /@types/babel__generator@7.6.6:
     resolution: {integrity: sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==}
     dependencies:
       '@babel/types': 7.23.0
     dev: true
 
+  /@types/babel__generator@7.6.7:
+    resolution: {integrity: sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==}
+    dependencies:
+      '@babel/types': 7.23.3
+    dev: true
+
   /@types/babel__template@7.4.3:
     resolution: {integrity: sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==}
     dependencies:
@@ -5846,12 +5879,25 @@ packages:
       '@babel/types': 7.23.0
     dev: true
 
+  /@types/babel__template@7.4.4:
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+    dependencies:
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.3
+    dev: true
+
   /@types/babel__traverse@7.20.3:
     resolution: {integrity: sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==}
     dependencies:
       '@babel/types': 7.23.0
     dev: true
 
+  /@types/babel__traverse@7.20.4:
+    resolution: {integrity: sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==}
+    dependencies:
+      '@babel/types': 7.23.3
+    dev: true
+
   /@types/body-parser@1.19.4:
     resolution: {integrity: sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==}
     dependencies:
@@ -5859,6 +5905,13 @@ packages:
       '@types/node': 18.18.4
     dev: true
 
+  /@types/body-parser@1.19.5:
+    resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
+    dependencies:
+      '@types/connect': 3.4.38
+      '@types/node': 18.18.4
+    dev: true
+
   /@types/chart.js@2.9.37:
     resolution: {integrity: sha512-9bosRfHhkXxKYfrw94EmyDQcdjMaQPkU1fH2tDxu8DWXxf1mjzWQAV4laJF51ZbC2ycYwNDvIm1rGez8Bug0vg==}
     dependencies:
@@ -5881,6 +5934,12 @@ packages:
       '@types/node': 18.18.4
     dev: true
 
+  /@types/connect@3.4.38:
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+    dependencies:
+      '@types/node': 18.18.4
+    dev: true
+
   /@types/cookie@0.4.1:
     resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
     dev: true
@@ -6153,6 +6212,15 @@ packages:
       '@types/send': 0.17.3
     dev: true
 
+  /@types/express-serve-static-core@4.17.41:
+    resolution: {integrity: sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==}
+    dependencies:
+      '@types/node': 18.18.4
+      '@types/qs': 6.9.10
+      '@types/range-parser': 1.2.7
+      '@types/send': 0.17.4
+    dev: true
+
   /@types/express@4.17.20:
     resolution: {integrity: sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==}
     dependencies:
@@ -6162,6 +6230,15 @@ packages:
       '@types/serve-static': 1.15.4
     dev: true
 
+  /@types/express@4.17.21:
+    resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+    dependencies:
+      '@types/body-parser': 1.19.5
+      '@types/express-serve-static-core': 4.17.41
+      '@types/qs': 6.9.10
+      '@types/serve-static': 1.15.5
+    dev: true
+
   /@types/find-cache-dir@3.2.1:
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
     dev: true
@@ -6193,6 +6270,10 @@ packages:
     resolution: {integrity: sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==}
     dev: true
 
+  /@types/http-errors@2.0.4:
+    resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
+    dev: true
+
   /@types/image-blob-reduce@4.1.1:
     resolution: {integrity: sha512-Oe2EPjW+iZSsXccxZPebqHqXAUaOLir3eQVqPx0ryXeJZdCZx+gYvWBZtqYEcluP6f3bll1m06ahT26bX0+LOg==}
     dependencies:
@@ -6288,10 +6369,18 @@ packages:
     resolution: {integrity: sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==}
     dev: true
 
+  /@types/mime@1.3.5:
+    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
+    dev: true
+
   /@types/mime@3.0.3:
     resolution: {integrity: sha512-i8MBln35l856k5iOhKk2XJ4SeAWg75mLIpZB4v6imOagKL6twsukBZGDMNhdOVk7yRFTMPpfILocMos59Q1otQ==}
     dev: true
 
+  /@types/mime@3.0.4:
+    resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}
+    dev: true
+
   /@types/ms@0.7.31:
     resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
     dev: true
@@ -6368,6 +6457,10 @@ packages:
     resolution: {integrity: sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==}
     dev: true
 
+  /@types/qs@6.9.10:
+    resolution: {integrity: sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw==}
+    dev: true
+
   /@types/qs@6.9.9:
     resolution: {integrity: sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==}
     dev: true
@@ -6380,6 +6473,10 @@ packages:
     resolution: {integrity: sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==}
     dev: true
 
+  /@types/range-parser@1.2.7:
+    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
+    dev: true
+
   /@types/react-dom@18.2.14:
     resolution: {integrity: sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==}
     dependencies:
@@ -6444,6 +6541,13 @@ packages:
       '@types/node': 18.18.4
     dev: true
 
+  /@types/send@0.17.4:
+    resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
+    dependencies:
+      '@types/mime': 1.3.5
+      '@types/node': 18.18.4
+    dev: true
+
   /@types/serve-static@1.15.4:
     resolution: {integrity: sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==}
     dependencies:
@@ -6452,6 +6556,14 @@ packages:
       '@types/node': 18.18.4
     dev: true
 
+  /@types/serve-static@1.15.5:
+    resolution: {integrity: sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==}
+    dependencies:
+      '@types/http-errors': 2.0.4
+      '@types/mime': 3.0.4
+      '@types/node': 18.18.4
+    dev: true
+
   /@types/set-cookie-parser@2.4.2:
     resolution: {integrity: sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==}
     dependencies:
@@ -6519,8 +6631,8 @@ packages:
       '@types/yargs-parser': 21.0.0
     dev: true
 
-  /@types/yauzl@2.10.2:
-    resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==}
+  /@types/yauzl@2.10.3:
+    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
     requiresBuild: true
     dependencies:
       '@types/node': 18.18.4
@@ -10529,7 +10641,7 @@ packages:
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
-      '@types/yauzl': 2.10.2
+      '@types/yauzl': 2.10.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11277,8 +11389,8 @@ packages:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
     dev: true
 
-  /graphql@16.6.0:
-    resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==}
+  /graphql@16.8.1:
+    resolution: {integrity: sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==}
     engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
     dev: true
 
@@ -11374,8 +11486,8 @@ packages:
     hasBin: true
     dev: true
 
-  /headers-polyfill@3.1.2:
-    resolution: {integrity: sha512-tWCK4biJ6hcLqTviLXVR9DTRfYGQMXEIUj3gwJ2rZ5wO/at3XtkI4g8mCvFdUF9l1KMBNCfmNAdnahm1cgavQA==}
+  /headers-polyfill@3.2.5:
+    resolution: {integrity: sha512-tUCGvt191vNSQgttSyJoibR+VO+I6+iCHIUdhzEMJKE+EAL8BwCN7fUOZlY4ofOelNHsK+gEjxB/B+9N3EWtdA==}
     dev: true
 
   /helpertypes@0.0.19:
@@ -11998,8 +12110,8 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-node-process@1.0.1:
-    resolution: {integrity: sha512-5IcdXuf++TTNt3oGl9EBdkvndXA8gmc4bz/Y+mdEpWh3Mcn/+kOw6hI7LD5CocqJWMzeb0I0ClndRVNdEPuJXQ==}
+  /is-node-process@1.2.0:
+    resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
     dev: true
 
   /is-number-object@1.0.7:
@@ -14268,8 +14380,8 @@ packages:
   /ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  /msw@0.49.3(typescript@4.9.5):
-    resolution: {integrity: sha512-kRCbDNbNnRq5LC1H/NUceZlrPAvSrMH6Or0mirIuH69NY84xwDruPn/hkXTovIK1KwDwbk+ZdoSyJlpiekLxEA==}
+  /msw@0.49.0(typescript@4.9.5):
+    resolution: {integrity: sha512-xX5RMSMjN58j8G/V26Uaf5LP464VltuWyd66TQimLueVYfG47RKydGsd4JW165Jb/gjoaQxh5Tdvv31wdZAOlA==}
     engines: {node: '>=14'}
     hasBin: true
     requiresBuild: true
@@ -14280,22 +14392,22 @@ packages:
         optional: true
     dependencies:
       '@mswjs/cookies': 0.2.2
-      '@mswjs/interceptors': 0.17.6
+      '@mswjs/interceptors': 0.17.10
       '@open-draft/until': 1.0.3
       '@types/cookie': 0.4.1
       '@types/js-levenshtein': 1.1.1
       chalk: 4.1.1
       chokidar: 3.5.3
       cookie: 0.4.2
-      graphql: 16.6.0
-      headers-polyfill: 3.1.2
+      graphql: 16.8.1
+      headers-polyfill: 3.2.5
       inquirer: 8.2.5
-      is-node-process: 1.0.1
+      is-node-process: 1.2.0
       js-levenshtein: 1.1.6
       node-fetch: 2.6.7
-      outvariant: 1.3.0
+      outvariant: 1.4.0
       path-to-regexp: 6.2.1
-      strict-event-emitter: 0.4.6
+      strict-event-emitter: 0.2.8
       type-fest: 2.19.0
       typescript: 4.9.5
       yargs: 17.6.2
@@ -14689,8 +14801,8 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /outvariant@1.3.0:
-    resolution: {integrity: sha512-yeWM9k6UPfG/nzxdaPlJkB2p08hCg4xP6Lx99F+vP8YF7xyZVfTmJjrrNalkmzudD4WFvNLVudQikqUmF8zhVQ==}
+  /outvariant@1.4.0:
+    resolution: {integrity: sha512-AlWY719RF02ujitly7Kk/0QlV+pXGFDHrHf9O2OKqyqgBieaPOIeuSkL8sRK6j2WK+/ZAURq2kZsY0d8JapUiw==}
     dev: true
 
   /p-limit@2.3.0:
@@ -15432,8 +15544,8 @@ packages:
     resolution: {integrity: sha512-tlkBdypJuvK/s00n4EiQjwYVfuuZv6vt8BF3g1ooIQa2Gz9Vz80p8q3qsPLZ0V5ErGRy6i3Q4fWC9TDzR7GNRQ==}
     dev: false
 
-  /posthog-js@1.88.1:
-    resolution: {integrity: sha512-+8kFFU5KIcFSm8zB3tX8l0GSPyq/OtMtdrS9dYpMJk6nsEwXvOjkwFEpSrYzL5eGEpTPdbM65M52HvMqqsjpXw==}
+  /posthog-js@1.88.4:
+    resolution: {integrity: sha512-ZKgC0q22Bv0WGsi/BJcamDIoBR3DPpF26kCq0eFxtV3gKDMpGIlhlODQCo28bSENziGVO4LSeGrUvo/6OsQ7xA==}
     dependencies:
       fflate: 0.4.8
     dev: false
@@ -16582,7 +16694,7 @@ packages:
       react: 18.2.0
       react-remove-scroll-bar: 2.3.4(@types/react@17.0.52)(react@18.2.0)
       react-style-singleton: 2.2.1(@types/react@17.0.52)(react@18.2.0)
-      tslib: 2.4.1
+      tslib: 2.6.2
       use-callback-ref: 1.3.0(@types/react@17.0.52)(react@18.2.0)
       use-sidecar: 1.1.2(@types/react@17.0.52)(react@18.2.0)
     dev: true
@@ -17599,7 +17711,7 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook-addon-pseudo-states@2.1.2(@storybook/components@7.5.1)(@storybook/core-events@7.5.1)(@storybook/manager-api@7.5.2)(@storybook/preview-api@7.5.2)(@storybook/theming@7.5.1)(react-dom@18.2.0)(react@18.2.0):
+  /storybook-addon-pseudo-states@2.1.2(@storybook/components@7.5.1)(@storybook/core-events@7.5.1)(@storybook/manager-api@7.5.3)(@storybook/preview-api@7.5.3)(@storybook/theming@7.5.1)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-AHv6q1JiQEUnMyZE3729iV6cNmBW7bueeytc4Lga4+8W1En8YNea5VjqAdrDNJhXVU0QEEIGtxkD3EoC9aVWLw==}
     peerDependencies:
       '@storybook/components': ^7.4.6
@@ -17617,8 +17729,8 @@ packages:
     dependencies:
       '@storybook/components': 7.5.1(@types/react-dom@18.2.14)(@types/react@17.0.52)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events': 7.5.1
-      '@storybook/manager-api': 7.5.2(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 7.5.2
+      '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.5.3
       '@storybook/theming': 7.5.1(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -17646,10 +17758,6 @@ packages:
       events: 3.3.0
     dev: true
 
-  /strict-event-emitter@0.4.6:
-    resolution: {integrity: sha512-12KWeb+wixJohmnwNFerbyiBrAlq5qJLwIt38etRtKtmmHyDSoGlIqFE9wx+4IwG0aDjI7GV8tc8ZccjWZZtTg==}
-    dev: true
-
   /string-argv@0.3.1:
     resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
     engines: {node: '>=0.6.19'}
diff --git a/posthog/api/capture.py b/posthog/api/capture.py
index 98c52d1781380e..a7d72f9ca1f3ef 100644
--- a/posthog/api/capture.py
+++ b/posthog/api/capture.py
@@ -155,7 +155,9 @@ def _kafka_topic(event_name: str, data: Dict) -> str:
             return settings.KAFKA_EVENTS_PLUGIN_INGESTION_TOPIC
 
 
-def log_event(data: Dict, event_name: str, partition_key: Optional[str]):
+def log_event(
+    data: Dict, event_name: str, partition_key: Optional[str], headers: Optional[List] = None
+) -> FutureRecordMetadata:
     kafka_topic = _kafka_topic(event_name, data)
 
     logger.debug("logging_event", event_name=event_name, kafka_topic=kafka_topic)
@@ -167,7 +169,7 @@ def log_event(data: Dict, event_name: str, partition_key: Optional[str]):
         else:
             producer = KafkaProducer()
 
-        future = producer.produce(topic=kafka_topic, data=data, key=partition_key)
+        future = producer.produce(topic=kafka_topic, data=data, key=partition_key, headers=headers)
         statsd.incr("posthog_cloud_plugin_server_ingestion")
         return future
     except Exception as e:
@@ -558,7 +560,10 @@ def capture_internal(event, distinct_id, ip, site_url, now, sent_at, event_uuid=
 
     if event["event"] in SESSION_RECORDING_EVENT_NAMES:
         kafka_partition_key = event["properties"]["$session_id"]
-        return log_event(parsed_event, event["event"], partition_key=kafka_partition_key)
+        headers = [
+            ("token", token),
+        ]
+        return log_event(parsed_event, event["event"], partition_key=kafka_partition_key, headers=headers)
 
     candidate_partition_key = f"{token}:{distinct_id}"
 
diff --git a/posthog/api/feature_flag.py b/posthog/api/feature_flag.py
index 1c17722525b98d..5d1654259eb36a 100644
--- a/posthog/api/feature_flag.py
+++ b/posthog/api/feature_flag.py
@@ -1,7 +1,7 @@
 import json
 from typing import Any, Dict, List, Optional, cast
 
-from django.db.models import QuerySet, Q
+from django.db.models import QuerySet, Q, deletion
 from django.conf import settings
 from rest_framework import (
     authentication,
@@ -39,7 +39,6 @@
 from posthog.models.cohort import Cohort
 from posthog.models.cohort.util import get_dependent_cohorts
 from posthog.models.feature_flag import (
-    FeatureFlagMatcher,
     FeatureFlagDashboards,
     can_user_edit_feature_flag,
     get_all_feature_flags,
@@ -257,7 +256,14 @@ def create(self, validated_data: Dict, *args: Any, **kwargs: Any) -> FeatureFlag
                 "Invalid variant definitions: Variant rollout percentages must sum to 100."
             )
 
-        FeatureFlag.objects.filter(key=validated_data["key"], team_id=self.context["team_id"], deleted=True).delete()
+        try:
+            FeatureFlag.objects.filter(
+                key=validated_data["key"], team_id=self.context["team_id"], deleted=True
+            ).delete()
+        except deletion.RestrictedError:
+            raise exceptions.ValidationError(
+                "Feature flag with this key already exists and is used in an experiment. Please delete the experiment before deleting the flag."
+            )
         instance: FeatureFlag = super().create(validated_data)
 
         self._attempt_set_tags(tags, instance)
@@ -460,7 +466,7 @@ def my_flags(self, request: request.Request, **kwargs):
             raise exceptions.NotAuthenticated()
 
         feature_flags = (
-            FeatureFlag.objects.filter(team=self.team, active=True, deleted=False)
+            FeatureFlag.objects.filter(team=self.team, deleted=False)
             .prefetch_related("experiment_set")
             .prefetch_related("features")
             .prefetch_related("analytics_dashboards")
@@ -476,7 +482,7 @@ def my_flags(self, request: request.Request, **kwargs):
         if not feature_flag_list:
             return Response(flags)
 
-        matches, _, _, _ = FeatureFlagMatcher(feature_flag_list, request.user.distinct_id, groups).get_matches()
+        matches, _, _, _ = get_all_feature_flags(self.team_id, request.user.distinct_id, groups)
         for feature_flag in feature_flags:
             flags.append(
                 {
diff --git a/posthog/api/organization_feature_flag.py b/posthog/api/organization_feature_flag.py
index a1d7533a7eb28a..17b3e78a3b0cfd 100644
--- a/posthog/api/organization_feature_flag.py
+++ b/posthog/api/organization_feature_flag.py
@@ -1,11 +1,15 @@
 from posthog.api.routing import StructuredViewSetMixin
-from posthog.models import FeatureFlag
+from posthog.api.feature_flag import FeatureFlagSerializer
+from posthog.models import FeatureFlag, Team
 from posthog.permissions import OrganizationMemberPermissions
+from django.core.exceptions import ObjectDoesNotExist
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.decorators import action
 from rest_framework import (
     mixins,
     viewsets,
+    status,
 )
 
 
@@ -26,7 +30,92 @@ def retrieve(self, request, *args, **kwargs):
 
         teams = self.organization.teams.all()
 
-        flags = FeatureFlag.objects.filter(key=feature_flag_key, team_id__in=[team.id for team in teams])
-        flags_data = [{"team_id": flag.team_id, "active": flag.active} for flag in flags]
+        flags = FeatureFlag.objects.filter(
+            key=feature_flag_key,
+            team_id__in=[team.id for team in teams],
+            deleted=False,
+        )
+        flags_data = [
+            {
+                "flag_id": flag.id,
+                "team_id": flag.team_id,
+                "active": flag.active,
+            }
+            for flag in flags
+        ]
 
         return Response(flags_data)
+
+    @action(detail=False, methods=["post"], url_path="copy_flags")
+    def copy_flags(self, request, *args, **kwargs):
+        body = request.data
+        feature_flag_key = body.get("feature_flag_key")
+        from_project = body.get("from_project")
+        target_project_ids = body.get("target_project_ids")
+
+        if not feature_flag_key or not from_project or not target_project_ids:
+            return Response({"error": "Missing required fields"}, status=status.HTTP_400_BAD_REQUEST)
+
+        try:
+            flag_to_copy = FeatureFlag.objects.get(key=feature_flag_key, team_id=from_project)
+        except FeatureFlag.DoesNotExist:
+            return Response({"error": "Feature flag to copy does not exist."}, status=status.HTTP_400_BAD_REQUEST)
+
+        successful_projects = []
+        failed_projects = []
+
+        for target_project_id in target_project_ids:
+            # Target project does not exist
+            try:
+                Team.objects.get(id=target_project_id)
+            except ObjectDoesNotExist:
+                failed_projects.append(
+                    {
+                        "project_id": target_project_id,
+                        "errors": "Target project does not exist.",
+                    }
+                )
+                continue
+
+            context = {
+                "request": request,
+                "team_id": target_project_id,
+            }
+            flag_data = {
+                "key": flag_to_copy.key,
+                "name": flag_to_copy.name,
+                "filters": flag_to_copy.filters,
+                "active": flag_to_copy.active,
+                "rollout_percentage": flag_to_copy.rollout_percentage,
+                "ensure_experience_continuity": flag_to_copy.ensure_experience_continuity,
+                "deleted": False,
+            }
+
+            existing_flag = FeatureFlag.objects.filter(
+                key=feature_flag_key, team_id=target_project_id, deleted=False
+            ).first()
+            # Update existing flag
+            if existing_flag:
+                feature_flag_serializer = FeatureFlagSerializer(
+                    existing_flag, data=flag_data, partial=True, context=context
+                )
+            # Create new flag
+            else:
+                feature_flag_serializer = FeatureFlagSerializer(data=flag_data, context=context)
+
+            try:
+                feature_flag_serializer.is_valid(raise_exception=True)
+                feature_flag_serializer.save(team_id=target_project_id)
+                successful_projects.append(feature_flag_serializer.data)
+            except Exception as e:
+                failed_projects.append(
+                    {
+                        "project_id": target_project_id,
+                        "errors": str(e) if not feature_flag_serializer.errors else feature_flag_serializer.errors,
+                    }
+                )
+
+        return Response(
+            {"success": successful_projects, "failed": failed_projects},
+            status=status.HTTP_200_OK,
+        )
diff --git a/posthog/api/plugin.py b/posthog/api/plugin.py
index b39c18a67346aa..9311b756f44f32 100644
--- a/posthog/api/plugin.py
+++ b/posthog/api/plugin.py
@@ -1,6 +1,8 @@
 import json
+import os
 import re
-from typing import Any, Dict, List, Optional, Set, cast
+import subprocess
+from typing import Any, Dict, List, Optional, Set, cast, Literal
 
 import requests
 from dateutil.relativedelta import relativedelta
@@ -180,6 +182,24 @@ def _fix_formdata_config_json(request: request.Request, validated_data: dict):
         validated_data["config"] = json.loads(request.POST["config"])
 
 
+def transpile(input_string: str, type: Literal["site", "frontend"] = "site") -> Optional[str]:
+    from posthog.settings.base_variables import BASE_DIR
+
+    transpiler_path = os.path.join(BASE_DIR, "plugin-transpiler/dist/index.js")
+    if type not in ["site", "frontend"]:
+        raise Exception('Invalid type. Must be "site" or "frontend".')
+
+    process = subprocess.Popen(
+        ["node", transpiler_path, "--type", type], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+    stdout, stderr = process.communicate(input=input_string.encode())
+
+    if process.returncode != 0:
+        error = stderr.decode()
+        raise Exception(error)
+    return stdout.decode()
+
+
 class PlainRenderer(renderers.BaseRenderer):
     format = "txt"
 
@@ -355,25 +375,47 @@ def update_source(self, request: request.Request, **kwargs):
         plugin = self.get_plugin_with_permissions(reason="source editing")
         sources: Dict[str, PluginSourceFile] = {}
         performed_changes = False
-        for source in PluginSourceFile.objects.filter(plugin=plugin):
-            sources[source.filename] = source
-        for key, value in request.data.items():
+        for plugin_source_file in PluginSourceFile.objects.filter(plugin=plugin):
+            sources[plugin_source_file.filename] = plugin_source_file
+        for key, source in request.data.items():
+            transpiled = None
+            error = None
+            status = None
+            try:
+                if key == "site.ts":
+                    transpiled = transpile(source, type="site")
+                    status = PluginSourceFile.Status.TRANSPILED
+                elif key == "frontend.tsx":
+                    transpiled = transpile(source, type="frontend")
+                    status = PluginSourceFile.Status.TRANSPILED
+            except Exception as e:
+                error = str(e)
+                status = PluginSourceFile.Status.ERROR
+
             if key not in sources:
                 performed_changes = True
                 sources[key], created = PluginSourceFile.objects.update_or_create(
-                    plugin=plugin, filename=key, defaults={"source": value}
+                    plugin=plugin,
+                    filename=key,
+                    defaults={
+                        "source": source,
+                        "transpiled": transpiled,
+                        "status": status,
+                        "error": error,
+                    },
                 )
-            elif sources[key].source != value:
+            elif sources[key].source != source or sources[key].transpiled != transpiled or sources[key].error != error:
                 performed_changes = True
-                if value is None:
+                if source is None:
                     sources[key].delete()
                     del sources[key]
                 else:
-                    sources[key].source = value
-                    sources[key].status = None
-                    sources[key].transpiled = None
-                    sources[key].error = None
+                    sources[key].source = source
+                    sources[key].transpiled = transpiled
+                    sources[key].status = status
+                    sources[key].error = error
                     sources[key].save()
+
         response: Dict[str, str] = {}
         for _, source in sources.items():
             response[source.filename] = source.source
@@ -503,6 +545,10 @@ class Meta:
             "plugin_info",
             "delivery_rate_24h",
             "created_at",
+            "updated_at",
+            "name",
+            "description",
+            "deleted",
         ]
         read_only_fields = [
             "id",
diff --git a/posthog/api/query.py b/posthog/api/query.py
index 103cfd1b67eeb9..224aedce404646 100644
--- a/posthog/api/query.py
+++ b/posthog/api/query.py
@@ -4,7 +4,7 @@
 
 from django.http import HttpResponse, JsonResponse
 from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter
+from drf_spectacular.utils import OpenApiParameter, OpenApiResponse
 from pydantic import BaseModel
 from rest_framework import viewsets
 from rest_framework.decorators import action
@@ -105,14 +105,23 @@ def get_throttles(self):
             OpenApiParameter(
                 "query",
                 OpenApiTypes.STR,
-                description="Query node JSON string",
+                description=(
+                    "Submit a JSON string representing a query for PostHog data analysis,"
+                    " for example a HogQL query.\n\nExample payload:\n"
+                    '```\n{"query": {"kind": "HogQLQuery", "query": "select * from events limit 100"}}\n```'
+                    "\n\nFor more details on HogQL queries"
+                    ", see the [PostHog HogQL documentation](/docs/hogql#api-access). "
+                ),
             ),
             OpenApiParameter(
                 "client_query_id",
                 OpenApiTypes.STR,
                 description="Client provided query ID. Can be used to cancel queries.",
             ),
-        ]
+        ],
+        responses={
+            200: OpenApiResponse(description="Query results"),
+        },
     )
     def list(self, request: Request, **kw) -> HttpResponse:
         self._tag_client_query_id(request.GET.get("client_query_id"))
diff --git a/posthog/api/site_app.py b/posthog/api/site_app.py
index 5333980206a70a..6704ff0c7f5348 100644
--- a/posthog/api/site_app.py
+++ b/posthog/api/site_app.py
@@ -34,5 +34,5 @@ def get_site_app(request: HttpRequest, id: int, token: str, hash: str) -> HttpRe
             "Unable to serve site app source code.",
             code="missing_site_app_source",
             type="server_error",
-            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+            status_code=status.HTTP_404_NOT_FOUND,
         )
diff --git a/posthog/api/survey.py b/posthog/api/survey.py
index 826d7ff043eff6..a2b3e8c3fcdd30 100644
--- a/posthog/api/survey.py
+++ b/posthog/api/survey.py
@@ -432,7 +432,7 @@ def nh3_clean_with_allow_list(to_clean: str):
             "*": {"style", "lang", "title", "width", "height"},
             # below are mostly defaults to ammonia, but we need to add them explicitly
             # because this python binding doesn't allow additive allowing
-            "a": {"href", "hreflang"},
+            "a": {"href", "hreflang", "target"},
             "bdo": {"dir"},
             "blockquote": {"cite"},
             "col": {"align", "char", "charoff", "span"},
diff --git a/posthog/api/test/__snapshots__/test_cohort.ambr b/posthog/api/test/__snapshots__/test_cohort.ambr
index 0c8c87f3705730..e8c0b7d444e0d9 100644
--- a/posthog/api/test/__snapshots__/test_cohort.ambr
+++ b/posthog/api/test/__snapshots__/test_cohort.ambr
@@ -1,6 +1,6 @@
 # name: TestCohort.test_async_deletion_of_cohort
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   SELECT count(DISTINCT person_id)
   FROM cohortpeople
   WHERE team_id = 2
@@ -10,7 +10,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.1
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   INSERT INTO cohortpeople
   SELECT id,
          2 as cohort_id,
@@ -83,7 +83,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.2
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   SELECT count(DISTINCT person_id)
   FROM cohortpeople
   WHERE team_id = 2
@@ -93,7 +93,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.3
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.clear_stale_cohort */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.clear_stale_cohort */
   SELECT count()
   FROM cohortpeople
   WHERE team_id = 2
@@ -103,7 +103,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.4
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   SELECT count(DISTINCT person_id)
   FROM cohortpeople
   WHERE team_id = 2
@@ -113,7 +113,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.5
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   INSERT INTO cohortpeople
   SELECT id,
          2 as cohort_id,
@@ -147,7 +147,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.6
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.calculate_cohort_ch */
   SELECT count(DISTINCT person_id)
   FROM cohortpeople
   WHERE team_id = 2
@@ -157,7 +157,7 @@
 ---
 # name: TestCohort.test_async_deletion_of_cohort.7
   '
-  /* user_id:115 celery:posthog.tasks.calculate_cohort.clear_stale_cohort */
+  /* user_id:119 celery:posthog.tasks.calculate_cohort.clear_stale_cohort */
   SELECT count()
   FROM cohortpeople
   WHERE team_id = 2
diff --git a/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr b/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
index dd49697a74c5e3..7c515f351550e6 100644
--- a/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
+++ b/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
@@ -1,4 +1,4 @@
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new
   '
   SELECT "posthog_user"."id",
          "posthog_user"."password",
@@ -27,7 +27,1556 @@
   LIMIT 21 /**/
   '
 ---
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success.1
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.1
+  '
+  SELECT "posthog_organization"."id",
+         "posthog_organization"."name",
+         "posthog_organization"."slug",
+         "posthog_organization"."created_at",
+         "posthog_organization"."updated_at",
+         "posthog_organization"."plugins_access_level",
+         "posthog_organization"."for_internal_metrics",
+         "posthog_organization"."is_member_join_email_enabled",
+         "posthog_organization"."enforce_2fa",
+         "posthog_organization"."customer_id",
+         "posthog_organization"."available_product_features",
+         "posthog_organization"."usage",
+         "posthog_organization"."never_drop_data",
+         "posthog_organization"."setup_section_2_completed",
+         "posthog_organization"."personalization",
+         "posthog_organization"."domain_whitelist",
+         "posthog_organization"."available_features"
+  FROM "posthog_organization"
+  WHERE "posthog_organization"."id" = '00000000-0000-0000-0000-000000000000'::uuid
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.10
+  '
+  SELECT "posthog_organization"."id",
+         "posthog_organization"."name",
+         "posthog_organization"."slug",
+         "posthog_organization"."created_at",
+         "posthog_organization"."updated_at",
+         "posthog_organization"."plugins_access_level",
+         "posthog_organization"."for_internal_metrics",
+         "posthog_organization"."is_member_join_email_enabled",
+         "posthog_organization"."enforce_2fa",
+         "posthog_organization"."customer_id",
+         "posthog_organization"."available_product_features",
+         "posthog_organization"."usage",
+         "posthog_organization"."never_drop_data",
+         "posthog_organization"."setup_section_2_completed",
+         "posthog_organization"."personalization",
+         "posthog_organization"."domain_whitelist",
+         "posthog_organization"."available_features"
+  FROM "posthog_organization"
+  WHERE "posthog_organization"."id" = '00000000-0000-0000-0000-000000000000'::uuid
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.11
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.12
+  '
+  SELECT "posthog_dashboardtile"."id"
+  FROM "posthog_dashboardtile"
+  INNER JOIN "posthog_dashboard" ON ("posthog_dashboardtile"."dashboard_id" = "posthog_dashboard"."id")
+  WHERE (NOT ("posthog_dashboardtile"."deleted"
+              AND "posthog_dashboardtile"."deleted" IS NOT NULL)
+         AND NOT ("posthog_dashboard"."deleted")
+         AND "posthog_dashboardtile"."dashboard_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.13
+  '
+  SELECT "posthog_organization"."id",
+         "posthog_organization"."name",
+         "posthog_organization"."slug",
+         "posthog_organization"."created_at",
+         "posthog_organization"."updated_at",
+         "posthog_organization"."plugins_access_level",
+         "posthog_organization"."for_internal_metrics",
+         "posthog_organization"."is_member_join_email_enabled",
+         "posthog_organization"."enforce_2fa",
+         "posthog_organization"."customer_id",
+         "posthog_organization"."available_product_features",
+         "posthog_organization"."usage",
+         "posthog_organization"."never_drop_data",
+         "posthog_organization"."setup_section_2_completed",
+         "posthog_organization"."personalization",
+         "posthog_organization"."domain_whitelist",
+         "posthog_organization"."available_features"
+  FROM "posthog_organization"
+  WHERE "posthog_organization"."id" = '00000000-0000-0000-0000-000000000000'::uuid
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.14
+  '
+  SELECT "posthog_dashboardtile"."id"
+  FROM "posthog_dashboardtile"
+  INNER JOIN "posthog_dashboard" ON ("posthog_dashboardtile"."dashboard_id" = "posthog_dashboard"."id")
+  WHERE (NOT ("posthog_dashboardtile"."deleted"
+              AND "posthog_dashboardtile"."deleted" IS NOT NULL)
+         AND NOT ("posthog_dashboard"."deleted")
+         AND "posthog_dashboardtile"."dashboard_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.15
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.16
+  '
+  SELECT "posthog_dashboarditem"."id",
+         "posthog_dashboarditem"."name",
+         "posthog_dashboarditem"."derived_name",
+         "posthog_dashboarditem"."description",
+         "posthog_dashboarditem"."team_id",
+         "posthog_dashboarditem"."filters",
+         "posthog_dashboarditem"."filters_hash",
+         "posthog_dashboarditem"."query",
+         "posthog_dashboarditem"."order",
+         "posthog_dashboarditem"."deleted",
+         "posthog_dashboarditem"."saved",
+         "posthog_dashboarditem"."created_at",
+         "posthog_dashboarditem"."last_refresh",
+         "posthog_dashboarditem"."refreshing",
+         "posthog_dashboarditem"."created_by_id",
+         "posthog_dashboarditem"."is_sample",
+         "posthog_dashboarditem"."short_id",
+         "posthog_dashboarditem"."favorited",
+         "posthog_dashboarditem"."refresh_attempt",
+         "posthog_dashboarditem"."last_modified_at",
+         "posthog_dashboarditem"."last_modified_by_id",
+         "posthog_dashboarditem"."dashboard_id",
+         "posthog_dashboarditem"."layouts",
+         "posthog_dashboarditem"."color",
+         "posthog_dashboarditem"."dive_dashboard_id",
+         "posthog_dashboarditem"."updated_at",
+         "posthog_dashboarditem"."deprecated_tags",
+         "posthog_dashboarditem"."tags"
+  FROM "posthog_dashboarditem"
+  WHERE "posthog_dashboarditem"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.17
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.18
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.19
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.2
+  '
+  SELECT (1) AS "a"
+  FROM "posthog_organizationmembership"
+  WHERE ("posthog_organizationmembership"."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid
+         AND "posthog_organizationmembership"."user_id" = 2)
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.20
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.21
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.22
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.23
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.24
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.25
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.26
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.27
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.28
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.29
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.3
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:RATE_LIMIT_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.30
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.31
+  '
+  SELECT "posthog_dashboardtile"."id",
+         "posthog_dashboardtile"."dashboard_id",
+         "posthog_dashboardtile"."insight_id",
+         "posthog_dashboardtile"."text_id",
+         "posthog_dashboardtile"."layouts",
+         "posthog_dashboardtile"."color",
+         "posthog_dashboardtile"."filters_hash",
+         "posthog_dashboardtile"."last_refresh",
+         "posthog_dashboardtile"."refreshing",
+         "posthog_dashboardtile"."refresh_attempt",
+         "posthog_dashboardtile"."deleted"
+  FROM "posthog_dashboardtile"
+  WHERE "posthog_dashboardtile"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.32
+  '
+  SELECT "posthog_dashboarditem"."id",
+         "posthog_dashboarditem"."name",
+         "posthog_dashboarditem"."derived_name",
+         "posthog_dashboarditem"."description",
+         "posthog_dashboarditem"."team_id",
+         "posthog_dashboarditem"."filters",
+         "posthog_dashboarditem"."filters_hash",
+         "posthog_dashboarditem"."query",
+         "posthog_dashboarditem"."order",
+         "posthog_dashboarditem"."deleted",
+         "posthog_dashboarditem"."saved",
+         "posthog_dashboarditem"."created_at",
+         "posthog_dashboarditem"."last_refresh",
+         "posthog_dashboarditem"."refreshing",
+         "posthog_dashboarditem"."created_by_id",
+         "posthog_dashboarditem"."is_sample",
+         "posthog_dashboarditem"."short_id",
+         "posthog_dashboarditem"."favorited",
+         "posthog_dashboarditem"."refresh_attempt",
+         "posthog_dashboarditem"."last_modified_at",
+         "posthog_dashboarditem"."last_modified_by_id",
+         "posthog_dashboarditem"."dashboard_id",
+         "posthog_dashboarditem"."layouts",
+         "posthog_dashboarditem"."color",
+         "posthog_dashboarditem"."dive_dashboard_id",
+         "posthog_dashboarditem"."updated_at",
+         "posthog_dashboarditem"."deprecated_tags",
+         "posthog_dashboarditem"."tags"
+  FROM "posthog_dashboarditem"
+  WHERE "posthog_dashboarditem"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.33
+  '
+  SELECT "posthog_dashboard"."id",
+         "posthog_dashboard"."name",
+         "posthog_dashboard"."description",
+         "posthog_dashboard"."team_id",
+         "posthog_dashboard"."pinned",
+         "posthog_dashboard"."created_at",
+         "posthog_dashboard"."created_by_id",
+         "posthog_dashboard"."deleted",
+         "posthog_dashboard"."last_accessed_at",
+         "posthog_dashboard"."filters",
+         "posthog_dashboard"."creation_mode",
+         "posthog_dashboard"."restriction_level",
+         "posthog_dashboard"."deprecated_tags",
+         "posthog_dashboard"."tags",
+         "posthog_dashboard"."share_token",
+         "posthog_dashboard"."is_shared"
+  FROM "posthog_dashboard"
+  WHERE "posthog_dashboard"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.34
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.35
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.36
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.37
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.38
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.39
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.4
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."key" = 'copied-flag-key'
+         AND "posthog_featureflag"."team_id" = 2)
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.40
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.41
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.42
+  '
+  SELECT "posthog_dashboarditem"."id",
+         "posthog_dashboarditem"."name",
+         "posthog_dashboarditem"."derived_name",
+         "posthog_dashboarditem"."description",
+         "posthog_dashboarditem"."team_id",
+         "posthog_dashboarditem"."filters",
+         "posthog_dashboarditem"."filters_hash",
+         "posthog_dashboarditem"."query",
+         "posthog_dashboarditem"."order",
+         "posthog_dashboarditem"."deleted",
+         "posthog_dashboarditem"."saved",
+         "posthog_dashboarditem"."created_at",
+         "posthog_dashboarditem"."last_refresh",
+         "posthog_dashboarditem"."refreshing",
+         "posthog_dashboarditem"."created_by_id",
+         "posthog_dashboarditem"."is_sample",
+         "posthog_dashboarditem"."short_id",
+         "posthog_dashboarditem"."favorited",
+         "posthog_dashboarditem"."refresh_attempt",
+         "posthog_dashboarditem"."last_modified_at",
+         "posthog_dashboarditem"."last_modified_by_id",
+         "posthog_dashboarditem"."dashboard_id",
+         "posthog_dashboarditem"."layouts",
+         "posthog_dashboarditem"."color",
+         "posthog_dashboarditem"."dive_dashboard_id",
+         "posthog_dashboarditem"."updated_at",
+         "posthog_dashboarditem"."deprecated_tags",
+         "posthog_dashboarditem"."tags"
+  FROM "posthog_dashboarditem"
+  WHERE "posthog_dashboarditem"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.43
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.44
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.45
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.46
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.47
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.48
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.49
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.5
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.50
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.51
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.52
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.53
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.54
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.55
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.56
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.57
+  '
+  SELECT "posthog_dashboardtile"."id",
+         "posthog_dashboardtile"."dashboard_id",
+         "posthog_dashboardtile"."insight_id",
+         "posthog_dashboardtile"."text_id",
+         "posthog_dashboardtile"."layouts",
+         "posthog_dashboardtile"."color",
+         "posthog_dashboardtile"."filters_hash",
+         "posthog_dashboardtile"."last_refresh",
+         "posthog_dashboardtile"."refreshing",
+         "posthog_dashboardtile"."refresh_attempt",
+         "posthog_dashboardtile"."deleted"
+  FROM "posthog_dashboardtile"
+  WHERE "posthog_dashboardtile"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.58
+  '
+  SELECT "posthog_dashboarditem"."id",
+         "posthog_dashboarditem"."name",
+         "posthog_dashboarditem"."derived_name",
+         "posthog_dashboarditem"."description",
+         "posthog_dashboarditem"."team_id",
+         "posthog_dashboarditem"."filters",
+         "posthog_dashboarditem"."filters_hash",
+         "posthog_dashboarditem"."query",
+         "posthog_dashboarditem"."order",
+         "posthog_dashboarditem"."deleted",
+         "posthog_dashboarditem"."saved",
+         "posthog_dashboarditem"."created_at",
+         "posthog_dashboarditem"."last_refresh",
+         "posthog_dashboarditem"."refreshing",
+         "posthog_dashboarditem"."created_by_id",
+         "posthog_dashboarditem"."is_sample",
+         "posthog_dashboarditem"."short_id",
+         "posthog_dashboarditem"."favorited",
+         "posthog_dashboarditem"."refresh_attempt",
+         "posthog_dashboarditem"."last_modified_at",
+         "posthog_dashboarditem"."last_modified_by_id",
+         "posthog_dashboarditem"."dashboard_id",
+         "posthog_dashboarditem"."layouts",
+         "posthog_dashboarditem"."color",
+         "posthog_dashboarditem"."dive_dashboard_id",
+         "posthog_dashboarditem"."updated_at",
+         "posthog_dashboarditem"."deprecated_tags",
+         "posthog_dashboarditem"."tags"
+  FROM "posthog_dashboarditem"
+  WHERE "posthog_dashboarditem"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.59
+  '
+  SELECT "posthog_dashboard"."id",
+         "posthog_dashboard"."name",
+         "posthog_dashboard"."description",
+         "posthog_dashboard"."team_id",
+         "posthog_dashboard"."pinned",
+         "posthog_dashboard"."created_at",
+         "posthog_dashboard"."created_by_id",
+         "posthog_dashboard"."deleted",
+         "posthog_dashboard"."last_accessed_at",
+         "posthog_dashboard"."filters",
+         "posthog_dashboard"."creation_mode",
+         "posthog_dashboard"."restriction_level",
+         "posthog_dashboard"."deprecated_tags",
+         "posthog_dashboard"."tags",
+         "posthog_dashboard"."share_token",
+         "posthog_dashboard"."is_shared"
+  FROM "posthog_dashboard"
+  WHERE "posthog_dashboard"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.6
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE (NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."key" = 'copied-flag-key'
+         AND "posthog_featureflag"."team_id" = 2)
+  ORDER BY "posthog_featureflag"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.60
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.61
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.62
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.63
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.64
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.65
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.66
+  '
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.67
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."active"
+         AND NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."team_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.68
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.69
+  '
+  SELECT "posthog_experiment"."id",
+         "posthog_experiment"."name",
+         "posthog_experiment"."description",
+         "posthog_experiment"."team_id",
+         "posthog_experiment"."filters",
+         "posthog_experiment"."parameters",
+         "posthog_experiment"."secondary_metrics",
+         "posthog_experiment"."feature_flag_id",
+         "posthog_experiment"."created_by_id",
+         "posthog_experiment"."start_date",
+         "posthog_experiment"."end_date",
+         "posthog_experiment"."created_at",
+         "posthog_experiment"."updated_at",
+         "posthog_experiment"."archived"
+  FROM "posthog_experiment"
+  WHERE "posthog_experiment"."feature_flag_id" = 2 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.7
+  '
+  SELECT (1) AS "a"
+  FROM "posthog_featureflag"
+  WHERE (NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."key" = 'copied-flag-key'
+         AND "posthog_featureflag"."team_id" = 2)
+  LIMIT 1 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.70
+  '
+  SELECT "posthog_survey"."id",
+         "posthog_survey"."team_id",
+         "posthog_survey"."name",
+         "posthog_survey"."description",
+         "posthog_survey"."linked_flag_id",
+         "posthog_survey"."targeting_flag_id",
+         "posthog_survey"."type",
+         "posthog_survey"."conditions",
+         "posthog_survey"."questions",
+         "posthog_survey"."appearance",
+         "posthog_survey"."created_at",
+         "posthog_survey"."created_by_id",
+         "posthog_survey"."start_date",
+         "posthog_survey"."end_date",
+         "posthog_survey"."updated_at",
+         "posthog_survey"."archived"
+  FROM "posthog_survey"
+  WHERE "posthog_survey"."linked_flag_id" = 2 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.71
+  '
+  SELECT "posthog_earlyaccessfeature"."id",
+         "posthog_earlyaccessfeature"."team_id",
+         "posthog_earlyaccessfeature"."feature_flag_id",
+         "posthog_earlyaccessfeature"."name",
+         "posthog_earlyaccessfeature"."description",
+         "posthog_earlyaccessfeature"."stage",
+         "posthog_earlyaccessfeature"."documentation_url",
+         "posthog_earlyaccessfeature"."created_at"
+  FROM "posthog_earlyaccessfeature"
+  WHERE "posthog_earlyaccessfeature"."feature_flag_id" = 2 /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.72
+  '
+  SELECT "posthog_dashboard"."id",
+         "posthog_dashboard"."name",
+         "posthog_dashboard"."description",
+         "posthog_dashboard"."team_id",
+         "posthog_dashboard"."pinned",
+         "posthog_dashboard"."created_at",
+         "posthog_dashboard"."created_by_id",
+         "posthog_dashboard"."deleted",
+         "posthog_dashboard"."last_accessed_at",
+         "posthog_dashboard"."filters",
+         "posthog_dashboard"."creation_mode",
+         "posthog_dashboard"."restriction_level",
+         "posthog_dashboard"."deprecated_tags",
+         "posthog_dashboard"."tags",
+         "posthog_dashboard"."share_token",
+         "posthog_dashboard"."is_shared"
+  FROM "posthog_dashboard"
+  INNER JOIN "posthog_featureflagdashboards" ON ("posthog_dashboard"."id" = "posthog_featureflagdashboards"."dashboard_id")
+  WHERE (NOT ("posthog_dashboard"."deleted")
+         AND "posthog_featureflagdashboards"."feature_flag_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.8
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."key" = 'copied-flag-key'
+         AND "posthog_featureflag"."team_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.9
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."active"
+         AND NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."team_id" = 2) /*controller='organization_feature_flags-copy-flags',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/copy_flags/%3F%24'*/
+  '
+---
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success
+  '
+  SELECT "posthog_user"."id",
+         "posthog_user"."password",
+         "posthog_user"."last_login",
+         "posthog_user"."first_name",
+         "posthog_user"."last_name",
+         "posthog_user"."is_staff",
+         "posthog_user"."is_active",
+         "posthog_user"."date_joined",
+         "posthog_user"."uuid",
+         "posthog_user"."current_organization_id",
+         "posthog_user"."current_team_id",
+         "posthog_user"."email",
+         "posthog_user"."pending_email",
+         "posthog_user"."temporary_token",
+         "posthog_user"."distinct_id",
+         "posthog_user"."is_email_verified",
+         "posthog_user"."has_seen_product_intro_for",
+         "posthog_user"."email_opt_in",
+         "posthog_user"."partial_notification_settings",
+         "posthog_user"."anonymize_data",
+         "posthog_user"."toolbar_mode",
+         "posthog_user"."events_column_config"
+  FROM "posthog_user"
+  WHERE "posthog_user"."id" = 2
+  LIMIT 21 /**/
+  '
+---
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.1
   '
   SELECT "posthog_organization"."id",
          "posthog_organization"."name",
@@ -51,7 +1600,7 @@
   LIMIT 21 /*controller='organization_feature_flags-detail',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cfeature_flag_key%3E%5B%5E/.%5D%2B%29/%3F%24'*/
   '
 ---
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success.2
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.2
   '
   SELECT (1) AS "a"
   FROM "posthog_organizationmembership"
@@ -60,7 +1609,7 @@
   LIMIT 1 /*controller='organization_feature_flags-detail',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cfeature_flag_key%3E%5B%5E/.%5D%2B%29/%3F%24'*/
   '
 ---
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success.3
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.3
   '
   SELECT "posthog_instancesetting"."id",
          "posthog_instancesetting"."key",
@@ -71,7 +1620,7 @@
   LIMIT 1 /*controller='organization_feature_flags-detail',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cfeature_flag_key%3E%5B%5E/.%5D%2B%29/%3F%24'*/
   '
 ---
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success.4
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.4
   '
   SELECT "posthog_team"."id",
          "posthog_team"."uuid",
@@ -119,7 +1668,7 @@
   WHERE "posthog_team"."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid /*controller='organization_feature_flags-detail',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cfeature_flag_key%3E%5B%5E/.%5D%2B%29/%3F%24'*/
   '
 ---
-# name: OrganizationFeatureFlagViewTests.test_get_feature_flag_success.5
+# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.5
   '
   SELECT "posthog_featureflag"."id",
          "posthog_featureflag"."key",
@@ -137,7 +1686,8 @@
          "posthog_featureflag"."usage_dashboard_id",
          "posthog_featureflag"."has_enriched_analytics"
   FROM "posthog_featureflag"
-  WHERE ("posthog_featureflag"."key" = 'key-1'
+  WHERE (NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."key" = 'key-1'
          AND "posthog_featureflag"."team_id" IN (1,
                                                  2,
                                                  3,
diff --git a/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr b/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
index f40bb246f4ce11..275c555c7e7da1 100644
--- a/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
+++ b/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
@@ -2619,6 +2619,24 @@
                                                           5 /* ... */) /*controller='project_dashboards-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/dashboards/%3F%24'*/
   '
 ---
+# name: TestDashboard.test_listing_dashboards_is_not_nplus1.57
+  '
+  SELECT "posthog_sharingconfiguration"."id",
+         "posthog_sharingconfiguration"."team_id",
+         "posthog_sharingconfiguration"."dashboard_id",
+         "posthog_sharingconfiguration"."insight_id",
+         "posthog_sharingconfiguration"."recording_id",
+         "posthog_sharingconfiguration"."created_at",
+         "posthog_sharingconfiguration"."enabled",
+         "posthog_sharingconfiguration"."access_token"
+  FROM "posthog_sharingconfiguration"
+  WHERE "posthog_sharingconfiguration"."dashboard_id" IN (1,
+                                                          2,
+                                                          3,
+                                                          4,
+                                                          5 /* ... */) /*controller='project_dashboards-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/dashboards/%3F%24'*/
+  '
+---
 # name: TestDashboard.test_listing_dashboards_is_not_nplus1.6
   '
   SELECT "posthog_team"."id",
diff --git a/posthog/api/test/test_capture.py b/posthog/api/test/test_capture.py
index d3e53b44375f16..7d39039b9fdfdd 100644
--- a/posthog/api/test/test_capture.py
+++ b/posthog/api/test/test_capture.py
@@ -15,7 +15,8 @@
 import lzstring
 import pytest
 import structlog
-from django.test.client import Client
+from django.http import HttpResponse
+from django.test.client import Client, MULTIPART_CONTENT
 from django.utils import timezone
 from freezegun import freeze_time
 from kafka.errors import KafkaError
@@ -56,11 +57,92 @@ def mocked_get_ingest_context_from_token(_: Any) -> None:
 )
 openapi_spec = cast(Dict[str, Any], parser.specification)
 
-
 large_data_array = [
-    random.choice(string.ascii_letters) for _ in range(700 * 1024)
+    {"key": random.choice(string.ascii_letters) for _ in range(512 * 1024)}
 ]  # 512 * 1024 is the max size of a single message and random letters shouldn't be compressible, so this should be at least 2 messages
 
+android_json = {
+    "distinct_id": "e3de4e90-491f-4164-9aed-40a3d7881978",
+    "event": "$snapshot",
+    "properties": {
+        "$screen_density": 2.75,
+        "$screen_height": 2154,
+        "$screen_width": 1080,
+        "$app_version": "1.0",
+        "$app_namespace": "com.posthog.android.sample",
+        "$app_build": 1,
+        "$app_name": "PostHog Android Sample",
+        "$device_manufacturer": "Google",
+        "$device_model": "sdk_gphone64_arm64",
+        "$device_name": "emu64a",
+        "$device_type": "Mobile",
+        "$os_name": "Android",
+        "$os_version": "14",
+        "$lib": "posthog-android",
+        "$lib_version": "3.0.0-beta.3",
+        "$locale": "en-US",
+        "$user_agent": "Dalvik/2.1.0 (Linux; U; Android 14; sdk_gphone64_arm64 Build/UPB5.230623.003)",
+        "$timezone": "Europe/Vienna",
+        "$network_wifi": True,
+        "$network_bluetooth": False,
+        "$network_cellular": False,
+        "$network_carrier": "T-Mobile",
+        "$snapshot_data": [
+            {"timestamp": 1699354586963, "type": 0},
+            {"timestamp": 1699354586963, "type": 1},
+            {
+                "data": {"href": "http://localhost", "width": 1080, "height": 2220},
+                "timestamp": 1699354586963,
+                "type": 4,
+            },
+            {
+                "data": {
+                    "node": {
+                        "id": 1,
+                        "type": 0,
+                        "childNodes": [
+                            {"type": 1, "name": "html", "id": 2, "childNodes": []},
+                            {
+                                "id": 3,
+                                "type": 2,
+                                "tagName": "html",
+                                "childNodes": [
+                                    {
+                                        "id": 5,
+                                        "type": 2,
+                                        "tagName": "body",
+                                        "childNodes": [
+                                            {
+                                                "type": 2,
+                                                "tagName": "canvas",
+                                                "id": 7,
+                                                "attributes": {
+                                                    "id": "canvas",
+                                                    "width": "1080",
+                                                    "height": "2220",
+                                                },
+                                                "childNodes": [],
+                                            }
+                                        ],
+                                    }
+                                ],
+                            },
+                        ],
+                        "initialOffset": {"left": 0, "top": 0},
+                    }
+                },
+                "timestamp": 1699354586963,
+                "type": 2,
+            },
+        ],
+        "$session_id": "bceaa9ce-dc9d-4728-8a90-4a7c249604b1",
+        "$window_id": "31bfffdc-79fc-4504-9ff4-0216a58bf7f6",
+        "distinct_id": "e3de4e90-491f-4164-9aed-40a3d7881978",
+    },
+    "timestamp": "2023-11-07T10:56:46.601Z",
+    "uuid": "deaa7e00-e1a4-480d-9145-fb8461678dae",
+}
+
 
 class TestCapture(BaseTest):
     """
@@ -98,10 +180,10 @@ def _to_arguments(self, patch_process_event_with_plugins: Any) -> dict:
             "sent_at": args["sent_at"],
         }
 
-    def _send_session_recording_event(
+    def _send_original_version_session_recording_event(
         self,
-        number_of_events=1,
-        event_data={},
+        number_of_events: int = 1,
+        event_data: Dict | None = {},
         snapshot_source=3,
         snapshot_type=1,
         session_id="abc123",
@@ -109,6 +191,9 @@ def _send_session_recording_event(
         distinct_id="ghi789",
         timestamp=1658516991883,
     ) -> dict:
+        if event_data is None:
+            event_data = {}
+
         event = {
             "event": "$snapshot",
             "properties": {
@@ -134,7 +219,53 @@ def _send_session_recording_event(
 
         return event
 
-    def test_is_randomly_parititoned(self):
+    def _send_august_2023_version_session_recording_event(
+        self,
+        number_of_events: int = 1,
+        event_data: Dict | List[Dict] | None = None,
+        session_id="abc123",
+        window_id="def456",
+        distinct_id="ghi789",
+        timestamp=1658516991883,
+        content_type: str | None = None,
+    ) -> HttpResponse:
+        if event_data is None:
+            # event_data is an array of RRWeb events
+            event_data = [{"type": 3, "data": {"source": 1}}, {"type": 3, "data": {"source": 2}}]
+
+        if isinstance(event_data, Dict):
+            event_data = [event_data]
+
+        event = {
+            "event": "$snapshot",
+            "properties": {
+                # estimate of the size of the event data
+                "$snapshot_bytes": 60,
+                "$snapshot_data": event_data,
+                "$session_id": session_id,
+                "$window_id": window_id,
+                # snapshot events have the distinct id in the properties
+                # as well as at the top-level
+                "distinct_id": distinct_id,
+            },
+            "timestamp": timestamp,
+            "distinct_id": distinct_id,
+        }
+
+        post_data: List[Dict[str, Any]] | Dict[str, Any]
+
+        if content_type == "application/json":
+            post_data = [{**event, "api_key": self.team.api_token} for _ in range(number_of_events)]
+        else:
+            post_data = {"api_key": self.team.api_token, "data": json.dumps([event for _ in range(number_of_events)])}
+
+        return self.client.post(
+            "/s/",
+            data=post_data,
+            content_type=content_type or MULTIPART_CONTENT,
+        )
+
+    def test_is_randomly_partitioned(self):
         """Test is_randomly_partitioned under local configuration."""
         distinct_id = 100
         override_key = f"{self.team.pk}:{distinct_id}"
@@ -161,7 +292,9 @@ def test_capture_randomly_partitions_with_likely_anonymous_ids(self, kafka_produ
                     HTTP_ORIGIN="https://localhost",
                 )
 
-            kafka_produce.assert_called_with(topic=KAFKA_EVENTS_PLUGIN_INGESTION_TOPIC, data=ANY, key=None)
+            kafka_produce.assert_called_with(
+                topic=KAFKA_EVENTS_PLUGIN_INGESTION_TOPIC, data=ANY, key=None, headers=None
+            )
 
     def test_cached_is_randomly_partitioned(self):
         """Assert the behavior of is_randomly_partitioned under certain cache settings.
@@ -249,6 +382,28 @@ def test_capture_event(self, kafka_produce):
         assert "token" in log_context
         assert log_context["token"] == self.team.api_token
 
+    @patch("posthog.kafka_client.client._KafkaProducer.produce")
+    def test_capture_snapshot_event(self, _kafka_produce: MagicMock) -> None:
+        response = self._send_august_2023_version_session_recording_event()
+        assert response.status_code == 200
+
+    @patch("posthog.kafka_client.client._KafkaProducer.produce")
+    def test_capture_snapshot_event_from_android(self, _kafka_produce: MagicMock) -> None:
+        response = self._send_august_2023_version_session_recording_event(
+            event_data=android_json,
+            content_type=MULTIPART_CONTENT,
+        )
+        assert response.status_code == 200
+
+    @patch("posthog.kafka_client.client._KafkaProducer.produce")
+    def test_capture_snapshot_event_from_android_as_json(self, _kafka_produce: MagicMock) -> None:
+        response = self._send_august_2023_version_session_recording_event(
+            event_data=android_json,
+            content_type="application/json",
+        )
+
+        assert response.status_code == 200
+
     @patch("axes.middleware.AxesMiddleware")
     @patch("posthog.kafka_client.client._KafkaProducer.produce")
     def test_capture_event_shortcircuits(self, kafka_produce, patch_axes):
@@ -1365,7 +1520,7 @@ def test_cors_allows_tracing_headers(self, _: str, path: str, headers: List[str]
     @patch("posthog.kafka_client.client._KafkaProducer.produce")
     def test_legacy_recording_ingestion_data_sent_to_kafka(self, kafka_produce) -> None:
         session_id = "some_session_id"
-        self._send_session_recording_event(session_id=session_id)
+        self._send_original_version_session_recording_event(session_id=session_id)
         self.assertEqual(kafka_produce.call_count, 1)
         kafka_topic_used = kafka_produce.call_args_list[0][1]["topic"]
         self.assertEqual(kafka_topic_used, KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS)
@@ -1384,7 +1539,7 @@ def test_legacy_recording_ingestion_compression_and_transformation(self, kafka_p
         snapshot_source = 8
         snapshot_type = 8
         event_data = {"foo": "bar"}
-        self._send_session_recording_event(
+        self._send_original_version_session_recording_event(
             timestamp=timestamp,
             snapshot_source=snapshot_source,
             snapshot_type=snapshot_type,
@@ -1424,7 +1579,7 @@ def test_recording_ingestion_can_write_to_blob_ingestion_topic_with_usual_size_l
         with self.settings(
             SESSION_RECORDING_KAFKA_MAX_REQUEST_SIZE_BYTES=512,
         ):
-            self._send_session_recording_event(event_data=large_data_array)
+            self._send_august_2023_version_session_recording_event(event_data=large_data_array)
             topic_counter = Counter([call[1]["topic"] for call in kafka_produce.call_args_list])
 
             assert topic_counter == Counter({KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS: 1})
@@ -1434,11 +1589,20 @@ def test_recording_ingestion_can_write_to_blob_ingestion_topic(self, kafka_produ
         with self.settings(
             SESSION_RECORDING_KAFKA_MAX_REQUEST_SIZE_BYTES=20480,
         ):
-            self._send_session_recording_event(event_data=large_data_array)
+            self._send_august_2023_version_session_recording_event(event_data=large_data_array)
             topic_counter = Counter([call[1]["topic"] for call in kafka_produce.call_args_list])
 
             assert topic_counter == Counter({KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS: 1})
 
+    @patch("posthog.kafka_client.client._KafkaProducer.produce")
+    def test_recording_ingestion_can_write_headers_with_the_message(self, kafka_produce: MagicMock) -> None:
+        with self.settings(
+            SESSION_RECORDING_KAFKA_MAX_REQUEST_SIZE_BYTES=20480,
+        ):
+            self._send_august_2023_version_session_recording_event()
+
+            assert kafka_produce.mock_calls[0].kwargs["headers"] == [("token", "token123")]
+
     @patch("posthog.kafka_client.client.SessionRecordingKafkaProducer")
     def test_create_session_recording_kafka_with_expected_hosts(
         self,
@@ -1457,8 +1621,7 @@ def test_create_session_recording_kafka_with_expected_hosts(
             # avoid logs from being printed because the mock is None
             session_recording_producer_singleton_mock.return_value = KafkaProducer()
 
-            data = "example"
-            self._send_session_recording_event(event_data=data)
+            self._send_august_2023_version_session_recording_event(event_data=None)
 
             session_recording_producer_singleton_mock.assert_called_with(
                 compression_type=None,
@@ -1489,9 +1652,9 @@ def test_can_redirect_session_recordings_to_alternative_kafka(
             default_kafka_producer_mock.return_value = KafkaProducer()
             session_recording_producer_factory_mock.return_value = sessionRecordingKafkaProducer()
 
-            data = "example"
             session_id = "test_can_redirect_session_recordings_to_alternative_kafka"
-            self._send_session_recording_event(event_data=data, session_id=session_id)
+            # just a single thing to send (it should be an rrweb event but capture doesn't validate that)
+            self._send_august_2023_version_session_recording_event(event_data={}, session_id=session_id)
             # session events don't get routed through the default kafka producer
             default_kafka_producer_mock.assert_not_called()
             session_recording_producer_factory_mock.assert_called()
@@ -1562,7 +1725,7 @@ def test_quota_limits_ignored_if_disabled(self, kafka_produce) -> None:
             QuotaResource.EVENTS,
             {self.team.api_token: timezone.now().timestamp() + 10000},
         )
-        self._send_session_recording_event()
+        self._send_august_2023_version_session_recording_event()
         self.assertEqual(kafka_produce.call_count, 1)
 
     @patch("posthog.kafka_client.client._KafkaProducer.produce")
@@ -1572,7 +1735,7 @@ def test_quota_limits(self, kafka_produce: MagicMock) -> None:
 
         def _produce_events():
             kafka_produce.reset_mock()
-            self._send_session_recording_event()
+            self._send_august_2023_version_session_recording_event()
             self.client.post(
                 "/e/",
                 data={
diff --git a/posthog/api/test/test_organization_feature_flag.py b/posthog/api/test/test_organization_feature_flag.py
index de57dfb91bd0b6..a12c147fa29eea 100644
--- a/posthog/api/test/test_organization_feature_flag.py
+++ b/posthog/api/test/test_organization_feature_flag.py
@@ -1,22 +1,31 @@
 from rest_framework import status
 from posthog.models.team.team import Team
 from posthog.models import FeatureFlag
+from posthog.models.experiment import Experiment
+from posthog.models.feedback.survey import Survey
+from posthog.models.early_access_feature import EarlyAccessFeature
+from posthog.api.dashboards.dashboard import Dashboard
 from posthog.test.base import APIBaseTest, QueryMatchingTest, snapshot_postgres_queries
+from typing import Any, Dict
 
 
-class OrganizationFeatureFlagViewTests(APIBaseTest, QueryMatchingTest):
+class TestOrganizationFeatureFlagGet(APIBaseTest, QueryMatchingTest):
     def setUp(self):
         self.team_1 = self.team
         self.team_2 = Team.objects.create(organization=self.organization)
+        self.team_3 = Team.objects.create(organization=self.organization)
 
         self.feature_flag_key = "key-1"
 
         self.feature_flag_1 = FeatureFlag.objects.create(
             team=self.team_1, created_by=self.user, key=self.feature_flag_key
         )
-        self.feature_flag_1 = FeatureFlag.objects.create(
+        self.feature_flag_2 = FeatureFlag.objects.create(
             team=self.team_2, created_by=self.user, key=self.feature_flag_key
         )
+        self.feature_flag_deleted = FeatureFlag.objects.create(
+            team=self.team_3, created_by=self.user, key=self.feature_flag_key, deleted=True
+        )
 
         super().setUp()
 
@@ -27,7 +36,10 @@ def test_get_feature_flag_success(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        expected_data = [{"team_id": self.team_1.id, "active": True}, {"team_id": self.team_2.id, "active": True}]
+        expected_data = [
+            {"flag_id": self.feature_flag_1.id, "team_id": self.team_1.id, "active": True},
+            {"flag_id": self.feature_flag_2.id, "team_id": self.team_2.id, "active": True},
+        ]
         self.assertCountEqual(response.json(), expected_data)
 
     def test_get_feature_flag_not_found(self):
@@ -44,3 +56,330 @@ def test_get_feature_flag_unauthorized(self):
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+
+
+class TestOrganizationFeatureFlagCopy(APIBaseTest, QueryMatchingTest):
+    def setUp(self):
+        self.team_1 = self.team
+        self.team_2 = Team.objects.create(organization=self.organization)
+
+        self.feature_flag_key = "copied-flag-key"
+        self.rollout_percentage_to_copy = 65
+        self.feature_flag_to_copy = FeatureFlag.objects.create(
+            team=self.team_1,
+            created_by=self.user,
+            key=self.feature_flag_key,
+            filters={"groups": [{"rollout_percentage": self.rollout_percentage_to_copy}]},
+            rollout_percentage=self.rollout_percentage_to_copy,
+        )
+
+        super().setUp()
+
+    @snapshot_postgres_queries
+    def test_copy_feature_flag_create_new(self):
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+        target_project = self.team_2
+
+        data = {
+            "feature_flag_key": self.feature_flag_to_copy.key,
+            "from_project": self.feature_flag_to_copy.team_id,
+            "target_project_ids": [target_project.id],
+        }
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn("success", response.json())
+        self.assertIn("failed", response.json())
+
+        # Check copied flag in the response
+        expected_flag_response = {
+            "key": self.feature_flag_to_copy.key,
+            "name": self.feature_flag_to_copy.name,
+            "filters": self.feature_flag_to_copy.filters,
+            "active": self.feature_flag_to_copy.active,
+            "ensure_experience_continuity": self.feature_flag_to_copy.ensure_experience_continuity,
+            "rollout_percentage": self.rollout_percentage_to_copy,
+            "deleted": False,
+            "created_by": self.user.id,
+            "id": "__ignore__",
+            "created_at": "__ignore__",
+            "usage_dashboard": "__ignore__",
+            "is_simple_flag": True,
+            "experiment_set": [],
+            "surveys": [],
+            "features": [],
+            "rollback_conditions": None,
+            "performed_rollback": False,
+            "can_edit": True,
+            "analytics_dashboards": [],
+            "has_enriched_analytics": False,
+            "tags": [],
+        }
+
+        flag_response = response.json()["success"][0]
+
+        for key, expected_value in expected_flag_response.items():
+            self.assertIn(key, flag_response)
+            if expected_value != "__ignore__":
+                if key == "created_by":
+                    self.assertEqual(flag_response[key]["id"], expected_value)
+                else:
+                    self.assertEqual(flag_response[key], expected_value)
+
+        self.assertSetEqual(
+            set(expected_flag_response.keys()),
+            set(flag_response.keys()),
+        )
+
+    def test_copy_feature_flag_update_existing(self):
+        target_project = self.team_2
+        rollout_percentage_existing = 99
+
+        existing_flag = FeatureFlag.objects.create(
+            team=target_project,
+            created_by=self.user,
+            key=self.feature_flag_key,
+            name="Existing flag",
+            filters={"groups": [{"rollout_percentage": rollout_percentage_existing}]},
+            rollout_percentage=rollout_percentage_existing,
+            ensure_experience_continuity=False,
+        )
+
+        # The following instances must remain linked to the existing flag after overwriting it
+        experiment = Experiment.objects.create(team=self.team_2, created_by=self.user, feature_flag_id=existing_flag.id)
+        survey = Survey.objects.create(team=self.team, created_by=self.user, linked_flag=existing_flag)
+        feature = EarlyAccessFeature.objects.create(
+            team=self.team,
+            feature_flag=existing_flag,
+        )
+        analytics_dashboard = Dashboard.objects.create(
+            team=self.team,
+            created_by=self.user,
+        )
+        existing_flag.analytics_dashboards.set([analytics_dashboard])
+        usage_dashboard = Dashboard.objects.create(
+            team=self.team,
+            created_by=self.user,
+        )
+        existing_flag.usage_dashboard = usage_dashboard
+        existing_flag.save()
+
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+
+        data = {
+            "feature_flag_key": self.feature_flag_to_copy.key,
+            "from_project": self.feature_flag_to_copy.team_id,
+            "target_project_ids": [target_project.id],
+        }
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn("success", response.json())
+        self.assertIn("failed", response.json())
+
+        # Check copied flag in the response
+        expected_flag_response = {
+            "key": self.feature_flag_to_copy.key,
+            "name": self.feature_flag_to_copy.name,
+            "filters": self.feature_flag_to_copy.filters,
+            "active": self.feature_flag_to_copy.active,
+            "ensure_experience_continuity": self.feature_flag_to_copy.ensure_experience_continuity,
+            "rollout_percentage": self.rollout_percentage_to_copy,
+            "deleted": False,
+            "created_by": self.user.id,
+            "is_simple_flag": True,
+            "rollback_conditions": None,
+            "performed_rollback": False,
+            "can_edit": True,
+            "has_enriched_analytics": False,
+            "tags": [],
+            "id": "__ignore__",
+            "created_at": "__ignore__",
+            "usage_dashboard": "__ignore__",
+            "experiment_set": "__ignore__",
+            "surveys": "__ignore__",
+            "features": "__ignore__",
+            "analytics_dashboards": "__ignore__",
+        }
+
+        flag_response = response.json()["success"][0]
+
+        for key, expected_value in expected_flag_response.items():
+            self.assertIn(key, flag_response)
+            if expected_value != "__ignore__":
+                if key == "created_by":
+                    self.assertEqual(flag_response[key]["id"], expected_value)
+                else:
+                    self.assertEqual(flag_response[key], expected_value)
+
+        # Linked instances must remain linked
+        self.assertEqual(experiment.id, flag_response["experiment_set"][0])
+        self.assertEqual(str(survey.id), flag_response["surveys"][0]["id"])
+        self.assertEqual(str(feature.id), flag_response["features"][0]["id"])
+        self.assertEqual(analytics_dashboard.id, flag_response["analytics_dashboards"][0])
+        self.assertEqual(usage_dashboard.id, flag_response["usage_dashboard"])
+
+        self.assertSetEqual(
+            set(expected_flag_response.keys()),
+            set(flag_response.keys()),
+        )
+
+    def test_copy_feature_flag_update_override_deleted(self):
+        target_project = self.team_2
+        target_project_2 = Team.objects.create(organization=self.organization)
+        rollout_percentage_existing = 99
+
+        existing_deleted_flag = FeatureFlag.objects.create(
+            team=target_project,
+            created_by=self.user,
+            key=self.feature_flag_key,
+            name="Existing flag",
+            filters={"groups": [{"rollout_percentage": rollout_percentage_existing}]},
+            rollout_percentage=rollout_percentage_existing,
+            ensure_experience_continuity=False,
+            deleted=True,
+        )
+        existing_deleted_flag2 = FeatureFlag.objects.create(
+            team=target_project_2,
+            created_by=self.user,
+            key=self.feature_flag_key,
+            name="Existing flag",
+            filters={"groups": [{"rollout_percentage": rollout_percentage_existing}]},
+            rollout_percentage=rollout_percentage_existing,
+            ensure_experience_continuity=False,
+            deleted=True,
+        )
+
+        # The following instances must be overriden for a soft-deleted flag
+        Survey.objects.create(team=self.team, created_by=self.user, linked_flag=existing_deleted_flag)
+
+        analytics_dashboard = Dashboard.objects.create(
+            team=self.team,
+            created_by=self.user,
+        )
+        existing_deleted_flag.analytics_dashboards.set([analytics_dashboard])
+        usage_dashboard = Dashboard.objects.create(
+            team=self.team,
+            created_by=self.user,
+        )
+
+        existing_deleted_flag.usage_dashboard = usage_dashboard
+        existing_deleted_flag.save()
+
+        # Experiments restrict deleting soft-deleted flags
+        Experiment.objects.create(
+            team=target_project_2, created_by=self.user, feature_flag_id=existing_deleted_flag2.id
+        )
+
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+
+        data = {
+            "feature_flag_key": self.feature_flag_to_copy.key,
+            "from_project": self.feature_flag_to_copy.team_id,
+            "target_project_ids": [target_project.id, target_project_2.id],
+        }
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn("success", response.json())
+        self.assertIn("failed", response.json())
+
+        # Check copied flag in the response
+        expected_flag_response = {
+            "key": self.feature_flag_to_copy.key,
+            "name": self.feature_flag_to_copy.name,
+            "filters": self.feature_flag_to_copy.filters,
+            "active": self.feature_flag_to_copy.active,
+            "ensure_experience_continuity": self.feature_flag_to_copy.ensure_experience_continuity,
+            "rollout_percentage": self.rollout_percentage_to_copy,
+            "deleted": False,
+            "created_by": self.user.id,
+            "is_simple_flag": True,
+            "rollback_conditions": None,
+            "performed_rollback": False,
+            "can_edit": True,
+            "has_enriched_analytics": False,
+            "tags": [],
+            "id": "__ignore__",
+            "created_at": "__ignore__",
+            "usage_dashboard": "__ignore__",
+            "experiment_set": "__ignore__",
+            "surveys": "__ignore__",
+            "features": "__ignore__",
+            "analytics_dashboards": "__ignore__",
+        }
+        flag_response = response.json()["success"][0]
+
+        for key, expected_value in expected_flag_response.items():
+            self.assertIn(key, flag_response)
+            if expected_value != "__ignore__":
+                if key == "created_by":
+                    self.assertEqual(flag_response[key]["id"], expected_value)
+                else:
+                    self.assertEqual(flag_response[key], expected_value)
+
+        # Linked instances must be overriden for a soft-deleted flag
+        self.assertEqual(flag_response["experiment_set"], [])
+        self.assertEqual(flag_response["surveys"], [])
+        self.assertNotEqual(flag_response["usage_dashboard"], existing_deleted_flag.usage_dashboard.id)
+        self.assertEqual(flag_response["analytics_dashboards"], [])
+
+        self.assertSetEqual(
+            set(expected_flag_response.keys()),
+            set(flag_response.keys()),
+        )
+
+        # target_project_2 should have failed
+        self.assertEqual(len(response.json()["failed"]), 1)
+        self.assertEqual(response.json()["failed"][0]["project_id"], target_project_2.id)
+        self.assertEqual(
+            response.json()["failed"][0]["errors"],
+            "[ErrorDetail(string='Feature flag with this key already exists and is used in an experiment. Please delete the experiment before deleting the flag.', code='invalid')]",
+        )
+
+    def test_copy_feature_flag_missing_fields(self):
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+        data: Dict[str, Any] = {}
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("error", response.json())
+
+    def test_copy_feature_flag_nonexistent_key(self):
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+        data = {
+            "feature_flag_key": "nonexistent-key",
+            "from_project": self.team_1.id,
+            "target_project_ids": [self.team_2.id],
+        }
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("error", response.json())
+
+    def test_copy_feature_flag_to_nonexistent_target(self):
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+        nonexistent_project_id = 999
+        data = {
+            "feature_flag_key": self.feature_flag_key,
+            "from_project": self.team_1.id,
+            "target_project_ids": [nonexistent_project_id],
+        }
+
+        response = self.client.post(url, data)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.json()["success"]), 0)
+        self.assertEqual(len(response.json()["failed"]), 1)
+        self.assertEqual(nonexistent_project_id, response.json()["failed"][0]["project_id"])
+
+    def test_copy_feature_flag_unauthorized(self):
+        self.client.logout()
+        url = f"/api/organizations/{self.organization.id}/feature_flags/copy_flags"
+        data = {
+            "feature_flag_key": self.feature_flag_key,
+            "from_project": self.team_1.id,
+            "target_project_ids": [self.team_2.id],
+        }
+        response = self.client.post(url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
diff --git a/posthog/api/test/test_plugin.py b/posthog/api/test/test_plugin.py
index ea8021975daa80..1854c32e060f61 100644
--- a/posthog/api/test/test_plugin.py
+++ b/posthog/api/test/test_plugin.py
@@ -37,6 +37,8 @@ def mocked_plugin_reload(*args, **kwargs):
 @mock.patch("posthog.models.plugin.reload_plugins_on_workers", side_effect=mocked_plugin_reload)
 @mock.patch("requests.get", side_effect=mocked_plugin_requests_get)
 class TestPluginAPI(APIBaseTest, QueryMatchingTest):
+    maxDiff = None
+
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
@@ -703,88 +705,122 @@ def test_update_plugin_source(self, mock_get, mock_reload):
         self.assertEqual(response.json(), {"plugin.json": '{"name":"my plugin"}'})
         self.assertEqual(mock_reload.call_count, 3)
 
-    def test_create_plugin_frontend_source(self, mock_get, mock_reload):
-        self.assertEqual(mock_reload.call_count, 0)
+    def test_transpile_plugin_frontend_source(self, mock_get, mock_reload):
+        # Setup
+        assert mock_reload.call_count == 0
         response = self.client.post(
             "/api/organizations/@current/plugins/",
             {"plugin_type": "source", "name": "myplugin"},
         )
-        self.assertEqual(response.status_code, 201)
+        assert response.status_code == 201
         id = response.json()["id"]
-        self.assertEqual(
-            response.json(),
-            {
-                "id": id,
-                "plugin_type": "source",
-                "name": "myplugin",
-                "description": None,
-                "url": None,
-                "config_schema": {},
-                "tag": None,
-                "icon": None,
-                "latest_tag": None,
-                "is_global": False,
-                "organization_id": response.json()["organization_id"],
-                "organization_name": self.CONFIG_ORGANIZATION_NAME,
-                "capabilities": {},
-                "metrics": {},
-                "public_jobs": {},
-            },
-        )
-        self.assertEqual(Plugin.objects.count(), 1)
-        self.assertEqual(mock_reload.call_count, 0)
-
-        response = self.client.patch(
+        assert response.json() == {
+            "id": id,
+            "plugin_type": "source",
+            "name": "myplugin",
+            "description": None,
+            "url": None,
+            "config_schema": {},
+            "tag": None,
+            "icon": None,
+            "latest_tag": None,
+            "is_global": False,
+            "organization_id": response.json()["organization_id"],
+            "organization_name": self.CONFIG_ORGANIZATION_NAME,
+            "capabilities": {},
+            "metrics": {},
+            "public_jobs": {},
+        }
+
+        assert Plugin.objects.count() == 1
+        assert mock_reload.call_count == 0
+
+        # Add first source file, frontend.tsx
+        self.client.patch(
             f"/api/organizations/@current/plugins/{id}/update_source",
             {"frontend.tsx": "export const scene = {}"},
         )
+        assert Plugin.objects.count() == 1
+        assert PluginSourceFile.objects.count() == 1
+        assert mock_reload.call_count == 1
 
-        self.assertEqual(Plugin.objects.count(), 1)
-        self.assertEqual(PluginSourceFile.objects.count(), 1)
-        self.assertEqual(mock_reload.call_count, 1)
-
+        # Fetch transpiled source via API call
         plugin = Plugin.objects.get(pk=id)
         plugin_config = PluginConfig.objects.create(plugin=plugin, team=self.team, enabled=True, order=1)
-
-        # no frontend, since no pluginserver transpiles the code
         response = self.client.get(f"/api/plugin_config/{plugin_config.id}/frontend")
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
-            response.content,
-            b'export function getFrontendApp () { return {"transpiling": true} }',
+            response.content.decode("utf-8"),
+            '"use strict";\nexport function getFrontendApp (require) { let exports = {}; '
+            '"use strict";\n\nObject.defineProperty(exports, "__esModule", {\n  value: true\n});\nexports.scene = void 0;\n'
+            "var scene = exports.scene = {};"  # this is it
+            "; return exports; }",
         )
 
-        # mock the plugin server's transpilation
+        # Check in the database
         plugin_source = PluginSourceFile.objects.get(plugin_id=id)
-        self.assertEqual(plugin_source.status, None)
-        self.assertEqual(plugin_source.transpiled, None)
-        plugin_source.status = PluginSourceFile.Status.TRANSPILED
-        plugin_source.transpiled = "'random transpiled frontend'"
-        plugin_source.save()
+        assert plugin_source.source == "export const scene = {}"
+        assert plugin_source.error is None
+        assert plugin_source.transpiled == response.content.decode("utf-8")
+        assert plugin_source.status == PluginSourceFile.Status.TRANSPILED
 
-        # Can get the transpiled frontend
-        response = self.client.get(f"/api/plugin_config/{plugin_config.id}/frontend")
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, b"'random transpiled frontend'")
-
-        # Update the source frontend
+        # Updates work
         self.client.patch(
             f"/api/organizations/@current/plugins/{id}/update_source",
             {"frontend.tsx": "export const scene = { name: 'new' }"},
         )
+        plugin_source = PluginSourceFile.objects.get(plugin_id=id)
+        assert plugin_source.source == "export const scene = { name: 'new' }"
+        assert plugin_source.error is None
+        assert (
+            plugin_source.transpiled
+            == (
+                '"use strict";\nexport function getFrontendApp (require) { let exports = {}; "use strict";\n\n'
+                'Object.defineProperty(exports, "__esModule", {\n  value: true\n});\nexports.scene = void 0;\n'
+                "var scene = exports.scene = {\n  name: 'new'\n};"  # this is it
+                "; return exports; }"
+            )
+        )
+        assert plugin_source.status == PluginSourceFile.Status.TRANSPILED
 
-        # It will clear the transpiled frontend
+        # Errors as well
+        self.client.patch(
+            f"/api/organizations/@current/plugins/{id}/update_source",
+            {"frontend.tsx": "export const scene = { nam broken code foobar"},
+        )
         plugin_source = PluginSourceFile.objects.get(plugin_id=id)
-        self.assertEqual(plugin_source.source, "export const scene = { name: 'new' }")
-        self.assertEqual(plugin_source.transpiled, None)
+        assert plugin_source.source == "export const scene = { nam broken code foobar"
+        assert plugin_source.transpiled is None
+        assert plugin_source.status == PluginSourceFile.Status.ERROR
+        assert (
+            plugin_source.error
+            == '/frontend.tsx: Unexpected token, expected "," (1:27)\n\n> 1 | export const scene = { nam broken code foobar\n    |                            ^\n'
+        )
 
-        # And reply that it's transpiling
-        response = self.client.get(f"/api/plugin_config/{plugin_config.id}/frontend")
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.content,
-            b'export function getFrontendApp () { return {"transpiling": true} }',
+        # Deletes work
+        self.client.patch(
+            f"/api/organizations/@current/plugins/{id}/update_source",
+            {"frontend.tsx": None},
+        )
+        try:
+            PluginSourceFile.objects.get(plugin_id=id)
+            assert False, "Should have thrown DoesNotExist"
+        except PluginSourceFile.DoesNotExist:
+            assert True
+
+        # Check that the syntax for "site.ts" is slightly different
+        self.client.patch(
+            f"/api/organizations/@current/plugins/{id}/update_source",
+            {"site.ts": "console.log('hello')"},
         )
+        plugin_source = PluginSourceFile.objects.get(plugin_id=id)
+        assert plugin_source.source == "console.log('hello')"
+        assert plugin_source.error is None
+        assert (
+            plugin_source.transpiled
+            == "(function () {let exports={};\"use strict\";\n\nconsole.log('hello');;return exports;})"
+        )
+        assert plugin_source.status == PluginSourceFile.Status.TRANSPILED
 
     def test_plugin_repository(self, mock_get, mock_reload):
         response = self.client.get("/api/organizations/@current/plugins/repository/")
@@ -935,6 +971,8 @@ def test_create_plugin_config(self, mock_get, mock_reload):
                 "enabled": True,
                 "order": 0,
                 "config": json.dumps({"bar": "moop"}),
+                "name": "name in ui",
+                "description": "description in ui",
             },
             format="multipart",
         )
@@ -955,6 +993,10 @@ def test_create_plugin_config(self, mock_get, mock_reload):
                 "plugin_info": None,
                 "delivery_rate_24h": None,
                 "created_at": mock.ANY,
+                "updated_at": mock.ANY,
+                "name": "name in ui",
+                "description": "description in ui",
+                "deleted": False,
             },
         )
         plugin_config = PluginConfig.objects.first()
@@ -993,6 +1035,10 @@ def test_create_plugin_config(self, mock_get, mock_reload):
                 "plugin_info": None,
                 "delivery_rate_24h": None,
                 "created_at": mock.ANY,
+                "updated_at": mock.ANY,
+                "name": "name in ui",
+                "description": "description in ui",
+                "deleted": False,
             },
         )
         self.client.delete(f"/api/plugin_config/{plugin_config_id}")
@@ -1309,6 +1355,10 @@ def test_create_plugin_config_with_secrets(self, mock_get, mock_reload):
                 "plugin_info": None,
                 "delivery_rate_24h": None,
                 "created_at": mock.ANY,
+                "updated_at": mock.ANY,
+                "name": None,
+                "description": None,
+                "deleted": False,
             },
         )
 
@@ -1334,6 +1384,10 @@ def test_create_plugin_config_with_secrets(self, mock_get, mock_reload):
                 "plugin_info": None,
                 "delivery_rate_24h": None,
                 "created_at": mock.ANY,
+                "updated_at": mock.ANY,
+                "name": None,
+                "description": None,
+                "deleted": False,
             },
         )
 
@@ -1361,6 +1415,10 @@ def test_create_plugin_config_with_secrets(self, mock_get, mock_reload):
                 "plugin_info": None,
                 "delivery_rate_24h": None,
                 "created_at": mock.ANY,
+                "updated_at": mock.ANY,
+                "name": None,
+                "description": None,
+                "deleted": False,
             },
         )
         plugin_config = PluginConfig.objects.get(plugin=plugin_id)
@@ -1370,7 +1428,15 @@ def test_create_plugin_config_with_secrets(self, mock_get, mock_reload):
     def test_plugin_config_list(self, mock_get, mock_reload):
         plugin = Plugin.objects.create(organization=self.organization)
         plugin_config1 = PluginConfig.objects.create(plugin=plugin, team=self.team, enabled=True, order=1)
-        plugin_config2 = PluginConfig.objects.create(plugin=plugin, team=self.team, enabled=True, order=2)
+        plugin_config2 = PluginConfig.objects.create(
+            plugin=plugin,
+            team=self.team,
+            enabled=True,
+            order=2,
+            name="ui name",
+            description="ui description",
+            deleted=True,
+        )
 
         create_app_metric(
             team_id=self.team.pk,
@@ -1397,6 +1463,10 @@ def test_plugin_config_list(self, mock_get, mock_reload):
                     "plugin_info": None,
                     "delivery_rate_24h": 0.5,
                     "created_at": mock.ANY,
+                    "updated_at": mock.ANY,
+                    "name": None,
+                    "description": None,
+                    "deleted": False,
                 },
                 {
                     "id": plugin_config2.pk,
@@ -1409,6 +1479,10 @@ def test_plugin_config_list(self, mock_get, mock_reload):
                     "plugin_info": None,
                     "delivery_rate_24h": None,
                     "created_at": mock.ANY,
+                    "updated_at": mock.ANY,
+                    "name": "ui name",
+                    "description": "ui description",
+                    "deleted": True,
                 },
             ],
         )
diff --git a/posthog/api/test/test_preflight.py b/posthog/api/test/test_preflight.py
index f2775808570998..74d5a8b2e490b1 100644
--- a/posthog/api/test/test_preflight.py
+++ b/posthog/api/test/test_preflight.py
@@ -49,7 +49,6 @@ def preflight_dict(self, options={}):
     def preflight_authenticated_dict(self, options={}):
         preflight = {
             "opt_out_capture": False,
-            "is_debug": False,
             "licensed_users_available": None,
             "site_url": "http://localhost:8000",
             "can_create_org": False,
diff --git a/posthog/api/utils.py b/posthog/api/utils.py
index 298908f1ccbe13..1953b86029c16f 100644
--- a/posthog/api/utils.py
+++ b/posthog/api/utils.py
@@ -1,18 +1,19 @@
-from ipaddress import ip_address
 import json
 import re
-from enum import Enum, auto
 import socket
+import urllib.parse
+from enum import Enum, auto
+from ipaddress import ip_address
 from typing import List, Literal, Optional, Union, Tuple
 from uuid import UUID
 
 import structlog
 from django.core.exceptions import RequestDataTooBig
 from django.db.models import QuerySet
+from prometheus_client import Counter
 from rest_framework import request, status
 from rest_framework.exceptions import ValidationError
 from statshog.defaults.django import statsd
-import urllib.parse
 
 from posthog.constants import EventDefinitionType
 from posthog.exceptions import RequestParsingError, generate_exception_response
@@ -230,11 +231,17 @@ def check_definition_ids_inclusion_field_sql(
 
 SURROGATE_REGEX = re.compile("([\ud800-\udfff])")
 
+SURROGATES_SUBSTITUTED_COUNTER = Counter(
+    "surrogates_substituted_total",
+    "Stray UTF16 surrogates detected and removed from user input.",
+)
+
 
 # keep in sync with posthog/plugin-server/src/utils/db/utils.ts::safeClickhouseString
 def safe_clickhouse_string(s: str) -> str:
     matches = SURROGATE_REGEX.findall(s or "")
     for match in matches:
+        SURROGATES_SUBSTITUTED_COUNTER.inc()
         s = s.replace(match, match.encode("unicode_escape").decode("utf8"))
     return s
 
diff --git a/posthog/batch_exports/service.py b/posthog/batch_exports/service.py
index 547255fabd9f19..6abe24f075349c 100644
--- a/posthog/batch_exports/service.py
+++ b/posthog/batch_exports/service.py
@@ -199,7 +199,7 @@ def unpause_batch_export(
     note: str | None = None,
     backfill: bool = False,
 ) -> None:
-    """Pause this BatchExport.
+    """Unpause this BatchExport.
 
     We pass the call to the underlying Temporal Schedule. Additionally, we can trigger a backfill
     to backfill runs missed while paused.
diff --git a/posthog/demo/matrix/models.py b/posthog/demo/matrix/models.py
index a2e77965189143..e1698d7dd7b3b4 100644
--- a/posthog/demo/matrix/models.py
+++ b/posthog/demo/matrix/models.py
@@ -19,7 +19,7 @@
     Set,
     TypeVar,
 )
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 from uuid import UUID
 
 if TYPE_CHECKING:
@@ -55,6 +55,9 @@ class Target(Enum):
 
 PROPERTY_GEOIP_COUNTRY_CODE = "$geoip_country_code"
 
+UTM_QUERY_PROPERTIES = {"utm_source", "utm_campaign", "utm_medium", "utm_term", "utm_content"}
+
+
 # Properties who get `$set_once` implicitly as `$initial_foo` - source of truth in plugin-server/src/utils/db/utils.ts
 PROPERTIES_WITH_IMPLICIT_INITIAL_VALUE_TRACKING = {
     "utm_source",
@@ -215,15 +218,21 @@ def capture(self, event: str, properties: Optional[Properties] = None):
             "$session_id": self.active_session_id,
             "$device_id": self.device_id,
         }
+        if "$set" not in combined_properties:
+            combined_properties["$set"] = {}
         if self.super_properties:
             combined_properties.update(self.super_properties)
         if self.current_url is not None:
             parsed_current_url = urlparse(self.current_url)
+            parsed_current_url_query = parse_qs(parsed_current_url.query)
             combined_properties["$current_url"] = self.current_url
             combined_properties["$host"] = parsed_current_url.netloc
             combined_properties["$pathname"] = parsed_current_url.path
-        if "$set" not in combined_properties:
-            combined_properties["$set"] = {}
+            for utm_key in UTM_QUERY_PROPERTIES:
+                if utm_key in parsed_current_url_query:
+                    utm_value = parsed_current_url_query[utm_key][0]
+                    combined_properties[utm_key] = utm_value
+                    combined_properties["$set"][utm_key] = utm_value
         if properties:
             if referrer := properties.get("$referrer"):
                 referring_domain = urlparse(referrer).netloc if referrer != "$direct" else referrer
diff --git a/posthog/demo/products/hedgebox/models.py b/posthog/demo/products/hedgebox/models.py
index 1c0a0e4ffd0dac..add6fb8c73ce80 100644
--- a/posthog/demo/products/hedgebox/models.py
+++ b/posthog/demo/products/hedgebox/models.py
@@ -12,12 +12,12 @@
     Tuple,
     cast,
 )
+from urllib.parse import urlencode, urlparse, urlunparse
+from zoneinfo import ZoneInfo
 
 import pytz
-from zoneinfo import ZoneInfo
 
 from posthog.demo.matrix.models import Effect, SimPerson, SimSessionIntent
-
 from .taxonomy import *
 
 if TYPE_CHECKING:
@@ -323,13 +323,13 @@ def simulate_session(self):
         if self.active_session_intent == HedgeboxSessionIntent.CONSIDER_PRODUCT:
             entered_url_directly = self.cluster.random.random() < 0.18
             self.active_client.register({"$referrer": "$direct" if entered_url_directly else "https://www.google.com/"})
-            self.go_to_home()
+            self.go_to_home(None if entered_url_directly else {"utm_source": "google"})
         elif self.active_session_intent == HedgeboxSessionIntent.CHECK_MARIUS_TECH_TIPS_LINK:
             entered_url_directly = self.cluster.random.random() < 0.62
             self.active_client.register(
                 {"$referrer": "$direct" if entered_url_directly else "https://www.youtube.com/"}
             )
-            self.go_to_marius_tech_tips()
+            self.go_to_marius_tech_tips(None if entered_url_directly else {"utm_source": "youtube"})
         elif self.active_session_intent in (
             HedgeboxSessionIntent.UPLOAD_FILE_S,
             HedgeboxSessionIntent.DELETE_FILE_S,
@@ -342,6 +342,7 @@ def simulate_session(self):
         ):
             entered_url_directly = self.cluster.random.random() < 0.71
             self.active_client.register({"$referrer": "$direct" if entered_url_directly else "https://www.google.com/"})
+
             if entered_url_directly:
                 used_files_page_url = self.cluster.random.random() < 0.48
                 if used_files_page_url:
@@ -349,7 +350,7 @@ def simulate_session(self):
                 else:
                     self.go_to_home()
             else:
-                self.go_to_home()
+                self.go_to_home(None if entered_url_directly else {"utm_source": "google"})
         elif self.active_session_intent == HedgeboxSessionIntent.VIEW_SHARED_FILE:
             self.active_client.register({"$referrer": "$direct"})
             if not self.file_to_view:
@@ -367,8 +368,8 @@ def simulate_session(self):
 
     # Path directions
 
-    def go_to_home(self):
-        self.active_client.capture_pageview(URL_HOME)
+    def go_to_home(self, query_params=None):
+        self.active_client.capture_pageview(add_params_to_url(URL_HOME, query_params))
         self.advance_timer(1.8 + self.cluster.random.betavariate(1.5, 3) * 300)  # Viewing the page
         self.satisfaction += (self.cluster.random.betavariate(1.6, 1.2) - 0.5) * 0.1  # It's a somewhat nice page
         if self.active_session_intent in (
@@ -393,8 +394,8 @@ def go_to_home(self):
             elif self.need > 0.5 and self.satisfaction >= 0.8 and self.cluster.random.random() < 0.6:
                 self.go_to_sign_up()
 
-    def go_to_marius_tech_tips(self):
-        self.active_client.capture_pageview(URL_MARIUS_TECH_TIPS)
+    def go_to_marius_tech_tips(self, query_params=None):
+        self.active_client.capture_pageview(add_params_to_url(URL_MARIUS_TECH_TIPS, query_params))
         self.advance_timer(1.2 + self.cluster.random.betavariate(1.5, 2) * 150)  # Viewing the page
         self.satisfaction += (self.cluster.random.betavariate(1.6, 1.2) - 0.5) * 0.4  # The user may be in target or not
         self.need += self.cluster.random.uniform(-0.05, 0.15)
@@ -783,3 +784,14 @@ def invitable_neighbors(self) -> List["HedgeboxPerson"]:
             for neighbor in cast(List[HedgeboxPerson], self.cluster.list_neighbors(self))
             if neighbor.is_invitable
         ]
+
+
+def add_params_to_url(url, query_params):
+    if not query_params:
+        return url
+    parsed_url = urlparse(url)
+    encoded_query = urlencode(query_params)
+    new_query = f"{parsed_url.query}&{encoded_query}" if parsed_url.query else encoded_query
+    return urlunparse(
+        (parsed_url.scheme, parsed_url.netloc, parsed_url.path, parsed_url.params, new_query, parsed_url.fragment)
+    )
diff --git a/posthog/hogql/query.py b/posthog/hogql/query.py
index 697305d0ae964a..c7e8c82713b15f 100644
--- a/posthog/hogql/query.py
+++ b/posthog/hogql/query.py
@@ -1,6 +1,7 @@
 from typing import Dict, Optional, Union, cast
 
 from posthog.clickhouse.client.connection import Workload
+from posthog.errors import ExposedCHQueryError
 from posthog.hogql import ast
 from posthog.hogql.constants import HogQLGlobalSettings
 from posthog.hogql.errors import HogQLException
@@ -143,16 +144,27 @@ def execute_hogql_query(
             timings=timings_dict,
         )
 
-        results, types = sync_execute(
-            clickhouse_sql,
-            clickhouse_context.values,
-            with_column_types=True,
-            workload=workload,
-            team_id=team.pk,
-            readonly=True,
-        )
+        error = None
+        try:
+            results, types = sync_execute(
+                clickhouse_sql,
+                clickhouse_context.values,
+                with_column_types=True,
+                workload=workload,
+                team_id=team.pk,
+                readonly=True,
+            )
+        except Exception as e:
+            if explain:
+                results, types = None, None
+                if isinstance(e, ExposedCHQueryError) or isinstance(e, HogQLException):
+                    error = str(e)
+                else:
+                    error = "Unknown error"
+            else:
+                raise e
 
-    if explain:
+    if explain and error is None:  # If the query errored, explain will fail as well.
         with timings.measure("explain"):
             explain_results = sync_execute(
                 f"EXPLAIN {clickhouse_sql}",
@@ -170,6 +182,7 @@ def execute_hogql_query(
         query=query,
         hogql=hogql,
         clickhouse=clickhouse_sql,
+        error=error,
         timings=timings.to_list(),
         results=results,
         columns=print_columns,
diff --git a/posthog/hogql_queries/events_query_runner.py b/posthog/hogql_queries/events_query_runner.py
index 6b168a3f7dd981..a1b69739956681 100644
--- a/posthog/hogql_queries/events_query_runner.py
+++ b/posthog/hogql_queries/events_query_runner.py
@@ -17,6 +17,7 @@
 from posthog.hogql_queries.query_runner import QueryRunner
 from posthog.models import Action, Person, Team
 from posthog.models.element import chain_to_elements
+from posthog.models.person.person import get_distinct_ids_for_subquery
 from posthog.models.person.util import get_persons_by_distinct_ids
 from posthog.schema import EventsQuery, EventsQueryResponse
 from posthog.utils import relative_date_parse
@@ -118,12 +119,10 @@ def to_query(self) -> ast.SelectQuery:
                         person: Optional[Person] = get_pk_or_uuid(
                             Person.objects.filter(team=self.team), self.query.personId
                         ).first()
-                        distinct_ids = person.distinct_ids if person is not None else []
-                        ids_list = list(map(str, distinct_ids))
                         where_exprs.append(
                             parse_expr(
                                 "distinct_id in {list}",
-                                {"list": ast.Constant(value=ids_list)},
+                                {"list": ast.Constant(value=get_distinct_ids_for_subquery(person, self.team))},
                                 timings=self.timings,
                             )
                         )
diff --git a/posthog/hogql_queries/hogql_query_runner.py b/posthog/hogql_queries/hogql_query_runner.py
index 576419fdff9670..4326a2ba7dbeee 100644
--- a/posthog/hogql_queries/hogql_query_runner.py
+++ b/posthog/hogql_queries/hogql_query_runner.py
@@ -65,6 +65,7 @@ def calculate(self) -> HogQLQueryResponse:
             workload=Workload.ONLINE,
             timings=self.timings,
             in_export_context=self.in_export_context,
+            explain=bool(self.query.explain),
         )
 
     def _is_stale(self, cached_result_package):
diff --git a/posthog/hogql_queries/insights/lifecycle_query_runner.py b/posthog/hogql_queries/insights/lifecycle_query_runner.py
index 49d85e094ed48a..307f508ebd39cb 100644
--- a/posthog/hogql_queries/insights/lifecycle_query_runner.py
+++ b/posthog/hogql_queries/insights/lifecycle_query_runner.py
@@ -117,7 +117,7 @@ def to_persons_query(
                 },
             )
 
-    def calculate(self):
+    def calculate(self) -> LifecycleQueryResponse:
         query = self.to_query()
         hogql = to_printed_hogql(query, self.team.pk)
 
@@ -147,10 +147,33 @@ def calculate(self):
                 for item in val[0]
             ]
 
-            label = "{} - {}".format("", val[2])  # entity.name
+            # legacy response compatibility object
+            action_object = {}
+            label = "{} - {}".format("", val[2])
+            if isinstance(self.query.series[0], ActionsNode):
+                action = Action.objects.get(pk=int(self.query.series[0].id), team=self.team)
+                label = "{} - {}".format(action.name, val[2])
+                action_object = {
+                    "id": str(action.pk),
+                    "name": action.name,
+                    "type": "actions",
+                    "order": 0,
+                    "math": "total",
+                }
+            elif isinstance(self.query.series[0], EventsNode):
+                label = "{} - {}".format(self.query.series[0].event, val[2])
+                action_object = {
+                    "id": self.query.series[0].event,
+                    "name": self.query.series[0].event,
+                    "type": "events",
+                    "order": 0,
+                    "math": "total",
+                }
+
             additional_values = {"label": label, "status": val[2]}
             res.append(
                 {
+                    "action": action_object,
                     "data": [float(c) for c in counts],
                     "count": float(sum(counts)),
                     "labels": labels,
diff --git a/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr b/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
new file mode 100644
index 00000000000000..962c5eecbee981
--- /dev/null
+++ b/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
@@ -0,0 +1,213 @@
+# name: TestLifecycleQueryRunner.test_sampling
+  '
+  SELECT groupArray(start_of_period) AS date,
+         groupArray(counts) AS total,
+         status
+  FROM
+    (SELECT if(ifNull(equals(status, 'dormant'), 0), negate(sum(counts)), negate(negate(sum(counts)))) AS counts,
+            start_of_period,
+            status
+     FROM
+       (SELECT periods.start_of_period AS start_of_period,
+               0 AS counts,
+               sec.status
+        FROM
+          (SELECT minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(numbers.number)) AS start_of_period
+           FROM numbers(dateDiff('day', dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), dateTrunc('day', plus(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC')), toIntervalDay(1))))) AS numbers) AS periods
+        CROSS JOIN
+          (SELECT status
+           FROM
+             (SELECT 1) ARRAY
+           JOIN ['new', 'returning', 'resurrecting', 'dormant'] AS status) AS sec
+        ORDER BY sec.status ASC, start_of_period ASC
+        UNION ALL SELECT start_of_period,
+                         count(DISTINCT person_id) AS counts,
+                         status
+        FROM
+          (SELECT events__pdi__person.id AS person_id,
+                  min(toTimeZone(events__pdi__person.created_at, 'UTC')) AS created_at,
+                  arraySort(groupUniqArray(dateTrunc('day', toTimeZone(events.timestamp, 'UTC')))) AS all_activity,
+                  arrayPopBack(arrayPushFront(all_activity, dateTrunc('day', created_at))) AS previous_activity,
+                  arrayPopFront(arrayPushBack(all_activity, dateTrunc('day', parseDateTime64BestEffortOrNull('1970-01-01 00:00:00', 6, 'UTC')))) AS following_activity,
+                  arrayMap((previous, current, index) -> if(ifNull(equals(previous, current), isNull(previous)
+                                                                   and isNull(current)), 'new', if(and(ifNull(equals(minus(current, toIntervalDay(1)), previous), isNull(minus(current, toIntervalDay(1)))
+                                                                                                              and isNull(previous)), ifNull(notEquals(index, 1), 1)), 'returning', 'resurrecting')), previous_activity, all_activity, arrayEnumerate(all_activity)) AS initial_status,
+                  arrayMap((current, next) -> if(ifNull(equals(plus(current, toIntervalDay(1)), next), isNull(plus(current, toIntervalDay(1)))
+                                                        and isNull(next)), '', 'dormant'), all_activity, following_activity) AS dormant_status,
+                  arrayMap(x -> plus(x, toIntervalDay(1)), arrayFilter((current, is_dormant) -> ifNull(equals(is_dormant, 'dormant'), 0), all_activity, dormant_status)) AS dormant_periods,
+                  arrayMap(x -> 'dormant', dormant_periods) AS dormant_label,
+                  arrayConcat(arrayZip(all_activity, initial_status), arrayZip(dormant_periods, dormant_label)) AS temp_concat,
+                  arrayJoin(temp_concat) AS period_status_pairs,
+                  period_status_pairs.1 AS start_of_period,
+                  period_status_pairs.2 AS status
+           FROM events SAMPLE 0.1
+           INNER JOIN
+             (SELECT argMax(person_distinct_id2.person_id, person_distinct_id2.version) AS person_id,
+                     person_distinct_id2.distinct_id AS distinct_id
+              FROM person_distinct_id2
+              WHERE equals(person_distinct_id2.team_id, 2)
+              GROUP BY person_distinct_id2.distinct_id
+              HAVING ifNull(equals(argMax(person_distinct_id2.is_deleted, person_distinct_id2.version), 0), 0)) AS events__pdi ON equals(events.distinct_id, events__pdi.distinct_id)
+           INNER JOIN
+             (SELECT argMax(person.created_at, person.version) AS created_at,
+                     person.id AS id
+              FROM person
+              WHERE equals(person.team_id, 2)
+              GROUP BY person.id
+              HAVING ifNull(equals(argMax(person.is_deleted, person.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS events__pdi__person ON equals(events__pdi.person_id, events__pdi__person.id)
+           WHERE and(equals(events.team_id, 2), greaterOrEquals(toTimeZone(events.timestamp, 'UTC'), minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), toIntervalDay(1))), less(toTimeZone(events.timestamp, 'UTC'), plus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(1))), equals(events.event, '$pageview'))
+           GROUP BY person_id)
+        GROUP BY start_of_period,
+                 status)
+     WHERE and(ifNull(lessOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC')))), 0), ifNull(greaterOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC')))), 0))
+     GROUP BY start_of_period,
+              status
+     ORDER BY start_of_period ASC)
+  GROUP BY status
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '
+---
+# name: TestLifecycleQueryRunner.test_timezones
+  '
+  SELECT groupArray(start_of_period) AS date,
+         groupArray(counts) AS total,
+         status
+  FROM
+    (SELECT if(ifNull(equals(status, 'dormant'), 0), negate(sum(counts)), negate(negate(sum(counts)))) AS counts,
+            start_of_period,
+            status
+     FROM
+       (SELECT periods.start_of_period AS start_of_period,
+               0 AS counts,
+               sec.status
+        FROM
+          (SELECT minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(numbers.number)) AS start_of_period
+           FROM numbers(dateDiff('day', dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), dateTrunc('day', plus(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC')), toIntervalDay(1))))) AS numbers) AS periods
+        CROSS JOIN
+          (SELECT status
+           FROM
+             (SELECT 1) ARRAY
+           JOIN ['new', 'returning', 'resurrecting', 'dormant'] AS status) AS sec
+        ORDER BY sec.status ASC, start_of_period ASC
+        UNION ALL SELECT start_of_period,
+                         count(DISTINCT person_id) AS counts,
+                         status
+        FROM
+          (SELECT events__pdi__person.id AS person_id,
+                  min(toTimeZone(events__pdi__person.created_at, 'UTC')) AS created_at,
+                  arraySort(groupUniqArray(dateTrunc('day', toTimeZone(events.timestamp, 'UTC')))) AS all_activity,
+                  arrayPopBack(arrayPushFront(all_activity, dateTrunc('day', created_at))) AS previous_activity,
+                  arrayPopFront(arrayPushBack(all_activity, dateTrunc('day', parseDateTime64BestEffortOrNull('1970-01-01 00:00:00', 6, 'UTC')))) AS following_activity,
+                  arrayMap((previous, current, index) -> if(ifNull(equals(previous, current), isNull(previous)
+                                                                   and isNull(current)), 'new', if(and(ifNull(equals(minus(current, toIntervalDay(1)), previous), isNull(minus(current, toIntervalDay(1)))
+                                                                                                              and isNull(previous)), ifNull(notEquals(index, 1), 1)), 'returning', 'resurrecting')), previous_activity, all_activity, arrayEnumerate(all_activity)) AS initial_status,
+                  arrayMap((current, next) -> if(ifNull(equals(plus(current, toIntervalDay(1)), next), isNull(plus(current, toIntervalDay(1)))
+                                                        and isNull(next)), '', 'dormant'), all_activity, following_activity) AS dormant_status,
+                  arrayMap(x -> plus(x, toIntervalDay(1)), arrayFilter((current, is_dormant) -> ifNull(equals(is_dormant, 'dormant'), 0), all_activity, dormant_status)) AS dormant_periods,
+                  arrayMap(x -> 'dormant', dormant_periods) AS dormant_label,
+                  arrayConcat(arrayZip(all_activity, initial_status), arrayZip(dormant_periods, dormant_label)) AS temp_concat,
+                  arrayJoin(temp_concat) AS period_status_pairs,
+                  period_status_pairs.1 AS start_of_period,
+                  period_status_pairs.2 AS status
+           FROM events
+           INNER JOIN
+             (SELECT argMax(person_distinct_id2.person_id, person_distinct_id2.version) AS person_id,
+                     person_distinct_id2.distinct_id AS distinct_id
+              FROM person_distinct_id2
+              WHERE equals(person_distinct_id2.team_id, 2)
+              GROUP BY person_distinct_id2.distinct_id
+              HAVING ifNull(equals(argMax(person_distinct_id2.is_deleted, person_distinct_id2.version), 0), 0)) AS events__pdi ON equals(events.distinct_id, events__pdi.distinct_id)
+           INNER JOIN
+             (SELECT argMax(person.created_at, person.version) AS created_at,
+                     person.id AS id
+              FROM person
+              WHERE equals(person.team_id, 2)
+              GROUP BY person.id
+              HAVING ifNull(equals(argMax(person.is_deleted, person.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS events__pdi__person ON equals(events__pdi.person_id, events__pdi__person.id)
+           WHERE and(equals(events.team_id, 2), greaterOrEquals(toTimeZone(events.timestamp, 'UTC'), minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), toIntervalDay(1))), less(toTimeZone(events.timestamp, 'UTC'), plus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(1))), equals(events.event, '$pageview'))
+           GROUP BY person_id)
+        GROUP BY start_of_period,
+                 status)
+     WHERE and(ifNull(lessOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC')))), 0), ifNull(greaterOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC')))), 0))
+     GROUP BY start_of_period,
+              status
+     ORDER BY start_of_period ASC)
+  GROUP BY status
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '
+---
+# name: TestLifecycleQueryRunner.test_timezones.1
+  '
+  SELECT groupArray(start_of_period) AS date,
+         groupArray(counts) AS total,
+         status
+  FROM
+    (SELECT if(ifNull(equals(status, 'dormant'), 0), negate(sum(counts)), negate(negate(sum(counts)))) AS counts,
+            start_of_period,
+            status
+     FROM
+       (SELECT periods.start_of_period AS start_of_period,
+               0 AS counts,
+               sec.status
+        FROM
+          (SELECT minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'US/Pacific'))), toIntervalDay(numbers.number)) AS start_of_period
+           FROM numbers(dateDiff('day', dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'US/Pacific'))), dateTrunc('day', plus(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'US/Pacific')), toIntervalDay(1))))) AS numbers) AS periods
+        CROSS JOIN
+          (SELECT status
+           FROM
+             (SELECT 1) ARRAY
+           JOIN ['new', 'returning', 'resurrecting', 'dormant'] AS status) AS sec
+        ORDER BY sec.status ASC, start_of_period ASC
+        UNION ALL SELECT start_of_period,
+                         count(DISTINCT person_id) AS counts,
+                         status
+        FROM
+          (SELECT events__pdi__person.id AS person_id,
+                  min(toTimeZone(events__pdi__person.created_at, 'US/Pacific')) AS created_at,
+                  arraySort(groupUniqArray(dateTrunc('day', toTimeZone(events.timestamp, 'US/Pacific')))) AS all_activity,
+                  arrayPopBack(arrayPushFront(all_activity, dateTrunc('day', created_at))) AS previous_activity,
+                  arrayPopFront(arrayPushBack(all_activity, dateTrunc('day', parseDateTime64BestEffortOrNull('1970-01-01 00:00:00', 6, 'US/Pacific')))) AS following_activity,
+                  arrayMap((previous, current, index) -> if(ifNull(equals(previous, current), isNull(previous)
+                                                                   and isNull(current)), 'new', if(and(ifNull(equals(minus(current, toIntervalDay(1)), previous), isNull(minus(current, toIntervalDay(1)))
+                                                                                                              and isNull(previous)), ifNull(notEquals(index, 1), 1)), 'returning', 'resurrecting')), previous_activity, all_activity, arrayEnumerate(all_activity)) AS initial_status,
+                  arrayMap((current, next) -> if(ifNull(equals(plus(current, toIntervalDay(1)), next), isNull(plus(current, toIntervalDay(1)))
+                                                        and isNull(next)), '', 'dormant'), all_activity, following_activity) AS dormant_status,
+                  arrayMap(x -> plus(x, toIntervalDay(1)), arrayFilter((current, is_dormant) -> ifNull(equals(is_dormant, 'dormant'), 0), all_activity, dormant_status)) AS dormant_periods,
+                  arrayMap(x -> 'dormant', dormant_periods) AS dormant_label,
+                  arrayConcat(arrayZip(all_activity, initial_status), arrayZip(dormant_periods, dormant_label)) AS temp_concat,
+                  arrayJoin(temp_concat) AS period_status_pairs,
+                  period_status_pairs.1 AS start_of_period,
+                  period_status_pairs.2 AS status
+           FROM events
+           INNER JOIN
+             (SELECT argMax(person_distinct_id2.person_id, person_distinct_id2.version) AS person_id,
+                     person_distinct_id2.distinct_id AS distinct_id
+              FROM person_distinct_id2
+              WHERE equals(person_distinct_id2.team_id, 2)
+              GROUP BY person_distinct_id2.distinct_id
+              HAVING ifNull(equals(argMax(person_distinct_id2.is_deleted, person_distinct_id2.version), 0), 0)) AS events__pdi ON equals(events.distinct_id, events__pdi.distinct_id)
+           INNER JOIN
+             (SELECT argMax(person.created_at, person.version) AS created_at,
+                     person.id AS id
+              FROM person
+              WHERE equals(person.team_id, 2)
+              GROUP BY person.id
+              HAVING ifNull(equals(argMax(person.is_deleted, person.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS events__pdi__person ON equals(events__pdi.person_id, events__pdi__person.id)
+           WHERE and(equals(events.team_id, 2), greaterOrEquals(toTimeZone(events.timestamp, 'US/Pacific'), minus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'US/Pacific'))), toIntervalDay(1))), less(toTimeZone(events.timestamp, 'US/Pacific'), plus(dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'US/Pacific'))), toIntervalDay(1))), equals(events.event, '$pageview'))
+           GROUP BY person_id)
+        GROUP BY start_of_period,
+                 status)
+     WHERE and(ifNull(lessOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'US/Pacific')))), 0), ifNull(greaterOrEquals(start_of_period, dateTrunc('day', assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'US/Pacific')))), 0))
+     GROUP BY start_of_period,
+              status
+     ORDER BY start_of_period ASC)
+  GROUP BY status
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '
+---
diff --git a/posthog/hogql_queries/insights/test/test_lifecycle_query_runner.py b/posthog/hogql_queries/insights/test/test_lifecycle_query_runner.py
index 1dba61d970e6cd..35bfa4499119fc 100644
--- a/posthog/hogql_queries/insights/test/test_lifecycle_query_runner.py
+++ b/posthog/hogql_queries/insights/test/test_lifecycle_query_runner.py
@@ -1,18 +1,37 @@
 from datetime import datetime
-
 from freezegun import freeze_time
-
 from posthog.hogql.query import execute_hogql_query
 from posthog.hogql_queries.insights.lifecycle_query_runner import LifecycleQueryRunner
 from posthog.models.utils import UUIDT
-from posthog.schema import DateRange, IntervalType, LifecycleQuery, EventsNode
+from posthog.schema import (
+    DateRange,
+    IntervalType,
+    LifecycleQuery,
+    EventsNode,
+    EventPropertyFilter,
+    PropertyOperator,
+    PersonPropertyFilter,
+    ActionsNode,
+)
 from posthog.test.base import (
     APIBaseTest,
     ClickhouseTestMixin,
     _create_event,
     _create_person,
     flush_persons_and_events,
+    snapshot_clickhouse_queries,
 )
+from posthog.models import Action, ActionStep
+from posthog.models.instance_setting import get_instance_setting
+
+
+def create_action(**kwargs):
+    team = kwargs.pop("team")
+    name = kwargs.pop("name")
+    event_name = kwargs.pop("event_name")
+    action = Action.objects.create(team=team, name=name)
+    ActionStep.objects.create(action=action, event=event_name)
+    return action
 
 
 class TestLifecycleQueryRunner(ClickhouseTestMixin, APIBaseTest):
@@ -146,7 +165,7 @@ def test_lifecycle_query_whole_range(self):
                         "2020-01-18",
                         "2020-01-19",
                     ],
-                    "label": " - new",
+                    "label": "$pageview - new",
                     "labels": [
                         "9-Jan-2020",
                         "10-Jan-2020",
@@ -161,6 +180,13 @@ def test_lifecycle_query_whole_range(self):
                         "19-Jan-2020",
                     ],
                     "status": "new",
+                    "action": {
+                        "id": "$pageview",
+                        "math": "total",
+                        "name": "$pageview",
+                        "order": 0,
+                        "type": "events",
+                    },
                 },
                 {
                     "count": 2.0,
@@ -190,7 +216,7 @@ def test_lifecycle_query_whole_range(self):
                         "2020-01-18",
                         "2020-01-19",
                     ],
-                    "label": " - returning",
+                    "label": "$pageview - returning",
                     "labels": [
                         "9-Jan-2020",
                         "10-Jan-2020",
@@ -205,6 +231,13 @@ def test_lifecycle_query_whole_range(self):
                         "19-Jan-2020",
                     ],
                     "status": "returning",
+                    "action": {
+                        "id": "$pageview",
+                        "math": "total",
+                        "name": "$pageview",
+                        "order": 0,
+                        "type": "events",
+                    },
                 },
                 {
                     "count": 4.0,
@@ -234,7 +267,7 @@ def test_lifecycle_query_whole_range(self):
                         "2020-01-18",
                         "2020-01-19",
                     ],
-                    "label": " - resurrecting",
+                    "label": "$pageview - resurrecting",
                     "labels": [
                         "9-Jan-2020",
                         "10-Jan-2020",
@@ -249,6 +282,13 @@ def test_lifecycle_query_whole_range(self):
                         "19-Jan-2020",
                     ],
                     "status": "resurrecting",
+                    "action": {
+                        "id": "$pageview",
+                        "math": "total",
+                        "name": "$pageview",
+                        "order": 0,
+                        "type": "events",
+                    },
                 },
                 {
                     "count": -7.0,
@@ -278,7 +318,7 @@ def test_lifecycle_query_whole_range(self):
                         "2020-01-18",
                         "2020-01-19",
                     ],
-                    "label": " - dormant",
+                    "label": "$pageview - dormant",
                     "labels": [
                         "9-Jan-2020",
                         "10-Jan-2020",
@@ -293,6 +333,13 @@ def test_lifecycle_query_whole_range(self):
                         "19-Jan-2020",
                     ],
                     "status": "dormant",
+                    "action": {
+                        "id": "$pageview",
+                        "math": "total",
+                        "name": "$pageview",
+                        "order": 0,
+                        "type": "events",
+                    },
                 },
             ],
             response.results,
@@ -346,3 +393,802 @@ def test_events_query_partial_range(self):
             },
             set(response.results),
         )
+
+    def test_lifecycle_trend(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_any_event(self):
+        self._create_events(
+            event="$pageview",
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+            ],
+        )
+        self._create_events(
+            event="$other",
+            data=[
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ],
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event=None)],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_with_zero_person_ids(self):
+        # only a person-on-event test
+        if not get_instance_setting("PERSON_ON_EVENTS_ENABLED"):
+            return True
+
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p5",
+            timestamp="2020-01-13T12:00:00Z",
+            person_id="00000000-0000-0000-0000-000000000000",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p5",
+            timestamp="2020-01-14T12:00:00Z",
+            person_id="00000000-0000-0000-0000-000000000000",
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_prop_filtering(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"name": "p1"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-11T12:00:00Z",
+            properties={"$number": 1},
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-12T12:00:00Z",
+            properties={"$number": 1},
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-13T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-15T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-17T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-19T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"name": "p2"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p2",
+            timestamp="2020-01-09T12:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p2",
+            timestamp="2020-01-12T12:00:00Z",
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"name": "p3"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p3",
+            timestamp="2020-01-12T12:00:00Z",
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p4"], properties={"name": "p4"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p4",
+            timestamp="2020-01-15T12:00:00Z",
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                    properties=[EventPropertyFilter(key="$number", value="1", operator=PropertyOperator.exact)],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, 0, -1, 0, -1, 0, -1, 0]},
+                {"status": "new", "data": [0, 0, 0, 0, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+        # entities filtering
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[
+                        EventsNode(
+                            event="$pageview",
+                            properties=[EventPropertyFilter(key="$number", value="1", operator=PropertyOperator.exact)],
+                        )
+                    ],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, 0, -1, 0, -1, 0, -1, 0]},
+                {"status": "new", "data": [0, 0, 0, 0, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_person_prop_filtering(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"name": "p1"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-11T12:00:00Z",
+            properties={"$number": 1},
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-12T12:00:00Z",
+            properties={"$number": 1},
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-13T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-15T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-17T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-19T12:00:00Z",
+            properties={"$number": 1},
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"name": "p2"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p2",
+            timestamp="2020-01-09T12:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p2",
+            timestamp="2020-01-12T12:00:00Z",
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"name": "p3"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p3",
+            timestamp="2020-01-12T12:00:00Z",
+        )
+
+        _create_person(team_id=self.team.pk, distinct_ids=["p4"], properties={"name": "p4"})
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p4",
+            timestamp="2020-01-15T12:00:00Z",
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[
+                        EventsNode(
+                            event="$pageview",
+                            properties=[PersonPropertyFilter(key="name", value="p1", operator=PropertyOperator.exact)],
+                        )
+                    ],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "new", "data": [0, 0, 0, 0, 0, 0, 0, 0]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "dormant", "data": [0, 0, -1, 0, -1, 0, -1, 0]},
+            ],
+        )
+
+    def test_lifecycle_trends_distinct_id_repeat(self):
+        with freeze_time("2020-01-12T12:00:00Z"):
+            _create_person(
+                team_id=self.team.pk,
+                distinct_ids=["p1", "another_p1"],
+                properties={"name": "p1"},
+            )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-12T12:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="another_p1",
+            timestamp="2020-01-14T12:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-15T12:00:00Z",
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-17T12:00:00Z",
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="p1",
+            timestamp="2020-01-19T12:00:00Z",
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -1, 0, 0, -1, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 0, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 1, 0, 0, 1, 0, 1]},
+                {"status": "returning", "data": [0, 0, 0, 1, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_action(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        pageview_action = create_action(team=self.team, name="$pageview", event_name="$pageview")
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[ActionsNode(id=pageview_action.pk)],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_all_time(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        with freeze_time("2020-01-17T13:01:01Z"):
+            result = (
+                LifecycleQueryRunner(
+                    team=self.team,
+                    query=LifecycleQuery(
+                        dateRange=DateRange(date_from="all"),
+                        interval=IntervalType.day,
+                        series=[EventsNode(event="$pageview")],
+                    ),
+                )
+                .calculate()
+                .results
+            )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -1, 0, 0, -2, -1, 0, -2, 0]},
+                {"status": "new", "data": [1, 0, 1, 1, 0, 0, 1, 0, 0]},
+                {"status": "returning", "data": [0, 0, 0, 1, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 0, 1, 0, 0, 1, 0, 1]},
+            ],
+        )
+
+    def test_lifecycle_trend_weeks(self):
+        # lifecycle weeks rounds the date to the nearest following week  2/5 -> 2/10
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-02-01T12:00:00Z",
+                        "2020-02-05T12:00:00Z",
+                        "2020-02-10T12:00:00Z",
+                        "2020-02-15T12:00:00Z",
+                        "2020-02-27T12:00:00Z",
+                        "2020-03-02T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-02-11T12:00:00Z", "2020-02-18T12:00:00Z"]),
+                ("p3", ["2020-02-12T12:00:00Z"]),
+                ("p4", ["2020-02-27T12:00:00Z"]),
+            ]
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-02-05T00:00:00Z", date_to="2020-03-09T00:00:00Z"),
+                    interval=IntervalType.week,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        self.assertEqual(
+            result[0]["days"],
+            [
+                "2020-02-03",
+                "2020-02-10",
+                "2020-02-17",
+                "2020-02-24",
+                "2020-03-02",
+                "2020-03-09",
+            ],
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, 0, -2, -1, -1, -1]},
+                {"status": "new", "data": [0, 2, 0, 1, 0, 0]},
+                {"status": "resurrecting", "data": [0, 0, 0, 1, 0, 0]},
+                {"status": "returning", "data": [1, 1, 1, 0, 1, 0]},
+            ],
+        )
+
+    def test_lifecycle_trend_months(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-02-12T12:00:00Z",
+                        "2020-03-13T12:00:00Z",
+                        "2020-05-15T12:00:00Z",
+                        "2020-07-17T12:00:00Z",
+                        "2020-09-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2019-12-09T12:00:00Z", "2020-02-12T12:00:00Z"]),
+                ("p3", ["2020-02-12T12:00:00Z"]),
+                ("p4", ["2020-05-15T12:00:00Z"]),
+            ]
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-02-01T00:00:00Z", date_to="2020-09-01T00:00:00Z"),
+                    interval=IntervalType.month,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    def test_filter_test_accounts(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",  # p1 gets test@posthog.com as email and gets filtered out
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                    filterTestAccounts=True,
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, 0, 0, -1, 0, 0, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 0, 0, 0, 0, 0]},
+                {"status": "returning", "data": [0, 0, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    @snapshot_clickhouse_queries
+    def test_timezones(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T23:00:00Z",
+                        "2020-01-12T01:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        result = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result,
+            [
+                {"status": "dormant", "data": [0, -2, -1, 0, -2, 0, -1, 0]},
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 0, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [1, 1, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+        self.team.timezone = "US/Pacific"
+        self.team.save()
+
+        result_pacific = (
+            LifecycleQueryRunner(
+                team=self.team,
+                query=LifecycleQuery(
+                    dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                    interval=IntervalType.day,
+                    series=[EventsNode(event="$pageview")],
+                ),
+            )
+            .calculate()
+            .results
+        )
+
+        assertLifecycleResults(
+            result_pacific,
+            [
+                {
+                    "status": "dormant",
+                    "data": [-1.0, -2.0, -1.0, 0.0, -2.0, 0.0, -1.0, 0.0],
+                },
+                {"status": "new", "data": [1, 0, 0, 1, 0, 0, 0, 0]},
+                {"status": "resurrecting", "data": [1, 1, 0, 1, 0, 1, 0, 1]},
+                {"status": "returning", "data": [0, 0, 0, 0, 0, 0, 0, 0]},
+            ],
+        )
+
+    # Ensure running the query with sampling works + generate a snapshot that shows sampling in the query
+    @snapshot_clickhouse_queries
+    def test_sampling(self):
+        self._create_events(
+            data=[
+                (
+                    "p1",
+                    [
+                        "2020-01-11T12:00:00Z",
+                        "2020-01-12T12:00:00Z",
+                        "2020-01-13T12:00:00Z",
+                        "2020-01-15T12:00:00Z",
+                        "2020-01-17T12:00:00Z",
+                        "2020-01-19T12:00:00Z",
+                    ],
+                ),
+                ("p2", ["2020-01-09T12:00:00Z", "2020-01-12T12:00:00Z"]),
+                ("p3", ["2020-01-12T12:00:00Z"]),
+                ("p4", ["2020-01-15T12:00:00Z"]),
+            ]
+        )
+
+        LifecycleQueryRunner(
+            team=self.team,
+            query=LifecycleQuery(
+                dateRange=DateRange(date_from="2020-01-12T00:00:00Z", date_to="2020-01-19T00:00:00Z"),
+                interval=IntervalType.day,
+                series=[EventsNode(event="$pageview")],
+                samplingFactor=0.1,
+            ),
+        ).calculate()
+
+
+def assertLifecycleResults(results, expected):
+    sorted_results = [{"status": r["status"], "data": r["data"]} for r in sorted(results, key=lambda r: r["status"])]
+    sorted_expected = list(sorted(expected, key=lambda r: r["status"]))
+
+    assert sorted_results == sorted_expected
diff --git a/posthog/hogql_queries/insights/trends/aggregation_operations.py b/posthog/hogql_queries/insights/trends/aggregation_operations.py
index e380f9a25865d6..38ca1cec71c4eb 100644
--- a/posthog/hogql_queries/insights/trends/aggregation_operations.py
+++ b/posthog/hogql_queries/insights/trends/aggregation_operations.py
@@ -13,7 +13,7 @@ class QueryAlternator:
     _group_bys: List[ast.Expr]
     _select_from: ast.JoinExpr | None
 
-    def __init__(self, query: ast.SelectQuery):
+    def __init__(self, query: ast.SelectQuery | ast.SelectUnionQuery):
         assert isinstance(query, ast.SelectQuery)
 
         self._query = query
@@ -21,7 +21,7 @@ def __init__(self, query: ast.SelectQuery):
         self._group_bys = []
         self._select_from = None
 
-    def build(self) -> ast.SelectQuery:
+    def build(self) -> ast.SelectQuery | ast.SelectUnionQuery:
         if len(self._selects) > 0:
             self._query.select.extend(self._selects)
 
@@ -89,7 +89,7 @@ def select_aggregation(self) -> ast.Expr:
             else:
                 raise NotImplementedError()
 
-        return parse_expr("count(e.uuid)")
+        return parse_expr("count(e.uuid)")  # All "count per actor" get replaced during query orchestration
 
     def requires_query_orchestration(self) -> bool:
         math_to_return_true = [
diff --git a/posthog/hogql_queries/insights/trends/breakdown_values.py b/posthog/hogql_queries/insights/trends/breakdown_values.py
index 3754d24bab70b3..64e2500e47e500 100644
--- a/posthog/hogql_queries/insights/trends/breakdown_values.py
+++ b/posthog/hogql_queries/insights/trends/breakdown_values.py
@@ -34,14 +34,14 @@ def __init__(
         self.histogram_bin_count = int(histogram_bin_count) if histogram_bin_count is not None else None
         self.group_type_index = int(group_type_index) if group_type_index is not None else None
 
-    def get_breakdown_values(self) -> List[str]:
+    def get_breakdown_values(self) -> List[str | int]:
         if self.breakdown_type == "cohort":
             return [int(self.breakdown_field)]
 
         if self.breakdown_type == "hogql":
             select_field = ast.Alias(
                 alias="value",
-                expr=parse_expr(self.breakdown_field),
+                expr=parse_expr(str(self.breakdown_field)),
             )
         else:
             select_field = ast.Alias(
diff --git a/posthog/hogql_queries/insights/trends/display.py b/posthog/hogql_queries/insights/trends/display.py
new file mode 100644
index 00000000000000..db0fa29e0045e0
--- /dev/null
+++ b/posthog/hogql_queries/insights/trends/display.py
@@ -0,0 +1,68 @@
+from posthog.hogql import ast
+from posthog.schema import ChartDisplayType
+
+
+class TrendsDisplay:
+    display_type: ChartDisplayType
+
+    def __init__(self, display_type: ChartDisplayType) -> None:
+        self.display_type = display_type
+
+    def should_aggregate_values(self) -> bool:
+        return (
+            self.display_type == ChartDisplayType.BoldNumber
+            or self.display_type == ChartDisplayType.ActionsPie
+            or self.display_type == ChartDisplayType.ActionsBarValue
+            or self.display_type == ChartDisplayType.WorldMap
+        )
+
+    def wrap_inner_query(self, inner_query: ast.SelectQuery, breakdown_enabled: bool) -> ast.SelectQuery:
+        if self.display_type == ChartDisplayType.ActionsLineGraphCumulative:
+            return self._get_cumulative_query(inner_query, breakdown_enabled)
+
+        return inner_query
+
+    def should_wrap_inner_query(self) -> bool:
+        return self.display_type == ChartDisplayType.ActionsLineGraphCumulative
+
+    def modify_outer_query(self, outer_query: ast.SelectQuery, inner_query: ast.SelectQuery) -> ast.SelectQuery:
+        if (
+            self.display_type == ChartDisplayType.BoldNumber
+            or self.display_type == ChartDisplayType.ActionsPie
+            or self.display_type == ChartDisplayType.WorldMap
+        ):
+            return ast.SelectQuery(
+                select=[
+                    ast.Alias(
+                        alias="total",
+                        expr=ast.Call(name="sum", args=[ast.Field(chain=["count"])]),
+                    )
+                ],
+                select_from=ast.JoinExpr(table=inner_query),
+            )
+
+        return outer_query
+
+    def _get_cumulative_query(self, inner_query: ast.SelectQuery, breakdown_enabled: bool) -> ast.SelectQuery:
+        if breakdown_enabled:
+            window_expr = ast.WindowExpr(
+                order_by=[ast.OrderExpr(expr=ast.Field(chain=["day_start"]), order="ASC")],
+                partition_by=[ast.Field(chain=["breakdown_value"])],
+            )
+        else:
+            window_expr = ast.WindowExpr(order_by=[ast.OrderExpr(expr=ast.Field(chain=["day_start"]), order="ASC")])
+
+        return ast.SelectQuery(
+            select=[
+                ast.Field(chain=["day_start"]),
+                ast.Alias(
+                    alias="count",
+                    expr=ast.WindowFunction(
+                        name="sum",
+                        args=[ast.Field(chain=["count"])],
+                        over_expr=window_expr,
+                    ),
+                ),
+            ],
+            select_from=ast.JoinExpr(table=inner_query),
+        )
diff --git a/posthog/hogql_queries/insights/trends/query_builder.py b/posthog/hogql_queries/insights/trends/query_builder.py
index 859f6a2f5e6911..ddf873f10a0da0 100644
--- a/posthog/hogql_queries/insights/trends/query_builder.py
+++ b/posthog/hogql_queries/insights/trends/query_builder.py
@@ -7,11 +7,12 @@
     AggregationOperations,
 )
 from posthog.hogql_queries.insights.trends.breakdown import Breakdown
+from posthog.hogql_queries.insights.trends.display import TrendsDisplay
 from posthog.hogql_queries.insights.trends.utils import series_event_name
 from posthog.hogql_queries.utils.query_date_range import QueryDateRange
 from posthog.models.filters.mixins.utils import cached_property
 from posthog.models.team.team import Team
-from posthog.schema import ActionsNode, EventsNode, TrendsQuery
+from posthog.schema import ActionsNode, ChartDisplayType, EventsNode, TrendsQuery
 
 
 class TrendsQueryBuilder:
@@ -196,6 +197,8 @@ def _outer_select_query(self, inner_query: ast.SelectQuery) -> ast.SelectQuery:
             ),
         )
 
+        query = self._trends_display.modify_outer_query(outer_query=query, inner_query=inner_query)
+
         if self._breakdown.enabled:
             query.select.append(ast.Field(chain=["breakdown_value"]))
             query.group_by = [ast.Field(chain=["breakdown_value"])]
@@ -224,6 +227,11 @@ def _inner_select_query(self, inner_query: ast.SelectUnionQuery) -> ast.SelectQu
             query.group_by.append(ast.Field(chain=["breakdown_value"]))
             query.order_by.append(ast.OrderExpr(expr=ast.Field(chain=["breakdown_value"]), order="ASC"))
 
+        if self._trends_display.should_wrap_inner_query():
+            query = self._trends_display.wrap_inner_query(query, self._breakdown.enabled)
+            if self._breakdown.enabled:
+                query.select.append(ast.Field(chain=["breakdown_value"]))
+
         return query
 
     def _events_filter(self) -> ast.Expr:
@@ -298,5 +306,14 @@ def _breakdown(self):
         )
 
     @cached_property
-    def _aggregation_operation(self):
+    def _aggregation_operation(self) -> AggregationOperations:
         return AggregationOperations(self.series, self.query_date_range)
+
+    @cached_property
+    def _trends_display(self) -> TrendsDisplay:
+        if self.query.trendsFilter is None or self.query.trendsFilter.display is None:
+            display = ChartDisplayType.ActionsLineGraph
+        else:
+            display = self.query.trendsFilter.display
+
+        return TrendsDisplay(display)
diff --git a/posthog/hogql_queries/insights/trends/series_with_extras.py b/posthog/hogql_queries/insights/trends/series_with_extras.py
index df8ff57fb0e7d5..fb63a205f33d0d 100644
--- a/posthog/hogql_queries/insights/trends/series_with_extras.py
+++ b/posthog/hogql_queries/insights/trends/series_with_extras.py
@@ -6,13 +6,16 @@ class SeriesWithExtras:
     series: EventsNode | ActionsNode
     is_previous_period_series: Optional[bool]
     overriden_query: Optional[TrendsQuery]
+    aggregate_values: Optional[bool]
 
     def __init__(
         self,
         series: EventsNode | ActionsNode,
         is_previous_period_series: Optional[bool],
         overriden_query: Optional[TrendsQuery],
+        aggregate_values: Optional[bool],
     ):
         self.series = series
         self.is_previous_period_series = is_previous_period_series
         self.overriden_query = overriden_query
+        self.aggregate_values = aggregate_values
diff --git a/posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py b/posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py
index 656f2dc26ee697..06ae5974976eec 100644
--- a/posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py
+++ b/posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py
@@ -1,7 +1,21 @@
-from typing import cast
+from datetime import datetime
+from typing import Literal, Union, cast
+
+import pytest
 from posthog.hogql import ast
 from posthog.hogql.parser import parse_select
-from posthog.hogql_queries.insights.trends.aggregation_operations import QueryAlternator
+from posthog.hogql_queries.insights.trends.aggregation_operations import (
+    AggregationOperations,
+    QueryAlternator,
+)
+from posthog.hogql_queries.utils.query_date_range import QueryDateRange
+from posthog.models.team.team import Team
+from posthog.schema import (
+    BaseMathType,
+    CountPerActorMathType,
+    EventsNode,
+    PropertyMathType,
+)
 
 
 class TestQueryAlternator:
@@ -44,3 +58,91 @@ def test_replace_select_from(self):
         query_modifier.build()
 
         assert query.select_from.table.chain == ["groups"]
+
+
+@pytest.mark.parametrize(
+    "math,math_property",
+    [
+        [BaseMathType.total, None],
+        [BaseMathType.dau, None],
+        [BaseMathType.weekly_active, None],
+        [BaseMathType.monthly_active, None],
+        [BaseMathType.unique_session, None],
+        [PropertyMathType.avg, "$browser"],
+        [PropertyMathType.sum, "$browser"],
+        [PropertyMathType.min, "$browser"],
+        [PropertyMathType.max, "$browser"],
+        [PropertyMathType.median, "$browser"],
+        [PropertyMathType.p90, "$browser"],
+        [PropertyMathType.p95, "$browser"],
+        [PropertyMathType.p99, "$browser"],
+        [CountPerActorMathType.avg_count_per_actor, None],
+        [CountPerActorMathType.min_count_per_actor, None],
+        [CountPerActorMathType.max_count_per_actor, None],
+        [CountPerActorMathType.median_count_per_actor, None],
+        [CountPerActorMathType.p90_count_per_actor, None],
+        [CountPerActorMathType.p95_count_per_actor, None],
+        [CountPerActorMathType.p99_count_per_actor, None],
+        ["hogql", None],
+    ],
+)
+def test_all_cases_return(
+    math: Union[
+        BaseMathType,
+        PropertyMathType,
+        CountPerActorMathType,
+        Literal["unique_group"],
+        Literal["hogql"],
+    ],
+    math_property: str,
+):
+    series = EventsNode(event="$pageview", math=math, math_property=math_property)
+    query_date_range = QueryDateRange(date_range=None, interval=None, now=datetime.now(), team=Team())
+
+    agg_ops = AggregationOperations(series, query_date_range)
+    res = agg_ops.select_aggregation()
+    assert isinstance(res, ast.Expr)
+
+
+@pytest.mark.parametrize(
+    "math,result",
+    [
+        [BaseMathType.total, False],
+        [BaseMathType.dau, False],
+        [BaseMathType.weekly_active, True],
+        [BaseMathType.monthly_active, True],
+        [BaseMathType.unique_session, False],
+        [PropertyMathType.avg, False],
+        [PropertyMathType.sum, False],
+        [PropertyMathType.min, False],
+        [PropertyMathType.max, False],
+        [PropertyMathType.median, False],
+        [PropertyMathType.p90, False],
+        [PropertyMathType.p95, False],
+        [PropertyMathType.p99, False],
+        [CountPerActorMathType.avg_count_per_actor, True],
+        [CountPerActorMathType.min_count_per_actor, True],
+        [CountPerActorMathType.max_count_per_actor, True],
+        [CountPerActorMathType.median_count_per_actor, True],
+        [CountPerActorMathType.p90_count_per_actor, True],
+        [CountPerActorMathType.p95_count_per_actor, True],
+        [CountPerActorMathType.p99_count_per_actor, True],
+        ["hogql", False],
+    ],
+)
+def test_requiring_query_orchestration(
+    math: Union[
+        BaseMathType,
+        PropertyMathType,
+        CountPerActorMathType,
+        Literal["unique_group"],
+        Literal["hogql"],
+    ],
+    result: bool,
+):
+    series = EventsNode(event="$pageview", math=math)
+    query_date_range = QueryDateRange(date_range=None, interval=None, now=datetime.now(), team=Team())
+
+    agg_ops = AggregationOperations(series, query_date_range)
+    res = agg_ops.requires_query_orchestration()
+    assert res == result
diff --git a/posthog/hogql_queries/insights/trends/test/test_query_builder.py b/posthog/hogql_queries/insights/trends/test/test_query_builder.py
new file mode 100644
index 00000000000000..ce65a1605123cf
--- /dev/null
+++ b/posthog/hogql_queries/insights/trends/test/test_query_builder.py
@@ -0,0 +1,122 @@
+from datetime import datetime
+from freezegun import freeze_time
+
+from posthog.hogql.query import execute_hogql_query
+from posthog.hogql.timings import HogQLTimings
+from posthog.hogql_queries.insights.trends.query_builder import TrendsQueryBuilder
+from posthog.hogql_queries.utils.query_date_range import QueryDateRange
+from posthog.schema import (
+    BaseMathType,
+    BreakdownFilter,
+    BreakdownType,
+    ChartDisplayType,
+    DateRange,
+    EventsNode,
+    HogQLQueryResponse,
+    TrendsFilter,
+    TrendsQuery,
+)
+from posthog.test.base import BaseTest, _create_event, _create_person
+
+
+class TestQueryBuilder(BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        with freeze_time("2023-02-01"):
+            _create_person(
+                distinct_ids=["some_id"],
+                team_id=self.team.pk,
+                properties={"$some_prop": "something", "$another_prop": "something"},
+            )
+            _create_event(
+                event="$pageview",
+                team=self.team,
+                distinct_id="some_id",
+                properties={"$geoip_country_code": "AU"},
+            )
+
+    def get_response(self, trends_query: TrendsQuery) -> HogQLQueryResponse:
+        query_date_range = QueryDateRange(
+            date_range=trends_query.dateRange,
+            team=self.team,
+            interval=trends_query.interval,
+            now=datetime.now(),
+        )
+
+        timings = HogQLTimings()
+
+        query_builder = TrendsQueryBuilder(
+            trends_query=trends_query,
+            team=self.team,
+            query_date_range=query_date_range,
+            series=trends_query.series[0],
+            timings=timings,
+        )
+
+        query = query_builder.build_query()
+
+        return execute_hogql_query(
+            query_type="TrendsQuery",
+            query=query,
+            team=self.team,
+            timings=timings,
+        )
+
+    def test_column_names(self):
+        trends_query = TrendsQuery(
+            kind="TrendsQuery",
+            dateRange=DateRange(date_from="2023-01-01"),
+            series=[EventsNode(event="$pageview", math=BaseMathType.total)],
+        )
+
+        response = self.get_response(trends_query)
+
+        assert response.columns is not None
+        assert set(response.columns).issubset({"date", "total", "breakdown_value"})
+
+    def assert_column_names_with_display_type(self, display_type: ChartDisplayType):
+        trends_query = TrendsQuery(
+            kind="TrendsQuery",
+            dateRange=DateRange(date_from="2023-01-01"),
+            series=[EventsNode(event="$pageview")],
+            trendsFilter=TrendsFilter(display=display_type),
+        )
+
+        response = self.get_response(trends_query)
+
+        assert response.columns is not None
+        assert set(response.columns).issubset({"date", "total", "breakdown_value"})
+
+    def assert_column_names_with_display_type_and_breakdowns(self, display_type: ChartDisplayType):
+        trends_query = TrendsQuery(
+            kind="TrendsQuery",
+            dateRange=DateRange(date_from="2023-01-01"),
+            series=[EventsNode(event="$pageview")],
+            trendsFilter=TrendsFilter(display=display_type),
+            breakdown=BreakdownFilter(breakdown="$geoip_country_code", breakdown_type=BreakdownType.event),
+        )
+
+        response = self.get_response(trends_query)
+
+        assert response.columns is not None
+        assert set(response.columns).issubset({"date", "total", "breakdown_value"})
+
+    def test_column_names_with_display_type(self):
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsAreaGraph)
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsBar)
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsBarValue)
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsLineGraph)
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsPie)
+        self.assert_column_names_with_display_type(ChartDisplayType.BoldNumber)
+        self.assert_column_names_with_display_type(ChartDisplayType.WorldMap)
+        self.assert_column_names_with_display_type(ChartDisplayType.ActionsLineGraphCumulative)
+
+    def test_column_names_with_display_type_and_breakdowns(self):
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsAreaGraph)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsBar)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsBarValue)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsLineGraph)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsPie)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.WorldMap)
+        self.assert_column_names_with_display_type_and_breakdowns(ChartDisplayType.ActionsLineGraphCumulative)
diff --git a/posthog/hogql_queries/insights/trends/test/test_trends_query_runner.py b/posthog/hogql_queries/insights/trends/test/test_trends_query_runner.py
index 88e012672e12d0..f6afdfd591e852 100644
--- a/posthog/hogql_queries/insights/trends/test/test_trends_query_runner.py
+++ b/posthog/hogql_queries/insights/trends/test/test_trends_query_runner.py
@@ -1,12 +1,21 @@
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import Dict, List, Optional
 from freezegun import freeze_time
 from posthog.hogql_queries.insights.trends.trends_query_runner import TrendsQueryRunner
+from posthog.models.cohort.cohort import Cohort
+from posthog.models.property_definition import PropertyDefinition
 
 from posthog.schema import (
+    ActionsNode,
+    BaseMathType,
+    BreakdownFilter,
+    BreakdownType,
+    ChartDisplayType,
+    CountPerActorMathType,
     DateRange,
     EventsNode,
     IntervalType,
+    PropertyMathType,
     TrendsFilter,
     TrendsQuery,
 )
@@ -28,6 +37,7 @@ class Series:
 class SeriesTestData:
     distinct_id: str
     events: List[Series]
+    properties: Dict[str, str | int]
 
 
 class TestQuery(ClickhouseTestMixin, APIBaseTest):
@@ -36,9 +46,22 @@ class TestQuery(ClickhouseTestMixin, APIBaseTest):
 
     def _create_events(self, data: List[SeriesTestData]):
         person_result = []
+        properties_to_create: Dict[str, str] = {}
         for person in data:
             first_timestamp = person.events[0].timestamps[0]
 
+            for key, value in person.properties.items():
+                if key not in properties_to_create:
+                    if isinstance(value, str):
+                        type = "String"
+                    elif isinstance(value, bool):
+                        type = "Boolean"
+                    elif isinstance(value, int):
+                        type = "Numeric"
+                    else:
+                        type = "String"
+                    properties_to_create[key] = type
+
             with freeze_time(first_timestamp):
                 person_result.append(
                     _create_person(
@@ -55,9 +78,14 @@ def _create_events(self, data: List[SeriesTestData]):
                     _create_event(
                         team=self.team,
                         event=event.event,
-                        distinct_id=id,
+                        distinct_id=person.distinct_id,
                         timestamp=timestamp,
+                        properties=person.properties,
                     )
+
+        for key, value in properties_to_create.items():
+            PropertyDefinition.objects.create(team=self.team, name=key, property_type=value)
+
         return person_result
 
     def _create_test_events(self):
@@ -86,6 +114,7 @@ def _create_test_events(self):
                             ],
                         ),
                     ],
+                    properties={"$browser": "Chrome", "prop": 10, "bool_field": True},
                 ),
                 SeriesTestData(
                     distinct_id="p2",
@@ -101,6 +130,7 @@ def _create_test_events(self):
                             ],
                         ),
                     ],
+                    properties={"$browser": "Firefox", "prop": 20, "bool_field": False},
                 ),
                 SeriesTestData(
                     distinct_id="p3",
@@ -108,6 +138,7 @@ def _create_test_events(self):
                         Series(event="$pageview", timestamps=["2020-01-12T12:00:00Z"]),
                         Series(event="$pageleave", timestamps=["2020-01-13T12:00:00Z"]),
                     ],
+                    properties={"$browser": "Edge", "prop": 30, "bool_field": True},
                 ),
                 SeriesTestData(
                     distinct_id="p4",
@@ -115,55 +146,94 @@ def _create_test_events(self):
                         Series(event="$pageview", timestamps=["2020-01-15T12:00:00Z"]),
                         Series(event="$pageleave", timestamps=["2020-01-16T12:00:00Z"]),
                     ],
+                    properties={"$browser": "Safari", "prop": 40, "bool_field": False},
                 ),
             ]
         )
 
-    def _create_query_runner(self, date_from, date_to, interval, series, trends_filters) -> TrendsQueryRunner:
-        query_series = [EventsNode(event="$pageview")] if series is None else series
+    def _create_query_runner(
+        self,
+        date_from: str,
+        date_to: str,
+        interval: IntervalType,
+        series: Optional[List[EventsNode | ActionsNode]],
+        trends_filters: Optional[TrendsFilter],
+        breakdown: Optional[BreakdownFilter],
+    ) -> TrendsQueryRunner:
+        query_series: List[EventsNode | ActionsNode] = [EventsNode(event="$pageview")] if series is None else series
         query = TrendsQuery(
             dateRange=DateRange(date_from=date_from, date_to=date_to),
             interval=interval,
             series=query_series,
             trendsFilter=trends_filters,
+            breakdown=breakdown,
         )
         return TrendsQueryRunner(team=self.team, query=query)
 
     def _run_trends_query(
         self,
-        date_from,
-        date_to,
-        interval,
-        series=None,
+        date_from: str,
+        date_to: str,
+        interval: IntervalType,
+        series: Optional[List[EventsNode | ActionsNode]],
         trends_filters: Optional[TrendsFilter] = None,
+        breakdown: Optional[BreakdownFilter] = None,
     ):
-        return self._create_query_runner(date_from, date_to, interval, series, trends_filters).calculate()
+        return self._create_query_runner(date_from, date_to, interval, series, trends_filters, breakdown).calculate()
 
     def test_trends_query_label(self):
         self._create_test_events()
 
-        response = self._run_trends_query(self.default_date_from, self.default_date_to, IntervalType.day)
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_to,
+            IntervalType.day,
+            None,
+            None,
+            None,
+        )
 
         self.assertEqual("$pageview", response.results[0]["label"])
 
     def test_trends_query_count(self):
         self._create_test_events()
 
-        response = self._run_trends_query(self.default_date_from, self.default_date_to, IntervalType.day)
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_to,
+            IntervalType.day,
+            None,
+            None,
+            None,
+        )
 
         self.assertEqual(10, response.results[0]["count"])
 
     def test_trends_query_data(self):
         self._create_test_events()
 
-        response = self._run_trends_query(self.default_date_from, self.default_date_to, IntervalType.day)
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_to,
+            IntervalType.day,
+            None,
+            None,
+            None,
+        )
 
         self.assertEqual([1, 0, 1, 3, 1, 0, 2, 0, 1, 0, 1], response.results[0]["data"])
 
     def test_trends_query_days(self):
         self._create_test_events()
 
-        response = self._run_trends_query(self.default_date_from, self.default_date_to, IntervalType.day)
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_to,
+            IntervalType.day,
+            None,
+            None,
+            None,
+        )
 
         self.assertEqual(
             [
@@ -185,7 +255,14 @@ def test_trends_query_days(self):
     def test_trends_query_labels(self):
         self._create_test_events()
 
-        response = self._run_trends_query(self.default_date_from, self.default_date_to, IntervalType.day)
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_to,
+            IntervalType.day,
+            None,
+            None,
+            None,
+        )
 
         self.assertEqual(
             [
@@ -204,6 +281,24 @@ def test_trends_query_labels(self):
             response.results[0]["labels"],
         )
 
+    def test_trends_query_labels_hour(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            self.default_date_from,
+            self.default_date_from,
+            IntervalType.hour,
+            [EventsNode(event="$pageview")],
+        )
+
+        self.assertEqual(
+            [
+                "9-Jan-2020 00:00",
+            ],
+            response.results[0]["labels"],
+            response.results[0]["labels"],
+        )
+
     def test_trends_query_multiple_series(self):
         self._create_test_events()
 
@@ -308,3 +403,520 @@ def test_trends_query_formula_with_compare(self):
 
         self.assertEqual("Formula (A+B)", response.results[0]["label"])
         self.assertEqual("Formula (A+B)", response.results[1]["label"])
+
+    def test_trends_breakdowns(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            None,
+            BreakdownFilter(breakdown_type=BreakdownType.event, breakdown="$browser"),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 4
+        assert breakdown_labels == ["Chrome", "Edge", "Firefox", "Safari"]
+        assert response.results[0]["label"] == f"$pageview - Chrome"
+        assert response.results[1]["label"] == f"$pageview - Edge"
+        assert response.results[2]["label"] == f"$pageview - Firefox"
+        assert response.results[3]["label"] == f"$pageview - Safari"
+        assert response.results[0]["count"] == 6
+        assert response.results[1]["count"] == 1
+        assert response.results[2]["count"] == 2
+        assert response.results[3]["count"] == 1
+
+    def test_trends_breakdowns_boolean(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            None,
+            BreakdownFilter(breakdown_type=BreakdownType.event, breakdown="bool_field"),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 2
+        assert breakdown_labels == ["false", "true"]
+
+        assert response.results[0]["label"] == f"$pageview - false"
+        assert response.results[1]["label"] == f"$pageview - true"
+
+        assert response.results[0]["count"] == 3
+        assert response.results[1]["count"] == 7
+
+    def test_trends_breakdowns_histogram(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            None,
+            BreakdownFilter(
+                breakdown_type=BreakdownType.event,
+                breakdown="prop",
+                breakdown_histogram_bin_count=4,
+            ),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 5
+        assert breakdown_labels == [
+            '["",""]',
+            "[10.0,17.5]",
+            "[17.5,25.0]",
+            "[25.0,32.5]",
+            "[32.5,40.01]",
+        ]
+
+        assert response.results[0]["label"] == '$pageview - ["",""]'
+        assert response.results[1]["label"] == "$pageview - [10.0,17.5]"
+        assert response.results[2]["label"] == "$pageview - [17.5,25.0]"
+        assert response.results[3]["label"] == "$pageview - [25.0,32.5]"
+        assert response.results[4]["label"] == "$pageview - [32.5,40.01]"
+
+        assert response.results[0]["data"] == [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        assert response.results[1]["data"] == [0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0]
+        assert response.results[2]["data"] == [1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0]
+        assert response.results[3]["data"] == [0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0]
+        assert response.results[4]["data"] == [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0]
+
+    def test_trends_breakdowns_cohort(self):
+        self._create_test_events()
+        cohort = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "name",
+                            "value": "p1",
+                            "type": "person",
+                        }
+                    ]
+                }
+            ],
+            name="cohort",
+        )
+        cohort.calculate_people_ch(pending_version=0)
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            None,
+            BreakdownFilter(breakdown_type=BreakdownType.cohort, breakdown=[cohort.pk]),
+        )
+
+        assert len(response.results) == 1
+
+        assert response.results[0]["label"] == f"$pageview - cohort"
+        assert response.results[0]["count"] == 6
+        assert response.results[0]["data"] == [
+            0,
+            0,
+            1,
+            1,
+            1,
+            0,
+            1,
+            0,
+            1,
+            0,
+            1,
+            0,
+        ]
+
+    def test_trends_breakdowns_hogql(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            None,
+            BreakdownFilter(breakdown_type=BreakdownType.hogql, breakdown="properties.$browser"),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 4
+        assert breakdown_labels == ["Chrome", "Edge", "Firefox", "Safari"]
+        assert response.results[0]["label"] == f"$pageview - Chrome"
+        assert response.results[1]["label"] == f"$pageview - Edge"
+        assert response.results[2]["label"] == f"$pageview - Firefox"
+        assert response.results[3]["label"] == f"$pageview - Safari"
+        assert response.results[0]["count"] == 6
+        assert response.results[1]["count"] == 1
+        assert response.results[2]["count"] == 2
+        assert response.results[3]["count"] == 1
+
+    def test_trends_breakdowns_and_compare(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-15",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            TrendsFilter(compare=True),
+            BreakdownFilter(breakdown_type=BreakdownType.event, breakdown="$browser"),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 5
+        assert breakdown_labels == [
+            "Chrome",
+            "Safari",
+            "Chrome",
+            "Edge",
+            "Firefox",
+        ]
+
+        assert response.results[0]["label"] == f"$pageview - Chrome"
+        assert response.results[1]["label"] == f"$pageview - Safari"
+        assert response.results[2]["label"] == f"$pageview - Chrome"
+        assert response.results[3]["label"] == f"$pageview - Edge"
+        assert response.results[4]["label"] == f"$pageview - Firefox"
+
+        assert response.results[0]["count"] == 3
+        assert response.results[1]["count"] == 1
+        assert response.results[2]["count"] == 3
+        assert response.results[3]["count"] == 1
+        assert response.results[4]["count"] == 2
+
+        assert response.results[0]["compare_label"] == "current"
+        assert response.results[1]["compare_label"] == "current"
+        assert response.results[2]["compare_label"] == "previous"
+        assert response.results[3]["compare_label"] == "previous"
+        assert response.results[4]["compare_label"] == "previous"
+
+        assert response.results[0]["compare"] is True
+        assert response.results[1]["compare"] is True
+        assert response.results[2]["compare"] is True
+        assert response.results[3]["compare"] is True
+        assert response.results[4]["compare"] is True
+
+    def test_trends_breakdown_and_aggregation_query_orchestration(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=PropertyMathType.sum, math_property="prop")],
+            None,
+            BreakdownFilter(breakdown_type=BreakdownType.event, breakdown="$browser"),
+        )
+
+        breakdown_labels = [result["breakdown_value"] for result in response.results]
+
+        assert len(response.results) == 4
+        assert breakdown_labels == ["Chrome", "Edge", "Firefox", "Safari"]
+        assert response.results[0]["label"] == f"$pageview - Chrome"
+        assert response.results[1]["label"] == f"$pageview - Edge"
+        assert response.results[2]["label"] == f"$pageview - Firefox"
+        assert response.results[3]["label"] == f"$pageview - Safari"
+
+        assert response.results[0]["data"] == [
+            0,
+            0,
+            10,
+            10,
+            10,
+            0,
+            10,
+            0,
+            10,
+            0,
+            10,
+            0,
+        ]
+        assert response.results[1]["data"] == [
+            0,
+            0,
+            0,
+            30,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+        ]
+        assert response.results[2]["data"] == [
+            20,
+            0,
+            0,
+            20,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+        ]
+        assert response.results[3]["data"] == [
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            40,
+            0,
+            0,
+            0,
+            0,
+            0,
+        ]
+
+    def test_trends_aggregation_hogql(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math="hogql", math_hogql="sum(properties.prop)")],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [
+            20,
+            0,
+            10,
+            60,
+            10,
+            0,
+            50,
+            0,
+            10,
+            0,
+            10,
+            0,
+        ]
+
+    def test_trends_aggregation_total(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=BaseMathType.total)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["count"] == 10
+
+    def test_trends_aggregation_dau(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=BaseMathType.dau)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [1, 0, 1, 3, 1, 0, 2, 0, 1, 0, 1, 0]
+
+    def test_trends_aggregation_wau(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=BaseMathType.weekly_active)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [1, 1, 2, 3, 3, 3, 4, 4, 4, 4, 2, 2]
+
+    def test_trends_aggregation_mau(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=BaseMathType.monthly_active)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [1, 1, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4]
+
+    def test_trends_aggregation_unique(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=BaseMathType.unique_session)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0]
+
+    def test_trends_aggregation_property_sum(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=PropertyMathType.sum, math_property="prop")],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [
+            20,
+            0,
+            10,
+            60,
+            10,
+            0,
+            50,
+            0,
+            10,
+            0,
+            10,
+            0,
+        ]
+
+    def test_trends_aggregation_property_avg(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=PropertyMathType.avg, math_property="prop")],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [
+            20,
+            0,
+            10,
+            20,
+            10,
+            0,
+            25,
+            0,
+            10,
+            0,
+            10,
+            0,
+        ]
+
+    def test_trends_aggregation_per_actor_max(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview", math=CountPerActorMathType.max_count_per_actor)],
+            None,
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [
+            1,
+            0,
+            1,
+            1,
+            1,
+            0,
+            1,
+            0,
+            1,
+            0,
+            1,
+            0,
+        ]
+
+    def test_trends_display_aggregate(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            TrendsFilter(display=ChartDisplayType.BoldNumber),
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == []
+        assert response.results[0]["days"] == []
+        assert response.results[0]["count"] == 0
+        assert response.results[0]["aggregated_value"] == 10
+
+    def test_trends_display_cumulative(self):
+        self._create_test_events()
+
+        response = self._run_trends_query(
+            "2020-01-09",
+            "2020-01-20",
+            IntervalType.day,
+            [EventsNode(event="$pageview")],
+            TrendsFilter(display=ChartDisplayType.ActionsLineGraphCumulative),
+            None,
+        )
+
+        assert len(response.results) == 1
+        assert response.results[0]["data"] == [
+            1,
+            1,
+            2,
+            5,
+            6,
+            6,
+            8,
+            8,
+            9,
+            9,
+            10,
+            10,
+        ]
diff --git a/posthog/hogql_queries/insights/trends/test/test_utils.py b/posthog/hogql_queries/insights/trends/test/test_utils.py
new file mode 100644
index 00000000000000..100809020b8f97
--- /dev/null
+++ b/posthog/hogql_queries/insights/trends/test/test_utils.py
@@ -0,0 +1,38 @@
+import pytest
+from posthog.hogql_queries.insights.trends.utils import get_properties_chain
+
+
+def test_properties_chain_person():
+    p1 = get_properties_chain(breakdown_type="person", breakdown_field="field", group_type_index=None)
+    assert p1 == ["person", "properties", "field"]
+
+    p2 = get_properties_chain(breakdown_type="person", breakdown_field="field", group_type_index=1)
+    assert p2 == ["person", "properties", "field"]
+
+
+def test_properties_chain_session():
+    p1 = get_properties_chain(breakdown_type="session", breakdown_field="anything", group_type_index=None)
+    assert p1 == ["session", "session_duration"]
+
+    p2 = get_properties_chain(breakdown_type="session", breakdown_field="", group_type_index=None)
+    assert p2 == ["session", "session_duration"]
+
+    p3 = get_properties_chain(breakdown_type="session", breakdown_field="", group_type_index=1)
+    assert p3 == ["session", "session_duration"]
+
+
+def test_properties_chain_groups():
+    p1 = get_properties_chain(breakdown_type="group", breakdown_field="anything", group_type_index=1)
+    assert p1 == ["group_1", "properties", "anything"]
+
+    with pytest.raises(Exception) as e:
+        get_properties_chain(breakdown_type="group", breakdown_field="anything", group_type_index=None)
+        assert "group_type_index missing from params" in str(e.value)
+
+
+def test_properties_chain_events():
+    p1 = get_properties_chain(breakdown_type="event", breakdown_field="anything", group_type_index=None)
+    assert p1 == ["properties", "anything"]
+
+    p2 = get_properties_chain(breakdown_type="event", breakdown_field="anything_else", group_type_index=1)
+    assert p2 == ["properties", "anything_else"]
diff --git a/posthog/hogql_queries/insights/trends/trends_query_runner.py b/posthog/hogql_queries/insights/trends/trends_query_runner.py
index 02bae1e35da6fc..ff013658d021e3 100644
--- a/posthog/hogql_queries/insights/trends/trends_query_runner.py
+++ b/posthog/hogql_queries/insights/trends/trends_query_runner.py
@@ -15,6 +15,7 @@
 from posthog.hogql import ast
 from posthog.hogql.query import execute_hogql_query
 from posthog.hogql.timings import HogQLTimings
+from posthog.hogql_queries.insights.trends.display import TrendsDisplay
 from posthog.hogql_queries.insights.trends.query_builder import TrendsQueryBuilder
 from posthog.hogql_queries.insights.trends.series_with_extras import SeriesWithExtras
 from posthog.hogql_queries.query_runner import QueryRunner
@@ -29,6 +30,7 @@
 from posthog.models.property_definition import PropertyDefinition
 from posthog.schema import (
     ActionsNode,
+    ChartDisplayType,
     EventsNode,
     HogQLQueryResponse,
     TrendsQuery,
@@ -146,28 +148,73 @@ def build_series_response(self, response: HogQLQueryResponse, series: SeriesWith
         if response.results is None:
             return []
 
+        def get_value(name: str, val: Any):
+            if name not in ["date", "total", "breakdown_value"]:
+                raise Exception("Column not found in hogql results")
+            if response.columns is None:
+                raise Exception("No columns returned from hogql results")
+
+            index = response.columns.index(name)
+            return val[index]
+
         res = []
         for val in response.results:
-            series_object = {
-                "data": val[1],
-                "labels": [item.strftime("%-d-%b-%Y") for item in val[0]],  # TODO: Add back in hour formatting
-                "days": [item.strftime("%Y-%m-%d") for item in val[0]],  # TODO: Add back in hour formatting
-                "count": float(sum(val[1])),
-                "label": "All events" if self.series_event(series.series) is None else self.series_event(series.series),
-                "filter": self._query_to_filter(),
-                "action": {  # TODO: Populate missing props in `action`
-                    "id": self.series_event(series.series),
-                    "type": "events",
-                    "order": 0,
-                    "name": self.series_event(series.series) or "All events",
-                    "custom_name": None,
-                    "math": series.series.math,
-                    "math_property": None,
-                    "math_hogql": None,
-                    "math_group_type_index": None,
-                    "properties": {},
-                },
-            }
+            if series.aggregate_values:
+                series_object = {
+                    "data": [],
+                    "days": [],
+                    "count": 0,
+                    "aggregated_value": get_value("total", val),
+                    "label": "All events"
+                    if self.series_event(series.series) is None
+                    else self.series_event(series.series),
+                    "filter": self._query_to_filter(),
+                    "action": {  # TODO: Populate missing props in `action`
+                        "id": self.series_event(series.series),
+                        "type": "events",
+                        "order": 0,
+                        "name": self.series_event(series.series) or "All events",
+                        "custom_name": None,
+                        "math": series.series.math,
+                        "math_property": None,
+                        "math_hogql": None,
+                        "math_group_type_index": None,
+                        "properties": {},
+                    },
+                }
+            else:
+                series_object = {
+                    "data": get_value("total", val),
+                    "labels": [
+                        item.strftime(
+                            "%-d-%b-%Y{}".format(" %H:%M" if self.query_date_range.interval_name == "hour" else "")
+                        )
+                        for item in get_value("date", val)
+                    ],
+                    "days": [
+                        item.strftime(
+                            "%Y-%m-%d{}".format(" %H:%M:%S" if self.query_date_range.interval_name == "hour" else "")
+                        )
+                        for item in get_value("date", val)
+                    ],
+                    "count": float(sum(get_value("total", val))),
+                    "label": "All events"
+                    if self.series_event(series.series) is None
+                    else self.series_event(series.series),
+                    "filter": self._query_to_filter(),
+                    "action": {  # TODO: Populate missing props in `action`
+                        "id": self.series_event(series.series),
+                        "type": "events",
+                        "order": 0,
+                        "name": self.series_event(series.series) or "All events",
+                        "custom_name": None,
+                        "math": series.series.math,
+                        "math_property": None,
+                        "math_hogql": None,
+                        "math_group_type_index": None,
+                        "properties": {},
+                    },
+                }
 
             # Modifications for when comparing to previous period
             if self.query.trendsFilter is not None and self.query.trendsFilter.compare:
@@ -186,18 +233,18 @@ def build_series_response(self, response: HogQLQueryResponse, series: SeriesWith
             # Modifications for when breakdowns are active
             if self.query.breakdown is not None and self.query.breakdown.breakdown is not None:
                 if self._is_breakdown_field_boolean():
-                    remapped_label = self._convert_boolean(val[2])
+                    remapped_label = self._convert_boolean(get_value("breakdown_value", val))
                     series_object["label"] = "{} - {}".format(series_object["label"], remapped_label)
                     series_object["breakdown_value"] = remapped_label
                 elif self.query.breakdown.breakdown_type == "cohort":
-                    cohort_id = val[2]
+                    cohort_id = get_value("breakdown_value", val)
                     cohort_name = Cohort.objects.get(pk=cohort_id).name
 
                     series_object["label"] = "{} - {}".format(series_object["label"], cohort_name)
-                    series_object["breakdown_value"] = val[2]
+                    series_object["breakdown_value"] = get_value("breakdown_value", val)
                 else:
-                    series_object["label"] = "{} - {}".format(series_object["label"], val[2])
-                    series_object["breakdown_value"] = val[2]
+                    series_object["label"] = "{} - {}".format(series_object["label"], get_value("breakdown_value", val))
+                    series_object["breakdown_value"] = get_value("breakdown_value", val)
 
             res.append(series_object)
         return res
@@ -226,7 +273,15 @@ def series_event(self, series: EventsNode | ActionsNode) -> str | None:
         return None
 
     def setup_series(self) -> List[SeriesWithExtras]:
-        series_with_extras = [SeriesWithExtras(series, None, None) for series in self.query.series]
+        series_with_extras = [
+            SeriesWithExtras(
+                series,
+                None,
+                None,
+                self._trends_display.should_aggregate_values(),
+            )
+            for series in self.query.series
+        ]
 
         if self.query.breakdown is not None and self.query.breakdown.breakdown_type == "cohort":
             updated_series = []
@@ -240,6 +295,7 @@ def setup_series(self) -> List[SeriesWithExtras]:
                             series=series.series,
                             is_previous_period_series=series.is_previous_period_series,
                             overriden_query=copied_query,
+                            aggregate_values=self._trends_display.should_aggregate_values(),
                         )
                     )
             series_with_extras = updated_series
@@ -252,6 +308,7 @@ def setup_series(self) -> List[SeriesWithExtras]:
                         series=series.series,
                         is_previous_period_series=False,
                         overriden_query=series.overriden_query,
+                        aggregate_values=self._trends_display.should_aggregate_values(),
                     )
                 )
                 updated_series.append(
@@ -259,6 +316,7 @@ def setup_series(self) -> List[SeriesWithExtras]:
                         series=series.series,
                         is_previous_period_series=True,
                         overriden_query=series.overriden_query,
+                        aggregate_values=self._trends_display.should_aggregate_values(),
                     )
                 )
             series_with_extras = updated_series
@@ -315,7 +373,7 @@ def _is_breakdown_field_boolean(self):
         )
         return field_type == "Boolean"
 
-    def _convert_boolean(self, value: any):
+    def _convert_boolean(self, value: Any):
         bool_map = {1: "true", 0: "false", "": ""}
         return bool_map.get(value) or value
 
@@ -332,7 +390,7 @@ def _event_property(
             group_type_index=group_type_index if field_type == PropertyDefinition.Type.GROUP else None,
         ).property_type
 
-    def _query_to_filter(self) -> Dict[str, any]:
+    def _query_to_filter(self) -> Dict[str, Any]:
         filter_dict = {
             "insight": "TRENDS",
             "properties": self.query.properties,
@@ -352,3 +410,12 @@ def _query_to_filter(self) -> Dict[str, any]:
             filter_dict.update(**self.query.breakdown.__dict__)
 
         return {k: v for k, v in filter_dict.items() if v is not None}
+
+    @cached_property
+    def _trends_display(self) -> TrendsDisplay:
+        if self.query.trendsFilter is None or self.query.trendsFilter.display is None:
+            display = ChartDisplayType.ActionsLineGraph
+        else:
+            display = self.query.trendsFilter.display
+
+        return TrendsDisplay(display)
diff --git a/posthog/hogql_queries/insights/trends/utils.py b/posthog/hogql_queries/insights/trends/utils.py
index 9a7566969c61be..2c7ec5d1eff66b 100644
--- a/posthog/hogql_queries/insights/trends/utils.py
+++ b/posthog/hogql_queries/insights/trends/utils.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Literal, Optional, Union
 from posthog.schema import ActionsNode, EventsNode
 
 
@@ -9,7 +9,9 @@ def series_event_name(series: EventsNode | ActionsNode) -> str | None:
 
 
 def get_properties_chain(
-    breakdown_type: str, breakdown_field: str, group_type_index: Optional[float | int]
+    breakdown_type: Union[Literal["person"], Literal["session"], Literal["group"], Literal["event"]],
+    breakdown_field: str,
+    group_type_index: Optional[float | int],
 ) -> List[str]:
     if breakdown_type == "person":
         return ["person", "properties", breakdown_field]
@@ -20,5 +22,7 @@ def get_properties_chain(
     if breakdown_type == "group" and group_type_index is not None:
         group_type_index_int = int(group_type_index)
         return [f"group_{group_type_index_int}", "properties", breakdown_field]
+    elif breakdown_type == "group" and group_type_index is None:
+        raise Exception("group_type_index missing from params")
 
     return ["properties", breakdown_field]
diff --git a/posthog/hogql_queries/utils/query_date_range.py b/posthog/hogql_queries/utils/query_date_range.py
index be4e9933264863..e10bf90a2ea50c 100644
--- a/posthog/hogql_queries/utils/query_date_range.py
+++ b/posthog/hogql_queries/utils/query_date_range.py
@@ -47,7 +47,7 @@ def date_to(self) -> datetime:
         delta_mapping = None
 
         if self._date_range and self._date_range.date_to:
-            date_to, delta_mapping = relative_date_parse_with_delta_mapping(
+            date_to, delta_mapping, _position = relative_date_parse_with_delta_mapping(
                 self._date_range.date_to,
                 self._team.timezone_info,
                 always_truncate=True,
diff --git a/posthog/hogql_queries/web_analytics/stats_table.py b/posthog/hogql_queries/web_analytics/stats_table.py
index d3f8960afed998..0e3f9b67a19430 100644
--- a/posthog/hogql_queries/web_analytics/stats_table.py
+++ b/posthog/hogql_queries/web_analytics/stats_table.py
@@ -92,19 +92,19 @@ def counts_breakdown(self):
             case WebStatsBreakdown.Page:
                 return ast.Field(chain=["properties", "$pathname"])
             case WebStatsBreakdown.InitialPage:
-                return ast.Field(chain=["properties", "$client_session_initial_pathname"])
+                return ast.Field(chain=["person", "properties", "$initial_pathname"])
             case WebStatsBreakdown.InitialReferringDomain:
-                return ast.Field(chain=["properties", "$client_session_initial_referring_domain"])
+                return ast.Field(chain=["person", "properties", "$initial_referring_domain"])
             case WebStatsBreakdown.InitialUTMSource:
-                return ast.Field(chain=["properties", "$client_session_initial_utm_source"])
+                return ast.Field(chain=["person", "properties", "$initial_utm_source"])
             case WebStatsBreakdown.InitialUTMCampaign:
-                return ast.Field(chain=["properties", "$client_session_initial_utm_campaign"])
+                return ast.Field(chain=["person", "properties", "$initial_utm_campaign"])
             case WebStatsBreakdown.InitialUTMMedium:
-                return ast.Field(chain=["properties", "$client_session_initial_utm_medium"])
+                return ast.Field(chain=["person", "properties", "$initial_utm_medium"])
             case WebStatsBreakdown.InitialUTMTerm:
-                return ast.Field(chain=["properties", "$client_session_initial_utm_term"])
+                return ast.Field(chain=["person", "properties", "$initial_utm_term"])
             case WebStatsBreakdown.InitialUTMContent:
-                return ast.Field(chain=["properties", "$client_session_initial_utm_content"])
+                return ast.Field(chain=["person", "properties", "$initial_utm_content"])
             case WebStatsBreakdown.Browser:
                 return ast.Field(chain=["properties", "$browser"])
             case WebStatsBreakdown.OS:
@@ -126,37 +126,9 @@ def bounce_breakdown(self):
         match self.query.breakdownBy:
             case WebStatsBreakdown.Page:
                 # use initial pathname for bounce rate
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_pathname"])])
-            case WebStatsBreakdown.InitialPage:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_pathname"])])
-            case WebStatsBreakdown.InitialReferringDomain:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_referring_domain"])])
-            case WebStatsBreakdown.InitialUTMSource:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_utm_source"])])
-            case WebStatsBreakdown.InitialUTMCampaign:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_utm_campaign"])])
-            case WebStatsBreakdown.InitialUTMMedium:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_utm_medium"])])
-            case WebStatsBreakdown.InitialUTMTerm:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_utm_term"])])
-            case WebStatsBreakdown.InitialUTMContent:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$initial_utm_content"])])
-            case WebStatsBreakdown.Browser:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$browser"])])
-            case WebStatsBreakdown.OS:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$os"])])
-            case WebStatsBreakdown.DeviceType:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$device_type"])])
-            case WebStatsBreakdown.Country:
-                return ast.Call(name="any", args=[ast.Field(chain=["properties", "$geoip_country_code"])])
-            case WebStatsBreakdown.Region:
-                return parse_expr(
-                    "any(tuple(properties.$geoip_country_code, properties.$geoip_subdivision_1_code, properties.$geoip_subdivision_1_name))"
-                )
-            case WebStatsBreakdown.City:
-                return parse_expr("any(tuple(properties.$geoip_country_code, properties.$geoip_city_name))")
+                return ast.Call(name="any", args=[ast.Field(chain=["person", "properties", "$initial_pathname"])])
             case _:
-                raise NotImplementedError("Breakdown not implemented")
+                return ast.Call(name="any", args=[self.counts_breakdown()])
 
     def where_breakdown(self):
         match self.query.breakdownBy:
diff --git a/posthog/hogql_queries/web_analytics/web_analytics_query_runner.py b/posthog/hogql_queries/web_analytics/web_analytics_query_runner.py
index ccd2ad773e7e19..8e8d34d443f62e 100644
--- a/posthog/hogql_queries/web_analytics/web_analytics_query_runner.py
+++ b/posthog/hogql_queries/web_analytics/web_analytics_query_runner.py
@@ -4,6 +4,7 @@
 from typing import Optional, List, Union, Type
 
 from django.utils.timezone import datetime
+
 from posthog.caching.insights_api import BASE_MINIMUM_INSIGHT_REFRESH_INTERVAL, REDUCED_MINIMUM_INSIGHT_REFRESH_INTERVAL
 from posthog.caching.utils import is_stale
 from posthog.hogql.parser import parse_expr
@@ -16,7 +17,7 @@
     WebTopClicksQuery,
     WebOverviewQuery,
     WebStatsTableQuery,
-    HogQLPropertyFilter,
+    PersonPropertyFilter,
 )
 
 WebQueryNode = Union[
@@ -47,7 +48,7 @@ def pathname_property_filter(self) -> Optional[EventPropertyFilter]:
         return None
 
     @cached_property
-    def property_filters_without_pathname(self) -> List[Union[EventPropertyFilter, HogQLPropertyFilter]]:
+    def property_filters_without_pathname(self) -> List[Union[EventPropertyFilter, PersonPropertyFilter]]:
         return [p for p in self.query.properties if p.key != "$pathname"]
 
     def session_where(self, include_previous_period: Optional[bool] = None):
diff --git a/posthog/management/commands/start_temporal_worker.py b/posthog/management/commands/start_temporal_worker.py
index 6e10a28b31b7d1..17299f64fe9208 100644
--- a/posthog/management/commands/start_temporal_worker.py
+++ b/posthog/management/commands/start_temporal_worker.py
@@ -7,6 +7,8 @@
     from django.core.management.base import BaseCommand
     from django.conf import settings
 
+from prometheus_client import start_http_server
+
 from posthog.temporal.worker import start_worker
 
 
@@ -15,12 +17,12 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument(
-            "--temporal_host",
+            "--temporal-host",
             default=settings.TEMPORAL_HOST,
             help="Hostname for Temporal Scheduler",
         )
         parser.add_argument(
-            "--temporal_port",
+            "--temporal-port",
             default=settings.TEMPORAL_PORT,
             help="Port for Temporal Scheduler",
         )
@@ -49,6 +51,11 @@ def add_arguments(self, parser):
             default=settings.TEMPORAL_CLIENT_KEY,
             help="Optional client key",
         )
+        parser.add_argument(
+            "--metrics-port",
+            default=settings.PROMETHEUS_METRICS_EXPORT_PORT,
+            help="Port to export Prometheus metrics on",
+        )
 
     def handle(self, *args, **options):
         temporal_host = options["temporal_host"]
@@ -63,6 +70,9 @@ def handle(self, *args, **options):
             options["client_key"] = "--SECRET--"
         logging.info(f"Starting Temporal Worker with options: {options}")
 
+        metrics_port = int(options["metrics_port"])
+        start_http_server(port=metrics_port)
+
         asyncio.run(
             start_worker(
                 temporal_host,
diff --git a/posthog/management/commands/sync_feature_flags.py b/posthog/management/commands/sync_feature_flags.py
index 186316bb6a2dff..7471244061f51b 100644
--- a/posthog/management/commands/sync_feature_flags.py
+++ b/posthog/management/commands/sync_feature_flags.py
@@ -4,6 +4,8 @@
 
 from posthog.models import FeatureFlag, Team, User
 
+INACTIVE_FLAGS = ["cloud-announcement", "session-reset-on-load"]
+
 
 class Command(BaseCommand):
     help = "Add and enable all feature flags in frontend/src/lib/constants.tsx for all teams"
@@ -36,12 +38,12 @@ def handle(self, *args, **options):
             deleted_flags = FeatureFlag.objects.filter(team=team, deleted=True).values_list("key", flat=True)
             for flag in flags.keys():
                 flag_type = flags[flag]
-                # do not sync the cloud announcement flag for in-app banners
-                if flag == "cloud-announcement":
-                    continue
-                elif flag in deleted_flags:
+                is_enabled = flag not in INACTIVE_FLAGS
+
+                if flag in deleted_flags:
                     ff = FeatureFlag.objects.filter(team=team, key=flag)[0]
                     ff.deleted = False
+                    ff.active = is_enabled
                     ff.save()
                     print(f"Undeleted feature flag '{flag} for team {team.id} {' - ' + team.name if team.name else ''}")
                 elif flag not in existing_flags:
@@ -52,6 +54,7 @@ def handle(self, *args, **options):
                             name=flag,
                             key=flag,
                             created_by=first_user,
+                            active=is_enabled,
                             filters={
                                 "groups": [{"properties": [], "rollout_percentage": None}],
                                 "multivariate": {
@@ -77,5 +80,6 @@ def handle(self, *args, **options):
                             name=flag,
                             key=flag,
                             created_by=first_user,
+                            active=is_enabled,
                         )
                     print(f"Created feature flag '{flag} for team {team.id} {' - ' + team.name if team.name else ''}")
diff --git a/posthog/migrations/0361_add_plugin_config_ui_fields.py b/posthog/migrations/0361_add_plugin_config_ui_fields.py
new file mode 100644
index 00000000000000..e61461677f137e
--- /dev/null
+++ b/posthog/migrations/0361_add_plugin_config_ui_fields.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.19 on 2023-11-07 11:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("posthog", "0360_externaldatasource_destination_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="deleted",
+            field=models.BooleanField(default=False, null=True),
+        ),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="description",
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="name",
+            field=models.CharField(blank=True, max_length=400, null=True),
+        ),
+    ]
diff --git a/posthog/migrations/0362_alter_experiment_feature_flag.py b/posthog/migrations/0362_alter_experiment_feature_flag.py
new file mode 100644
index 00000000000000..ac6eda940898e8
--- /dev/null
+++ b/posthog/migrations/0362_alter_experiment_feature_flag.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-11-10 11:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("posthog", "0361_add_plugin_config_ui_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="experiment",
+            name="feature_flag",
+            field=models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to="posthog.featureflag"),
+        ),
+    ]
diff --git a/posthog/models/event/query_event_list.py b/posthog/models/event/query_event_list.py
index 66fc02c8ba55a9..9608fdd8e2330d 100644
--- a/posthog/models/event/query_event_list.py
+++ b/posthog/models/event/query_event_list.py
@@ -15,6 +15,7 @@
     SELECT_EVENT_BY_TEAM_AND_CONDITIONS_FILTERS_SQL,
     SELECT_EVENT_BY_TEAM_AND_CONDITIONS_SQL,
 )
+from posthog.models.person.person import get_distinct_ids_for_subquery
 from posthog.models.property.util import parse_prop_grouped_clauses
 from posthog.queries.insight import insight_query_with_columns
 from posthog.utils import relative_date_parse
@@ -45,8 +46,7 @@ def determine_event_conditions(
         elif k == "person_id":
             result += """AND distinct_id IN (%(distinct_ids)s) """
             person = get_pk_or_uuid(Person.objects.filter(team=team), v).first()
-            distinct_ids = person.distinct_ids if person is not None else []
-            params.update({"distinct_ids": list(map(str, distinct_ids))})
+            params.update({"distinct_ids": get_distinct_ids_for_subquery(person, team)})
         elif k == "distinct_id":
             result += "AND distinct_id = %(distinct_id)s "
             params.update({"distinct_id": v})
diff --git a/posthog/models/experiment.py b/posthog/models/experiment.py
index 94a17778df27ac..ea970c5b2db12d 100644
--- a/posthog/models/experiment.py
+++ b/posthog/models/experiment.py
@@ -23,7 +23,7 @@ class Experiment(models.Model):
     # A list of filters for secondary metrics
     secondary_metrics: models.JSONField = models.JSONField(default=list, null=True)
 
-    feature_flag: models.ForeignKey = models.ForeignKey("FeatureFlag", blank=False, on_delete=models.CASCADE)
+    feature_flag: models.ForeignKey = models.ForeignKey("FeatureFlag", blank=False, on_delete=models.RESTRICT)
     created_by: models.ForeignKey = models.ForeignKey("User", on_delete=models.CASCADE)
     start_date: models.DateTimeField = models.DateTimeField(null=True)
     end_date: models.DateTimeField = models.DateTimeField(null=True)
diff --git a/posthog/models/feature_flag/feature_flag.py b/posthog/models/feature_flag/feature_flag.py
index b45271bb16845a..97d5d3e1aace84 100644
--- a/posthog/models/feature_flag/feature_flag.py
+++ b/posthog/models/feature_flag/feature_flag.py
@@ -27,6 +27,7 @@ class FeatureFlag(models.Model):
     class Meta:
         constraints = [models.UniqueConstraint(fields=["team", "key"], name="unique key for team")]
 
+    # When adding new fields, make sure to update organization_feature_flags.py::copy_flags
     key: models.CharField = models.CharField(max_length=400)
     name: models.TextField = models.TextField(
         blank=True
diff --git a/posthog/models/feature_flag/flag_matching.py b/posthog/models/feature_flag/flag_matching.py
index fe57b171204e80..9a2722b86fc598 100644
--- a/posthog/models/feature_flag/flag_matching.py
+++ b/posthog/models/feature_flag/flag_matching.py
@@ -3,14 +3,14 @@
 from enum import Enum
 import time
 import structlog
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union, cast
 
 from prometheus_client import Counter
 from django.conf import settings
 from django.db import DatabaseError, IntegrityError, OperationalError
 from django.db.models.expressions import ExpressionWrapper, RawSQL
 from django.db.models.fields import BooleanField
-from django.db.models import Q
+from django.db.models import Q, Func, F, CharField
 from django.db.models.query import QuerySet
 from sentry_sdk.api import capture_exception, start_span
 from posthog.metrics import LABEL_TEAM_ID
@@ -24,7 +24,7 @@
 from posthog.models.property.property import Property
 from posthog.models.cohort import Cohort
 from posthog.models.utils import execute_with_timeout
-from posthog.queries.base import match_property, properties_to_Q
+from posthog.queries.base import match_property, properties_to_Q, sanitize_property_key
 from posthog.database_healthcheck import (
     postgres_healthcheck,
     DATABASE_FOR_FLAG_MATCHING,
@@ -396,6 +396,11 @@ def condition_eval(key, condition):
                     annotate_query = True
                     nonlocal person_query
 
+                    property_list = Filter(data=condition).property_groups.flat
+                    properties_with_math_operators = get_all_properties_with_math_operators(
+                        property_list, self.cohorts_cache
+                    )
+
                     if len(condition.get("properties", {})) > 0:
                         # Feature Flags don't support OR filtering yet
                         target_properties = self.property_value_overrides
@@ -404,8 +409,9 @@ def condition_eval(key, condition):
                                 self.cache.group_type_index_to_name[feature_flag.aggregation_group_type_index],
                                 {},
                             )
+
                         expr = properties_to_Q(
-                            Filter(data=condition).property_groups.flat,
+                            property_list,
                             override_property_values=target_properties,
                             cohorts_cache=self.cohorts_cache,
                             using_database=DATABASE_FOR_FLAG_MATCHING,
@@ -428,13 +434,24 @@ def condition_eval(key, condition):
 
                     if annotate_query:
                         if feature_flag.aggregation_group_type_index is None:
+                            # :TRICKY: Flag matching depends on type of property when doing >, <, >=, <= comparisons.
+                            # This requires a generated field to query in Q objects, which sadly don't allow inlining fields,
+                            # hence we need to annotate the query here, even though these annotations are used much deeper,
+                            # in properties_to_q, in empty_or_null_with_value_q
+                            # These need to come in before the expr so they're available to use inside the expr.
+                            # Same holds for the group queries below.
+                            type_property_annotations = {
+                                prop_key: Func(F(prop_field), function="JSONB_TYPEOF", output_field=CharField())
+                                for prop_key, prop_field in properties_with_math_operators
+                            }
                             person_query = person_query.annotate(
+                                **type_property_annotations,
                                 **{
                                     key: ExpressionWrapper(
                                         expr if expr else RawSQL("true", []),
                                         output_field=BooleanField(),
-                                    )
-                                }
+                                    ),
+                                },
                             )
                             person_fields.append(key)
                         else:
@@ -445,13 +462,18 @@ def condition_eval(key, condition):
                                 group_query,
                                 group_fields,
                             ) = group_query_per_group_type_mapping[feature_flag.aggregation_group_type_index]
+                            type_property_annotations = {
+                                prop_key: Func(F(prop_field), function="JSONB_TYPEOF", output_field=CharField())
+                                for prop_key, prop_field in properties_with_math_operators
+                            }
                             group_query = group_query.annotate(
+                                **type_property_annotations,
                                 **{
                                     key: ExpressionWrapper(
                                         expr if expr else RawSQL("true", []),
                                         output_field=BooleanField(),
                                     )
-                                }
+                                },
                             )
                             group_fields.append(key)
                             group_query_per_group_type_mapping[feature_flag.aggregation_group_type_index] = (
@@ -881,3 +903,35 @@ def parse_exception_for_error_message(err: Exception):
             reason = "query_wait_timeout"
 
     return reason
+
+
+def key_and_field_for_property(property: Property) -> Tuple[str, str]:
+    column = "group_properties" if property.type == "group" else "properties"
+    key = property.key
+    sanitized_key = sanitize_property_key(key)
+
+    return (
+        f"{column}_{sanitized_key}_type",
+        f"{column}__{key}",
+    )
+
+
+def get_all_properties_with_math_operators(
+    properties: List[Property], cohorts_cache: Dict[int, Cohort]
+) -> List[Tuple[str, str]]:
+    all_keys_and_fields = []
+
+    for prop in properties:
+        if prop.type == "cohort":
+            cohort_id = int(cast(Union[str, int], prop.value))
+            if cohorts_cache.get(cohort_id) is None:
+                cohorts_cache[cohort_id] = Cohort.objects.using(DATABASE_FOR_FLAG_MATCHING).get(pk=cohort_id)
+            cohort = cohorts_cache[cohort_id]
+            if cohort:
+                all_keys_and_fields.extend(
+                    get_all_properties_with_math_operators(cohort.properties.flat, cohorts_cache)
+                )
+        elif prop.operator in ["gt", "lt", "gte", "lte"] and prop.type in ("person", "group"):
+            all_keys_and_fields.append(key_and_field_for_property(prop))
+
+    return all_keys_and_fields
diff --git a/posthog/models/filters/mixins/common.py b/posthog/models/filters/mixins/common.py
index ae50d71f306568..8290a6793ee510 100644
--- a/posthog/models/filters/mixins/common.py
+++ b/posthog/models/filters/mixins/common.py
@@ -351,7 +351,7 @@ def date_from(self) -> Optional[datetime.datetime]:
             if self._date_from == "all":
                 return None
             elif isinstance(self._date_from, str):
-                date, delta_mapping = relative_date_parse_with_delta_mapping(
+                date, delta_mapping, _position = relative_date_parse_with_delta_mapping(
                     self._date_from,
                     self.team.timezone_info,  # type: ignore
                     always_truncate=True,
@@ -385,7 +385,11 @@ def date_to(self) -> datetime.datetime:
                             tzinfo=ZoneInfo("UTC")
                         )
                     except ValueError:
-                        date, delta_mapping = relative_date_parse_with_delta_mapping(
+                        (
+                            date,
+                            delta_mapping,
+                            _position,
+                        ) = relative_date_parse_with_delta_mapping(
                             self._date_to,
                             self.team.timezone_info,  # type: ignore
                             always_truncate=True,
diff --git a/posthog/models/filters/mixins/retention.py b/posthog/models/filters/mixins/retention.py
index c2b55f3d30e2ef..eeec027c4f8171 100644
--- a/posthog/models/filters/mixins/retention.py
+++ b/posthog/models/filters/mixins/retention.py
@@ -76,10 +76,16 @@ def date_from(self) -> datetime:
         if self.period == "Hour":
             return self.date_to - tdelta
         elif self.period == "Week":
-            date_from = self.date_to - tdelta
-            return date_from - timedelta(days=date_from.isoweekday() % 7)
+            date_from: datetime = self.date_to - tdelta
+            week_start_alignment_days = date_from.isoweekday() % 7
+            if team := getattr(self, "team", None):
+                from posthog.models.team.team import WeekStartDay
+
+                if team.week_start_day == WeekStartDay.MONDAY:
+                    week_start_alignment_days = date_from.weekday()
+            return date_from - timedelta(days=week_start_alignment_days)
         else:
-            date_to = self.date_to.replace(hour=0, minute=0, second=0, microsecond=0)
+            date_to: datetime = self.date_to.replace(hour=0, minute=0, second=0, microsecond=0)
             return date_to - tdelta
 
     @cached_property
diff --git a/posthog/models/filters/test/__snapshots__/test_filter.ambr b/posthog/models/filters/test/__snapshots__/test_filter.ambr
index 2b65b1a00ce6f5..4df4f567f7ad37 100644
--- a/posthog/models/filters/test/__snapshots__/test_filter.ambr
+++ b/posthog/models/filters/test/__snapshots__/test_filter.ambr
@@ -306,6 +306,58 @@
   ORDER BY "posthog_persondistinctid"."id" ASC
   '
 ---
+# name: TestDjangoPropertiesToQ.test_icontains_with_array_value
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE (UPPER(("posthog_person"."properties" ->> '$key')::text) LIKE UPPER('%[''red'']%')
+         AND "posthog_person"."properties" ? '$key'
+         AND NOT (("posthog_person"."properties" -> '$key') = 'null')
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestDjangoPropertiesToQ.test_icontains_with_array_value.1
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE (UPPER(("posthog_person"."properties" ->> '$key')::text) LIKE UPPER('%red%')
+         AND "posthog_person"."properties" ? '$key'
+         AND NOT (("posthog_person"."properties" -> '$key') = 'null')
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestDjangoPropertiesToQ.test_icontains_with_array_value.2
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE (("posthog_person"."properties" -> '$key') > '["2"]'
+         AND "posthog_person"."properties" ? '$key'
+         AND NOT (("posthog_person"."properties" -> '$key') = 'null')
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestDjangoPropertiesToQ.test_person_relative_date_parsing_with_invalid_date
+  '
+  SELECT (1) AS "a"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'example_id'
+         AND "posthog_person"."team_id" = 2
+         AND ("posthog_person"."properties" -> 'created_at') > '"2021-02-06T10:00:00+00:00"')
+  LIMIT 1
+  '
+---
+# name: TestDjangoPropertiesToQ.test_person_relative_date_parsing_with_invalid_date.1
+  '
+  SELECT (1) AS "a"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'example_id'
+         AND "posthog_person"."team_id" = 2
+         AND "posthog_person"."id" = -1)
+  LIMIT 1
+  '
+---
 # name: TestDjangoPropertyGroupToQ.test_property_group_to_q_with_cohorts
   '
   SELECT "posthog_cohort"."id",
diff --git a/posthog/models/filters/test/test_filter.py b/posthog/models/filters/test/test_filter.py
index 84b70bbd4d837d..ed1f84653ff747 100644
--- a/posthog/models/filters/test/test_filter.py
+++ b/posthog/models/filters/test/test_filter.py
@@ -2,7 +2,8 @@
 import json
 from typing import Any, Callable, Dict, List, Optional, cast
 
-from django.db.models import Q
+from django.db.models import Q, Func, F, CharField
+from freezegun import freeze_time
 
 from posthog.constants import FILTER_TEST_ACCOUNTS
 from posthog.models import Cohort, Filter, Person, Team
@@ -14,6 +15,7 @@
     _create_person,
     flush_persons_and_events,
     snapshot_postgres_queries,
+    snapshot_postgres_queries_context,
 )
 
 
@@ -219,42 +221,6 @@ def test_incomplete_data(self):
             )
             self.assertListEqual(filter.property_groups.values, [])
 
-        def test_numerical_person_properties(self):
-            person_factory(team_id=self.team.pk, distinct_ids=["p1"], properties={"$a_number": 4})
-            person_factory(team_id=self.team.pk, distinct_ids=["p2"], properties={"$a_number": 5})
-            person_factory(team_id=self.team.pk, distinct_ids=["p3"], properties={"$a_number": 6})
-
-            filter = Filter(
-                data={
-                    "properties": [
-                        {
-                            "type": "person",
-                            "key": "$a_number",
-                            "value": 4,
-                            "operator": "gt",
-                        }
-                    ]
-                }
-            )
-            self.assertEqual(len(filter_persons(filter, self.team)), 2)
-
-            filter = Filter(data={"properties": [{"type": "person", "key": "$a_number", "value": 5}]})
-            self.assertEqual(len(filter_persons(filter, self.team)), 1)
-
-            filter = Filter(
-                data={
-                    "properties": [
-                        {
-                            "type": "person",
-                            "key": "$a_number",
-                            "value": 6,
-                            "operator": "lt",
-                        }
-                    ]
-                }
-            )
-            self.assertEqual(len(filter_persons(filter, self.team)), 2)
-
         def test_contains_persons(self):
             person_factory(
                 team_id=self.team.pk,
@@ -807,6 +773,110 @@ def test_group_property_filters_direct(self):
             ),
         )
 
+    def test_person_relative_date_parsing(self):
+        person1_distinct_id = "example_id"
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=[person1_distinct_id],
+            properties={"created_at": "2021-04-04T12:00:00Z"},
+        )
+        filter = Filter(
+            data={
+                "properties": [
+                    {"key": "created_at", "value": "2d", "type": "person", "operator": "is_relative_date_after"}
+                ]
+            }
+        )
+
+        with self.assertNumQueries(1), freeze_time("2021-04-06T10:00:00"):
+            matched_person = (
+                Person.objects.filter(
+                    team_id=self.team.pk,
+                    persondistinctid__distinct_id=person1_distinct_id,
+                )
+                .filter(properties_to_Q(filter.property_groups.flat))
+                .exists()
+            )
+        self.assertTrue(matched_person)
+
+    def test_person_relative_date_parsing_with_override_property(self):
+        person1_distinct_id = "example_id"
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=[person1_distinct_id],
+            properties={"created_at": "2021-04-04T12:00:00Z"},
+        )
+        filter = Filter(
+            data={
+                "properties": [
+                    {"key": "created_at", "value": "2m", "type": "person", "operator": "is_relative_date_after"}
+                ]
+            }
+        )
+
+        with self.assertNumQueries(1):
+            matched_person = (
+                Person.objects.filter(
+                    team_id=self.team.pk,
+                    persondistinctid__distinct_id=person1_distinct_id,
+                )
+                .filter(
+                    properties_to_Q(
+                        filter.property_groups.flat, override_property_values={"created_at": "2022-10-06T10:00:00Z"}
+                    )
+                )
+                .exists()
+            )
+        self.assertFalse(matched_person)
+
+    @freeze_time("2021-04-06T10:00:00")
+    def test_person_relative_date_parsing_with_invalid_date(self):
+        person1_distinct_id = "example_id"
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=[person1_distinct_id],
+            properties={"created_at": "2021-04-04T12:00:00Z"},
+        )
+        filter = Filter(
+            data={
+                "properties": [
+                    {"key": "created_at", "value": ["2m", "3d"], "type": "person", "operator": "is_relative_date_after"}
+                ]
+            }
+        )
+
+        with snapshot_postgres_queries_context(self):
+            matched_person = (
+                Person.objects.filter(
+                    team_id=self.team.pk,
+                    persondistinctid__distinct_id=person1_distinct_id,
+                )
+                .filter(properties_to_Q(filter.property_groups.flat))
+                .exists()
+            )
+            # matches '2m'
+            # TODO: Should this not match instead?
+            self.assertTrue(matched_person)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {"key": "created_at", "value": "bazinga", "type": "person", "operator": "is_relative_date_after"}
+                ]
+            }
+        )
+
+        with snapshot_postgres_queries_context(self):
+            matched_person = (
+                Person.objects.filter(
+                    team_id=self.team.pk,
+                    persondistinctid__distinct_id=person1_distinct_id,
+                )
+                .filter(properties_to_Q(filter.property_groups.flat))
+                .exists()
+            )
+            self.assertFalse(matched_person)
+
     def _filter_with_date_range(
         self, date_from: datetime.datetime, date_to: Optional[datetime.datetime] = None
     ) -> Filter:
@@ -819,6 +889,117 @@ def _filter_with_date_range(
 
         return Filter(data=data)
 
+    def test_numerical_person_properties(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"$a_number": 4})
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"$a_number": 5})
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"$a_number": 6})
+        _create_person(team_id=self.team.pk, distinct_ids=["p4"], properties={"$a_number": 14})
+
+        flush_persons_and_events()
+
+        def filter_persons_with_annotation(filter: Filter, team: Team):
+            persons = Person.objects.annotate(
+                **{
+                    "properties_anumber_27b11200b8ed4fb_type": Func(
+                        F("properties__$a_number"), function="JSONB_TYPEOF", output_field=CharField()
+                    )
+                }
+            ).filter(properties_to_Q(filter.property_groups.flat))
+            persons = persons.filter(team_id=team.pk)
+            return [str(uuid) for uuid in persons.values_list("uuid", flat=True)]
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": "4",
+                        "operator": "gt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 3)
+
+        filter = Filter(data={"properties": [{"type": "person", "key": "$a_number", "value": 5}]})
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 1)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": 6,
+                        "operator": "lt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 2)
+
+    @snapshot_postgres_queries
+    def test_icontains_with_array_value(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"$key": "red-123"})
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"$key": "blue-123"})
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"$key": 6})
+
+        flush_persons_and_events()
+
+        def filter_persons_with_annotation(filter: Filter, team: Team):
+            persons = Person.objects.annotate(
+                **{
+                    "properties_$key_type": Func(
+                        F("properties__$key"), function="JSONB_TYPEOF", output_field=CharField()
+                    )
+                }
+            ).filter(properties_to_Q(filter.property_groups.flat))
+            persons = persons.filter(team_id=team.pk)
+            return [str(uuid) for uuid in persons.values_list("uuid", flat=True)]
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$key",
+                        "value": ["red"],
+                        "operator": "icontains",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 0)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$key",
+                        "value": "red",
+                        "operator": "icontains",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 1)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$key",
+                        "value": ["2"],
+                        "operator": "gt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(filter_persons_with_annotation(filter, self.team)), 0)
+
 
 def filter_persons_with_property_group(
     filter: Filter, team: Team, property_overrides: Dict[str, Any] = {}
diff --git a/posthog/models/person/person.py b/posthog/models/person/person.py
index cae5e450fa7660..92b6103f2c8b64 100644
--- a/posthog/models/person/person.py
+++ b/posthog/models/person/person.py
@@ -5,6 +5,10 @@
 
 from posthog.models.utils import UUIDT
 
+from ..team import Team
+
+MAX_LIMIT_DISTINCT_IDS = 2500
+
 
 class PersonManager(models.Manager):
     def create(self, *args: Any, **kwargs: Any):
@@ -173,3 +177,40 @@ class Meta:
 
     oldest_event: models.DateTimeField = models.DateTimeField()
     version: models.BigIntegerField = models.BigIntegerField(null=True, blank=True)
+
+
+def get_distinct_ids_for_subquery(person: Person | None, team: Team) -> List[str]:
+    """_summary_
+    Fetching distinct_ids for a person from CH is slow, so we
+    fetch them from PG for certain queries. Therfore we need
+    to inline the ids in a `distinct_ids IN (...)` clause.
+
+    This can cause the query to explode for persons with many
+    ids. Thus we need to limit the amount of distinct_ids we
+    pass through.
+
+    The first distinct_ids should contain the real distinct_ids
+    for a person and later ones should be associated with current
+    events. Therefore we union from both sides.
+
+    Many ids are usually a sign of instrumentation issues
+    on the customer side.
+    """
+    first_ids_limit = 100
+    last_ids_limit = MAX_LIMIT_DISTINCT_IDS - first_ids_limit
+
+    if person is not None:
+        first_ids = (
+            PersonDistinctId.objects.filter(person=person, team=team)
+            .order_by("id")
+            .values_list("distinct_id", flat=True)[:first_ids_limit]
+        )
+        last_ids = (
+            PersonDistinctId.objects.filter(person=person, team=team)
+            .order_by("-id")
+            .values_list("distinct_id", flat=True)[:last_ids_limit]
+        )
+        distinct_ids = first_ids.union(last_ids)
+    else:
+        distinct_ids = []  # type: ignore
+    return list(map(str, distinct_ids))
diff --git a/posthog/models/plugin.py b/posthog/models/plugin.py
index b8787dd3df3447..ff81a8d09d0f4d 100644
--- a/posthog/models/plugin.py
+++ b/posthog/models/plugin.py
@@ -237,6 +237,11 @@ class Meta:
 
     created_at: models.DateTimeField = models.DateTimeField(auto_now_add=True)
     updated_at: models.DateTimeField = models.DateTimeField(auto_now=True)
+    # Used in the frontend
+    name: models.CharField = models.CharField(max_length=400, null=True, blank=True)
+    description: models.CharField = models.CharField(max_length=1000, null=True, blank=True)
+    # Used in the frontend to hide pluginConfgis that user deleted
+    deleted: models.BooleanField = models.BooleanField(default=False, null=True)
 
 
 class PluginAttachment(models.Model):
diff --git a/posthog/models/property/property.py b/posthog/models/property/property.py
index b088b452c54832..31e8425c205d93 100644
--- a/posthog/models/property/property.py
+++ b/posthog/models/property/property.py
@@ -71,6 +71,8 @@ class BehavioralPropertyType(str, Enum):
     "is_date_exact",
     "is_date_after",
     "is_date_before",
+    "is_relative_date_after",
+    "is_relative_date_before",
 ]
 
 OperatorInterval = Literal["day", "week", "month", "year"]
diff --git a/posthog/models/property/util.py b/posthog/models/property/util.py
index 5e255671780359..c67a3d8cf31547 100644
--- a/posthog/models/property/util.py
+++ b/posthog/models/property/util.py
@@ -398,6 +398,8 @@ def negate_operator(operator: OperatorType) -> OperatorType:
         "is_not_set": "is_set",
         "is_date_before": "is_date_after",
         "is_date_after": "is_date_before",
+        "is_relative_date_before": "is_relative_date_after",
+        "is_relative_date_after": "is_relative_date_before",
         # is_date_exact not yet supported
     }.get(operator, operator)  # type: ignore
 
diff --git a/posthog/queries/app_metrics/serializers.py b/posthog/queries/app_metrics/serializers.py
index f32aa6b01d7532..28661da6a9600d 100644
--- a/posthog/queries/app_metrics/serializers.py
+++ b/posthog/queries/app_metrics/serializers.py
@@ -4,7 +4,7 @@
 class AppMetricsRequestSerializer(serializers.Serializer):
     category = serializers.ChoiceField(
         # Keep in sync with plugin-server/src/worker/ingestion/app-metrics.ts
-        choices=["processEvent", "onEvent", "exportEvents", "scheduledTask", "webhook"],
+        choices=["processEvent", "onEvent", "exportEvents", "scheduledTask", "webhook", "composeWebhook"],
         help_text="What to gather metrics for",
         required=True,
     )
@@ -22,7 +22,7 @@ class AppMetricsRequestSerializer(serializers.Serializer):
 class AppMetricsErrorsRequestSerializer(serializers.Serializer):
     category = serializers.ChoiceField(
         # Keep in sync with plugin-server/src/worker/ingestion/app-metrics.ts
-        choices=["processEvent", "onEvent", "exportEvents", "scheduledTask", "webhook"],
+        choices=["processEvent", "onEvent", "exportEvents", "scheduledTask", "webhook", "composeWebhook"],
         help_text="What to gather errors for",
         required=True,
     )
diff --git a/posthog/queries/base.py b/posthog/queries/base.py
index 65ccd651d2c3ce..e93b5fad112bc5 100644
--- a/posthog/queries/base.py
+++ b/posthog/queries/base.py
@@ -1,4 +1,5 @@
 import datetime
+import hashlib
 import re
 from typing import (
     Any,
@@ -10,9 +11,10 @@
     Union,
     cast,
 )
-
+from zoneinfo import ZoneInfo
+from dateutil.relativedelta import relativedelta
 from dateutil import parser
-from django.db.models import Exists, OuterRef, Q
+from django.db.models import Exists, OuterRef, Q, Value
 from rest_framework.exceptions import ValidationError
 
 from posthog.constants import PropertyOperatorType
@@ -20,7 +22,6 @@
 from posthog.models.filters.filter import Filter
 from posthog.models.filters.path_filter import PathFilter
 from posthog.models.property import (
-    CLICKHOUSE_ONLY_PROPERTY_TYPES,
     Property,
     PropertyGroup,
 )
@@ -29,10 +30,10 @@
 from posthog.queries.util import convert_to_datetime_aware
 from posthog.utils import get_compare_period_dates, is_valid_regex
 
-F = TypeVar("F", Filter, PathFilter)
+FilterType = TypeVar("FilterType", Filter, PathFilter)
 
 
-def determine_compared_filter(filter: F) -> F:
+def determine_compared_filter(filter: FilterType) -> FilterType:
     if not filter.date_to or not filter.date_from:
         raise ValidationError("You need date_from and date_to to compare")
     date_from, date_to = get_compare_period_dates(
@@ -142,33 +143,56 @@ def compute_exact_match(value: ValueT, override_value: Any) -> bool:
         except re.error:
             return False
 
-    if operator == "gt":
-        return type(override_value) == type(value) and override_value > value
-
-    if operator == "gte":
-        return type(override_value) == type(value) and override_value >= value
+    if operator in ("gt", "gte", "lt", "lte"):
+        # :TRICKY: We adjust comparison based on the override value passed in,
+        # to make sure we handle both numeric and string comparisons appropriately.
+        def compare(lhs, rhs, operator):
+            if operator == "gt":
+                return lhs > rhs
+            elif operator == "gte":
+                return lhs >= rhs
+            elif operator == "lt":
+                return lhs < rhs
+            elif operator == "lte":
+                return lhs <= rhs
+            else:
+                raise ValueError(f"Invalid operator: {operator}")
 
-    if operator == "lt":
-        return type(override_value) == type(value) and override_value < value
+        parsed_value = None
+        try:
+            parsed_value = float(value)  # type: ignore
+        except Exception:
+            pass
 
-    if operator == "lte":
-        return type(override_value) == type(value) and override_value <= value
+        if parsed_value is not None and override_value is not None:
+            if isinstance(override_value, str):
+                return compare(override_value, str(value), operator)
+            else:
+                return compare(override_value, parsed_value, operator)
+        else:
+            return compare(str(override_value), str(value), operator)
 
-    if operator in ["is_date_before", "is_date_after"]:
+    if operator in ["is_date_before", "is_date_after", "is_relative_date_before", "is_relative_date_after"]:
         try:
-            parsed_date = parser.parse(str(value))
-            parsed_date = convert_to_datetime_aware(parsed_date)
+            if operator in ["is_relative_date_before", "is_relative_date_after"]:
+                parsed_date = relative_date_parse_for_feature_flag_matching(str(value))
+            else:
+                parsed_date = parser.parse(str(value))
+                parsed_date = convert_to_datetime_aware(parsed_date)
         except Exception:
             return False
 
+        if not parsed_date:
+            return False
+
         if isinstance(override_value, datetime.datetime):
             override_date = convert_to_datetime_aware(override_value)
-            if operator == "is_date_before":
+            if operator in ("is_date_before", "is_relative_date_before"):
                 return override_date < parsed_date
             else:
                 return override_date > parsed_date
         elif isinstance(override_value, datetime.date):
-            if operator == "is_date_before":
+            if operator in ("is_date_before", "is_relative_date_before"):
                 return override_value < parsed_date.date()
             else:
                 return override_value > parsed_date.date()
@@ -176,7 +200,7 @@ def compute_exact_match(value: ValueT, override_value: Any) -> bool:
             try:
                 override_date = parser.parse(override_value)
                 override_date = convert_to_datetime_aware(override_date)
-                if operator == "is_date_before":
+                if operator in ("is_date_before", "is_relative_date_before"):
                     return override_date < parsed_date
                 else:
                     return override_date > parsed_date
@@ -207,7 +231,24 @@ def empty_or_null_with_value_q(
                 f"{column}__{key}", value_as_coerced_to_number
             )
     else:
-        target_filter = Q(**{f"{column}__{key}__{operator}": value})
+        parsed_value = None
+        if operator in ("gt", "gte", "lt", "lte"):
+            try:
+                # try to parse even if arrays can't be parsed, the catch will handle it
+                parsed_value = float(value)  # type: ignore
+            except Exception:
+                pass
+
+        if parsed_value is not None:
+            # When we can coerce given value to a number, check whether the value in DB is a number
+            # and do a numeric comparison. Otherwise, do a string comparison.
+            sanitized_key = sanitize_property_key(key)
+            target_filter = Q(
+                Q(**{f"{column}__{key}__{operator}": str(value), f"{column}_{sanitized_key}_type": Value("string")})
+                | Q(**{f"{column}__{key}__{operator}": parsed_value, f"{column}_{sanitized_key}_type": Value("number")})
+            )
+        else:
+            target_filter = Q(**{f"{column}__{key}__{operator}": value})
 
     query_filter = Q(target_filter & Q(**{f"{column}__has_key": key}) & ~Q(**{f"{column}__{key}": None}))
 
@@ -229,7 +270,8 @@ def property_to_Q(
     cohorts_cache: Optional[Dict[int, Cohort]] = None,
     using_database: str = "default",
 ) -> Q:
-    if property.type in CLICKHOUSE_ONLY_PROPERTY_TYPES:
+    if property.type not in ["person", "group", "cohort", "event"]:
+        # We need to support event type for backwards compatibility, even though it's treated as a person property type
         raise ValueError(f"property_to_Q: type is not supported: {repr(property.type)}")
 
     value = property._parse_value(property.value)
@@ -298,9 +340,18 @@ def property_to_Q(
             negated=True,
         )
 
-    if property.operator in ("is_date_after", "is_date_before"):
-        effective_operator = "gt" if property.operator == "is_date_after" else "lt"
-        return Q(**{f"{column}__{property.key}__{effective_operator}": value})
+    if property.operator in ("is_date_after", "is_date_before", "is_relative_date_before", "is_relative_date_after"):
+        effective_operator = "gt" if property.operator in ("is_date_after", "is_relative_date_after") else "lt"
+        effective_value = value
+        if property.operator in ("is_relative_date_before", "is_relative_date_after"):
+            relative_date = relative_date_parse_for_feature_flag_matching(str(value))
+            if relative_date:
+                effective_value = relative_date.isoformat()
+            else:
+                # Return no data for invalid relative dates
+                return Q(pk=-1)
+
+        return Q(**{f"{column}__{property.key}__{effective_operator}": effective_value})
 
     if property.operator == "is_not":
         # is_not is inverse of exact
@@ -381,3 +432,40 @@ def is_truthy_or_falsy_property_value(value: Any) -> bool:
         or value is True
         or value is False
     )
+
+
+def relative_date_parse_for_feature_flag_matching(value: str) -> Optional[datetime.datetime]:
+    regex = r"(?P<number>[0-9]+)(?P<interval>[a-z])"
+    match = re.search(regex, value)
+    parsed_dt = datetime.datetime.now(tz=ZoneInfo("UTC"))
+    if match:
+        number = int(match.group("number"))
+        interval = match.group("interval")
+        if interval == "h":
+            parsed_dt = parsed_dt - relativedelta(hours=number)
+        elif interval == "d":
+            parsed_dt = parsed_dt - relativedelta(days=number)
+        elif interval == "w":
+            parsed_dt = parsed_dt - relativedelta(weeks=number)
+        elif interval == "m":
+            parsed_dt = parsed_dt - relativedelta(months=number)
+        elif interval == "y":
+            parsed_dt = parsed_dt - relativedelta(years=number)
+        else:
+            return None
+
+        return parsed_dt
+    else:
+        return None
+
+
+def sanitize_property_key(key: Any) -> str:
+    string_key = str(key)
+    # remove all but a-zA-Z0-9 characters from the key
+    substitute = re.sub(r"[^a-zA-Z0-9]", "", string_key)
+
+    # :TRICKY: We also want to prevent clashes between key1_ and key1, or key1 and key2 so we add
+    #  a salt based on hash of the key
+    # This is because we don't want to overwrite the value of key1 when we're trying to read key2
+    hash_value = hashlib.sha1(string_key.encode("utf-8")).hexdigest()[:15]
+    return f"{substitute}_{hash_value}"
diff --git a/posthog/queries/query_date_range.py b/posthog/queries/query_date_range.py
index e0604c3b44b91c..7ab077bac04631 100644
--- a/posthog/queries/query_date_range.py
+++ b/posthog/queries/query_date_range.py
@@ -53,9 +53,10 @@ def __init__(
     def date_to_param(self) -> datetime:
         date_to = self._now
         delta_mapping = None
+        position: str | None = None
         if isinstance(self._filter._date_to, str):
-            date_to, delta_mapping = relative_date_parse_with_delta_mapping(
-                self._filter._date_to, self._team.timezone_info, always_truncate=True
+            date_to, delta_mapping, position = relative_date_parse_with_delta_mapping(
+                self._filter._date_to, self._team.timezone_info
             )
         elif isinstance(self._filter._date_to, datetime):
             date_to = self._localize_to_team(self._filter._date_to)
@@ -64,7 +65,7 @@ def date_to_param(self) -> datetime:
         if not self._filter.use_explicit_dates:
             if not self.is_hourly(self._filter._date_to):
                 date_to = date_to.replace(hour=23, minute=59, second=59, microsecond=999999)
-            elif is_relative:
+            elif is_relative and not position:
                 date_to = date_to.replace(minute=59, second=59, microsecond=999999)
 
         return date_to
diff --git a/posthog/queries/test/__snapshots__/test_retention.ambr b/posthog/queries/test/__snapshots__/test_retention.ambr
index b148e7810cb988..98afedfabf020b 100644
--- a/posthog/queries/test/__snapshots__/test_retention.ambr
+++ b/posthog/queries/test/__snapshots__/test_retention.ambr
@@ -459,3 +459,147 @@
            intervals_from_base
   '
 ---
+# name: TestFOSSRetention.test_week_interval
+  '
+  WITH actor_query AS
+    (WITH 'Week' as period,
+          NULL as breakdown_values_filter,
+          NULL as selected_interval,
+          returning_event_query as
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
+               pdi.person_id as target
+        FROM events e
+        INNER JOIN
+          (SELECT distinct_id,
+                  argMax(person_id, version) as person_id
+           FROM person_distinct_id2
+           WHERE team_id = 2
+           GROUP BY distinct_id
+           HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+        WHERE team_id = 2
+          AND e.event = '$pageview'
+          AND toDateTime(e.timestamp) >= toDateTime('2020-06-07 00:00:00', 'UTC')
+          AND toDateTime(e.timestamp) <= toDateTime('2020-07-27 00:00:00', 'UTC')
+        GROUP BY target,
+                 event_date),
+          target_event_query as
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0) AS event_date,
+                        pdi.person_id as target,
+                        [
+                          dateDiff(
+                              'Week',
+                              toStartOfWeek(toDateTime('2020-06-07 00:00:00', 'UTC'), 0),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 0)
+                          )
+                      ] as breakdown_values
+        FROM events e
+        INNER JOIN
+          (SELECT distinct_id,
+                  argMax(person_id, version) as person_id
+           FROM person_distinct_id2
+           WHERE team_id = 2
+           GROUP BY distinct_id
+           HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+        WHERE team_id = 2
+          AND e.event = '$pageview'
+          AND toDateTime(e.timestamp) >= toDateTime('2020-06-07 00:00:00', 'UTC')
+          AND toDateTime(e.timestamp) <= toDateTime('2020-07-27 00:00:00', 'UTC') ) SELECT DISTINCT breakdown_values,
+                                                                                                    intervals_from_base,
+                                                                                                    actor_id
+     FROM
+       (SELECT target_event.breakdown_values AS breakdown_values,
+               datediff(period, target_event.event_date, returning_event.event_date) AS intervals_from_base,
+               returning_event.target AS actor_id
+        FROM target_event_query AS target_event
+        JOIN returning_event_query AS returning_event ON returning_event.target = target_event.target
+        WHERE returning_event.event_date > target_event.event_date
+        UNION ALL SELECT target_event.breakdown_values AS breakdown_values,
+                         0 AS intervals_from_base,
+                         target_event.target AS actor_id
+        FROM target_event_query AS target_event)
+     WHERE (breakdown_values_filter is NULL
+            OR breakdown_values = breakdown_values_filter)
+       AND (selected_interval is NULL
+            OR intervals_from_base = selected_interval) )
+  SELECT actor_activity.breakdown_values AS breakdown_values,
+         actor_activity.intervals_from_base AS intervals_from_base,
+         COUNT(DISTINCT actor_activity.actor_id) AS count
+  FROM actor_query AS actor_activity
+  GROUP BY breakdown_values,
+           intervals_from_base
+  ORDER BY breakdown_values,
+           intervals_from_base
+  '
+---
+# name: TestFOSSRetention.test_week_interval.1
+  '
+  WITH actor_query AS
+    (WITH 'Week' as period,
+          NULL as breakdown_values_filter,
+          NULL as selected_interval,
+          returning_event_query as
+       (SELECT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 3) AS event_date,
+               pdi.person_id as target
+        FROM events e
+        INNER JOIN
+          (SELECT distinct_id,
+                  argMax(person_id, version) as person_id
+           FROM person_distinct_id2
+           WHERE team_id = 2
+           GROUP BY distinct_id
+           HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+        WHERE team_id = 2
+          AND e.event = '$pageview'
+          AND toDateTime(e.timestamp) >= toDateTime('2020-06-08 00:00:00', 'UTC')
+          AND toDateTime(e.timestamp) <= toDateTime('2020-07-27 00:00:00', 'UTC')
+        GROUP BY target,
+                 event_date),
+          target_event_query as
+       (SELECT DISTINCT toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 3) AS event_date,
+                        pdi.person_id as target,
+                        [
+                          dateDiff(
+                              'Week',
+                              toStartOfWeek(toDateTime('2020-06-08 00:00:00', 'UTC'), 3),
+                              toStartOfWeek(toTimeZone(toDateTime(e.timestamp, 'UTC'), 'UTC'), 3)
+                          )
+                      ] as breakdown_values
+        FROM events e
+        INNER JOIN
+          (SELECT distinct_id,
+                  argMax(person_id, version) as person_id
+           FROM person_distinct_id2
+           WHERE team_id = 2
+           GROUP BY distinct_id
+           HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+        WHERE team_id = 2
+          AND e.event = '$pageview'
+          AND toDateTime(e.timestamp) >= toDateTime('2020-06-08 00:00:00', 'UTC')
+          AND toDateTime(e.timestamp) <= toDateTime('2020-07-27 00:00:00', 'UTC') ) SELECT DISTINCT breakdown_values,
+                                                                                                    intervals_from_base,
+                                                                                                    actor_id
+     FROM
+       (SELECT target_event.breakdown_values AS breakdown_values,
+               datediff(period, target_event.event_date, returning_event.event_date) AS intervals_from_base,
+               returning_event.target AS actor_id
+        FROM target_event_query AS target_event
+        JOIN returning_event_query AS returning_event ON returning_event.target = target_event.target
+        WHERE returning_event.event_date > target_event.event_date
+        UNION ALL SELECT target_event.breakdown_values AS breakdown_values,
+                         0 AS intervals_from_base,
+                         target_event.target AS actor_id
+        FROM target_event_query AS target_event)
+     WHERE (breakdown_values_filter is NULL
+            OR breakdown_values = breakdown_values_filter)
+       AND (selected_interval is NULL
+            OR intervals_from_base = selected_interval) )
+  SELECT actor_activity.breakdown_values AS breakdown_values,
+         actor_activity.intervals_from_base AS intervals_from_base,
+         COUNT(DISTINCT actor_activity.actor_id) AS count
+  FROM actor_query AS actor_activity
+  GROUP BY breakdown_values,
+           intervals_from_base
+  ORDER BY breakdown_values,
+           intervals_from_base
+  '
+---
diff --git a/posthog/queries/test/test_base.py b/posthog/queries/test/test_base.py
index bccc9ca60a53e9..e856bb315800b1 100644
--- a/posthog/queries/test/test_base.py
+++ b/posthog/queries/test/test_base.py
@@ -4,11 +4,13 @@
 
 from dateutil import parser, tz
 from django.test import TestCase
+from freezegun import freeze_time
+import pytest
 from rest_framework.exceptions import ValidationError
 
 from posthog.models.filters.path_filter import PathFilter
 from posthog.models.property.property import Property
-from posthog.queries.base import match_property
+from posthog.queries.base import match_property, sanitize_property_key
 from posthog.test.base import APIBaseTest
 
 
@@ -154,7 +156,8 @@ def test_match_properties_math_operators(self):
 
         self.assertFalse(match_property(property_a, {"key": 0}))
         self.assertFalse(match_property(property_a, {"key": -1}))
-        self.assertFalse(match_property(property_a, {"key": "23"}))
+        # now we handle type mismatches so this should be true
+        self.assertTrue(match_property(property_a, {"key": "23"}))
 
         property_b = Property(key="key", value=1, operator="lt")
         self.assertTrue(match_property(property_b, {"key": 0}))
@@ -171,16 +174,32 @@ def test_match_properties_math_operators(self):
 
         self.assertFalse(match_property(property_c, {"key": 0}))
         self.assertFalse(match_property(property_c, {"key": -1}))
-        self.assertFalse(match_property(property_c, {"key": "3"}))
+        # now we handle type mismatches so this should be true
+        self.assertTrue(match_property(property_c, {"key": "3"}))
 
         property_d = Property(key="key", value="43", operator="lt")
         self.assertTrue(match_property(property_d, {"key": "41"}))
         self.assertTrue(match_property(property_d, {"key": "42"}))
+        self.assertTrue(match_property(property_d, {"key": 42}))
 
         self.assertFalse(match_property(property_d, {"key": "43"}))
         self.assertFalse(match_property(property_d, {"key": "44"}))
         self.assertFalse(match_property(property_d, {"key": 44}))
 
+        property_e = Property(key="key", value="30", operator="lt")
+        self.assertTrue(match_property(property_e, {"key": "29"}))
+
+        # depending on the type of override, we adjust type comparison
+        self.assertTrue(match_property(property_e, {"key": "100"}))
+        self.assertFalse(match_property(property_e, {"key": 100}))
+
+        property_f = Property(key="key", value="123aloha", operator="gt")
+        self.assertFalse(match_property(property_f, {"key": "123"}))
+        self.assertFalse(match_property(property_f, {"key": 122}))
+
+        # this turns into a string comparison
+        self.assertTrue(match_property(property_f, {"key": 129}))
+
     def test_match_property_date_operators(self):
         property_a = Property(key="key", value="2022-05-01", operator="is_date_before")
         self.assertTrue(match_property(property_a, {"key": "2022-03-01"}))
@@ -227,3 +246,163 @@ def test_match_property_date_operators(self):
         self.assertTrue(match_property(property_d, {"key": "2022-04-05 12:34:11 CET"}))
 
         self.assertFalse(match_property(property_d, {"key": "2022-04-05 12:34:13 CET"}))
+
+    @freeze_time("2022-05-01")
+    def test_match_property_relative_date_operators(self):
+        property_a = Property(key="key", value="6h", operator="is_relative_date_before")
+        self.assertTrue(match_property(property_a, {"key": "2022-03-01"}))
+        self.assertTrue(match_property(property_a, {"key": "2022-04-30"}))
+        self.assertTrue(match_property(property_a, {"key": datetime.datetime(2022, 4, 30, 1, 2, 3)}))
+        # false because date comparison, instead of datetime, so reduces to same date
+        self.assertFalse(match_property(property_a, {"key": datetime.date(2022, 4, 30)}))
+
+        self.assertFalse(match_property(property_a, {"key": datetime.datetime(2022, 4, 30, 19, 2, 3)}))
+        self.assertTrue(
+            match_property(
+                property_a,
+                {"key": datetime.datetime(2022, 4, 30, 1, 2, 3, tzinfo=tz.gettz("Europe/Madrid"))},
+            )
+        )
+        self.assertTrue(match_property(property_a, {"key": parser.parse("2022-04-30")}))
+        self.assertFalse(match_property(property_a, {"key": "2022-05-30"}))
+
+        # Can't be a number
+        self.assertFalse(match_property(property_a, {"key": 1}))
+
+        # can't be invalid string
+        self.assertFalse(match_property(property_a, {"key": "abcdef"}))
+
+        property_b = Property(key="key", value="1h", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_b, {"key": "2022-05-02"}))
+        self.assertTrue(match_property(property_b, {"key": "2022-05-30"}))
+        self.assertTrue(match_property(property_b, {"key": datetime.datetime(2022, 5, 30)}))
+        self.assertTrue(match_property(property_b, {"key": parser.parse("2022-05-30")}))
+        self.assertFalse(match_property(property_b, {"key": "2022-04-30"}))
+
+        # can't be invalid string
+        self.assertFalse(match_property(property_b, {"key": "abcdef"}))
+
+        # Invalid flag property
+        property_c = Property(key="key", value=1234, operator="is_relative_date_after")
+
+        self.assertFalse(match_property(property_c, {"key": 1}))
+        self.assertFalse(match_property(property_c, {"key": "2022-05-30"}))
+
+        # # Timezone aware property
+        property_d = Property(key="key", value="12d", operator="is_relative_date_before")
+        self.assertFalse(match_property(property_d, {"key": "2022-05-30"}))
+
+        self.assertTrue(match_property(property_d, {"key": "2022-03-30"}))
+        self.assertTrue(match_property(property_d, {"key": "2022-04-05 12:34:11+01:00"}))
+        self.assertTrue(match_property(property_d, {"key": "2022-04-19 01:34:11+02:00"}))
+
+        self.assertFalse(match_property(property_d, {"key": "2022-04-19 02:00:01+02:00"}))
+
+        # Try all possible relative dates
+        property_e = Property(key="key", value="1h", operator="is_relative_date_before")
+        self.assertFalse(match_property(property_e, {"key": "2022-05-01 00:00:00"}))
+        self.assertTrue(match_property(property_e, {"key": "2022-04-30 22:00:00"}))
+
+        property_f = Property(key="key", value="1d", operator="is_relative_date_before")
+        self.assertTrue(match_property(property_f, {"key": "2022-04-29 23:59:00"}))
+        self.assertFalse(match_property(property_f, {"key": "2022-04-30 00:00:01"}))
+
+        property_g = Property(key="key", value="1w", operator="is_relative_date_before")
+        self.assertTrue(match_property(property_g, {"key": "2022-04-23 00:00:00"}))
+        self.assertFalse(match_property(property_g, {"key": "2022-04-24 00:00:00"}))
+        self.assertFalse(match_property(property_g, {"key": "2022-04-24 00:00:01"}))
+
+        property_h = Property(key="key", value="1m", operator="is_relative_date_before")
+        self.assertTrue(match_property(property_h, {"key": "2022-03-01 00:00:00"}))
+        self.assertFalse(match_property(property_h, {"key": "2022-04-05 00:00:00"}))
+
+        property_i = Property(key="key", value="1y", operator="is_relative_date_before")
+        self.assertTrue(match_property(property_i, {"key": "2021-04-28 00:00:00"}))
+        self.assertFalse(match_property(property_i, {"key": "2021-05-01 00:00:01"}))
+
+        property_j = Property(key="key", value="122h", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_j, {"key": "2022-05-01 00:00:00"}))
+        self.assertFalse(match_property(property_j, {"key": "2022-04-23 01:00:00"}))
+
+        property_k = Property(key="key", value="2d", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_k, {"key": "2022-05-01 00:00:00"}))
+        self.assertTrue(match_property(property_k, {"key": "2022-04-29 00:00:01"}))
+        self.assertFalse(match_property(property_k, {"key": "2022-04-29 00:00:00"}))
+
+        property_l = Property(key="key", value="02w", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_l, {"key": "2022-05-01 00:00:00"}))
+        self.assertFalse(match_property(property_l, {"key": "2022-04-16 00:00:00"}))
+
+        property_m = Property(key="key", value="1m", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_m, {"key": "2022-04-01 00:00:01"}))
+        self.assertFalse(match_property(property_m, {"key": "2022-04-01 00:00:00"}))
+
+        property_n = Property(key="key", value="1y", operator="is_relative_date_after")
+        self.assertTrue(match_property(property_n, {"key": "2022-05-01 00:00:00"}))
+        self.assertTrue(match_property(property_n, {"key": "2021-05-01 00:00:01"}))
+        self.assertFalse(match_property(property_n, {"key": "2021-05-01 00:00:00"}))
+        self.assertFalse(match_property(property_n, {"key": "2021-04-30 00:00:00"}))
+        self.assertFalse(match_property(property_n, {"key": "2021-03-01 12:13:00"}))
+
+    def test_none_property_value_with_all_operators(self):
+        property_a = Property(key="key", value="none", operator="is_not")
+        self.assertFalse(match_property(property_a, {"key": None}))
+        self.assertTrue(match_property(property_a, {"key": "non"}))
+
+        property_b = Property(key="key", value=None, operator="is_set")
+        self.assertTrue(match_property(property_b, {"key": None}))
+
+        property_c = Property(key="key", value="no", operator="icontains")
+        self.assertTrue(match_property(property_c, {"key": None}))
+        self.assertFalse(match_property(property_c, {"key": "smh"}))
+
+        property_d = Property(key="key", value="No", operator="regex")
+        self.assertTrue(match_property(property_d, {"key": None}))
+
+        property_d_lower_case = Property(key="key", value="no", operator="regex")
+        self.assertFalse(match_property(property_d_lower_case, {"key": None}))
+
+        property_e = Property(key="key", value=1, operator="gt")
+        self.assertTrue(match_property(property_e, {"key": None}))
+
+        property_f = Property(key="key", value=1, operator="lt")
+        self.assertFalse(match_property(property_f, {"key": None}))
+
+        property_g = Property(key="key", value="xyz", operator="gte")
+        self.assertFalse(match_property(property_g, {"key": None}))
+
+        property_h = Property(key="key", value="Oo", operator="lte")
+        self.assertTrue(match_property(property_h, {"key": None}))
+
+        property_i = Property(key="key", value="2022-05-01", operator="is_date_before")
+        self.assertFalse(match_property(property_i, {"key": None}))
+
+        property_j = Property(key="key", value="2022-05-01", operator="is_date_after")
+        self.assertFalse(match_property(property_j, {"key": None}))
+
+        property_k = Property(key="key", value="2022-05-01", operator="is_date_before")
+        self.assertFalse(match_property(property_k, {"key": "random"}))
+
+
+@pytest.mark.parametrize(
+    "key,expected",
+    [
+        ("test_key", "testkey_00942f4668670f3"),
+        ("test-key", "testkey_3acfb2c2b433c0e"),
+        ("test-!!key", "testkey_007a0fef83e9d2f"),
+        ("test-key-1", "testkey1_1af855c78902ffc"),
+        ("test-key-1-2", "testkey12_2f0c347f439af5c"),
+        ("test-key-1-2-3-4", "testkey1234_0332a83ad5c75ee"),
+        ("only_nums!!!;$£hebfjhvd", "onlynumshebfjhvd_5a1514bfab83040"),
+        (" ", "_b858cb282617fb0"),
+        ("", "_da39a3ee5e6b4b0"),
+        ("readme.md", "readmemd_275d783e2982285"),
+        ("readme≥md", "readmemd_8857015efe59db9"),
+        (None, "None_6eef6648406c333"),
+        (12, "12_7b52009b64fd0a2"),
+    ],
+)
+def test_sanitize_keys(key, expected):
+    sanitized_key = sanitize_property_key(key)
+
+    assert sanitized_key == expected
diff --git a/posthog/queries/test/test_retention.py b/posthog/queries/test/test_retention.py
index 5b823d462d9179..ea012f2d4bbc7f 100644
--- a/posthog/queries/test/test_retention.py
+++ b/posthog/queries/test/test_retention.py
@@ -419,6 +419,7 @@ def test_month_interval_with_person_on_events_v2(self):
                 ],
             )
 
+        @snapshot_clickhouse_queries
         def test_week_interval(self):
             _create_person(
                 team=self.team,
@@ -449,24 +450,27 @@ def test_week_interval(self):
                 ],
             )
 
-            result = retention().run(
-                RetentionFilter(
-                    data={
-                        "date_to": _date(10, month=1, hour=0),
-                        "period": "Week",
-                        "total_intervals": 7,
-                    }
-                ),
+            test_filter = RetentionFilter(
+                data={
+                    "date_to": _date(10, month=1, hour=0),
+                    "period": "Week",
+                    "total_intervals": 7,
+                }
+            )
+
+            # Starting with Sunday
+            result_sunday = retention().run(
+                test_filter,
                 self.team,
             )
 
             self.assertEqual(
-                pluck(result, "label"),
+                pluck(result_sunday, "label"),
                 ["Week 0", "Week 1", "Week 2", "Week 3", "Week 4", "Week 5", "Week 6"],
             )
 
             self.assertEqual(
-                pluck(result, "values", "count"),
+                pluck(result_sunday, "values", "count"),
                 [
                     [2, 2, 1, 2, 2, 0, 1],
                     [2, 1, 2, 2, 0, 1],
@@ -479,7 +483,7 @@ def test_week_interval(self):
             )
 
             self.assertEqual(
-                pluck(result, "date"),
+                pluck(result_sunday, "date"),
                 [
                     datetime(2020, 6, 7, 0, tzinfo=ZoneInfo("UTC")),
                     datetime(2020, 6, 14, 0, tzinfo=ZoneInfo("UTC")),
@@ -491,6 +495,46 @@ def test_week_interval(self):
                 ],
             )
 
+            # Starting with Monday
+            self.team.week_start_day = 1  # WeekStartDay.MONDAY's concrete value
+            self.team.save()
+
+            result_monday = retention().run(
+                test_filter,
+                self.team,
+            )
+
+            self.assertEqual(
+                pluck(result_monday, "label"),
+                ["Week 0", "Week 1", "Week 2", "Week 3", "Week 4", "Week 5", "Week 6"],
+            )
+
+            self.assertEqual(
+                pluck(result_monday, "values", "count"),
+                [
+                    [2, 2, 1, 2, 2, 0, 1],
+                    [2, 1, 2, 2, 0, 1],
+                    [1, 1, 1, 0, 0],
+                    [2, 2, 0, 1],
+                    [2, 0, 1],
+                    [0, 0],
+                    [1],
+                ],
+            )
+
+            self.assertEqual(
+                pluck(result_monday, "date"),
+                [
+                    datetime(2020, 6, 8, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 6, 15, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 6, 22, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 6, 29, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 7, 6, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 7, 13, 0, tzinfo=ZoneInfo("UTC")),
+                    datetime(2020, 7, 20, 0, tzinfo=ZoneInfo("UTC")),
+                ],
+            )
+
         def test_hour_interval(self):
             _create_person(
                 team=self.team,
diff --git a/posthog/queries/util.py b/posthog/queries/util.py
index 8fdda3799dbd1a..adf37193f6c29e 100644
--- a/posthog/queries/util.py
+++ b/posthog/queries/util.py
@@ -107,7 +107,7 @@ def get_start_of_interval_sql(
     elif "%(timezone)s" not in source:
         source = f"toTimeZone(toDateTime({source}, 'UTC'), %(timezone)s)"
     trunc_func_args = [source]
-    if interval == "week":
+    if trunc_func == "toStartOfWeek":
         trunc_func_args.append((WeekStartDay(team.week_start_day or 0)).clickhouse_mode)
     interval_sql = f"{trunc_func}({', '.join(trunc_func_args)})"
     # For larger intervals dates are returned instead of datetimes, and we always want datetimes for comparisons
diff --git a/posthog/schema.py b/posthog/schema.py
index a219fcdcc3b38d..3b86559f8fc784 100644
--- a/posthog/schema.py
+++ b/posthog/schema.py
@@ -481,6 +481,7 @@ class SavedInsightNode(BaseModel):
     full: Optional[bool] = Field(
         default=None, description="Show with most visual options enabled. Used in insight scene."
     )
+    hidePersonsModal: Optional[bool] = None
     kind: Literal["SavedInsightNode"] = "SavedInsightNode"
     propertiesViaUrl: Optional[bool] = Field(default=None, description="Link properties via the URL (default: false)")
     shortId: str
@@ -514,6 +515,7 @@ class SavedInsightNode(BaseModel):
     showSearch: Optional[bool] = Field(default=None, description="Include a free text search field (PersonsNode only)")
     showTable: Optional[bool] = None
     showTimings: Optional[bool] = Field(default=None, description="Show a detailed query timing breakdown")
+    suppressSessionAnalysisWarning: Optional[bool] = None
 
 
 class SessionPropertyFilter(BaseModel):
@@ -828,15 +830,22 @@ class HogQLQueryResponse(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
-    clickhouse: Optional[str] = None
-    columns: Optional[List] = None
-    explain: Optional[List[str]] = None
-    hogql: Optional[str] = None
-    modifiers: Optional[HogQLQueryModifiers] = None
-    query: Optional[str] = None
-    results: Optional[List] = None
-    timings: Optional[List[QueryTiming]] = None
-    types: Optional[List] = None
+    clickhouse: Optional[str] = Field(default=None, description="Executed ClickHouse query")
+    columns: Optional[List] = Field(default=None, description="Returned columns")
+    error: Optional[str] = Field(
+        default=None, description="Query error. Returned only if 'explain' is true. Throws an error otherwise."
+    )
+    explain: Optional[List[str]] = Field(default=None, description="Query explanation output")
+    hogql: Optional[str] = Field(default=None, description="Generated HogQL query")
+    modifiers: Optional[HogQLQueryModifiers] = Field(
+        default=None, description="Modifiers used when performing the query"
+    )
+    query: Optional[str] = Field(default=None, description="Input query string")
+    results: Optional[List] = Field(default=None, description="Query results")
+    timings: Optional[List[QueryTiming]] = Field(
+        default=None, description="Measured timings for different parts of the query generation process"
+    )
+    types: Optional[List] = Field(default=None, description="Types of returned columns")
 
 
 class LifecycleFilter(BaseModel):
@@ -950,7 +959,7 @@ class WebAnalyticsQueryBase(BaseModel):
         extra="forbid",
     )
     dateRange: Optional[DateRange] = None
-    properties: List[Union[EventPropertyFilter, HogQLPropertyFilter]]
+    properties: List[Union[EventPropertyFilter, PersonPropertyFilter]]
 
 
 class WebOverviewQuery(BaseModel):
@@ -959,7 +968,7 @@ class WebOverviewQuery(BaseModel):
     )
     dateRange: Optional[DateRange] = None
     kind: Literal["WebOverviewQuery"] = "WebOverviewQuery"
-    properties: List[Union[EventPropertyFilter, HogQLPropertyFilter]]
+    properties: List[Union[EventPropertyFilter, PersonPropertyFilter]]
     response: Optional[WebOverviewQueryResponse] = None
 
 
@@ -970,7 +979,7 @@ class WebStatsTableQuery(BaseModel):
     breakdownBy: WebStatsBreakdown
     dateRange: Optional[DateRange] = None
     kind: Literal["WebStatsTableQuery"] = "WebStatsTableQuery"
-    properties: List[Union[EventPropertyFilter, HogQLPropertyFilter]]
+    properties: List[Union[EventPropertyFilter, PersonPropertyFilter]]
     response: Optional[WebStatsTableQueryResponse] = None
 
 
@@ -980,7 +989,7 @@ class WebTopClicksQuery(BaseModel):
     )
     dateRange: Optional[DateRange] = None
     kind: Literal["WebTopClicksQuery"] = "WebTopClicksQuery"
-    properties: List[Union[EventPropertyFilter, HogQLPropertyFilter]]
+    properties: List[Union[EventPropertyFilter, PersonPropertyFilter]]
     response: Optional[WebTopClicksQueryResponse] = None
 
 
@@ -1712,6 +1721,7 @@ class InsightVizNode(BaseModel):
     full: Optional[bool] = Field(
         default=None, description="Show with most visual options enabled. Used in insight scene."
     )
+    hidePersonsModal: Optional[bool] = None
     kind: Literal["InsightVizNode"] = "InsightVizNode"
     showCorrelationTable: Optional[bool] = None
     showFilters: Optional[bool] = None
@@ -1721,6 +1731,7 @@ class InsightVizNode(BaseModel):
     showResults: Optional[bool] = None
     showTable: Optional[bool] = None
     source: Union[TrendsQuery, FunnelsQuery, RetentionQuery, PathsQuery, StickinessQuery, LifecycleQuery]
+    suppressSessionAnalysisWarning: Optional[bool] = None
 
 
 class InsightPersonsQuery(BaseModel):
diff --git a/posthog/session_recordings/queries/session_replay_events.py b/posthog/session_recordings/queries/session_replay_events.py
index 0d60559c7a0478..e77d923fa4709b 100644
--- a/posthog/session_recordings/queries/session_replay_events.py
+++ b/posthog/session_recordings/queries/session_replay_events.py
@@ -23,7 +23,11 @@ def exists(self, session_id: str, team: Team) -> bool:
             FROM session_replay_events
             WHERE team_id = %(team_id)s
             AND session_id = %(session_id)s
-            AND min_first_timestamp >= now() - INTERVAL %(recording_ttl_days)s DAY
+            -- we should check for the `ttl_days(team)` TTL here,
+            -- but for a shared/pinned recording
+            -- the TTL effectively becomes 1 year
+            -- and we don't know which we're dealing with
+            AND min_first_timestamp >= now() - INTERVAL 370 DAY
             """,
             {
                 "team_id": team.pk,
diff --git a/posthog/settings/__init__.py b/posthog/settings/__init__.py
index 58010175ea5804..d1e13759ee074f 100644
--- a/posthog/settings/__init__.py
+++ b/posthog/settings/__init__.py
@@ -30,6 +30,7 @@
 from posthog.settings.ingestion import *
 from posthog.settings.feature_flags import *
 from posthog.settings.geoip import *
+from posthog.settings.metrics import *
 from posthog.settings.schedules import *
 from posthog.settings.sentry import *
 from posthog.settings.shell_plus import *
diff --git a/posthog/settings/metrics.py b/posthog/settings/metrics.py
new file mode 100644
index 00000000000000..2eea1824927362
--- /dev/null
+++ b/posthog/settings/metrics.py
@@ -0,0 +1,3 @@
+import os
+
+PROMETHEUS_METRICS_EXPORT_PORT = os.getenv("PROMETHEUS_METRICS_EXPORT_PORT", "8001")
diff --git a/posthog/temporal/tests/batch_exports/README.md b/posthog/temporal/tests/batch_exports/README.md
index 5d2b631338c4f7..12bf2f6177cd35 100644
--- a/posthog/temporal/tests/batch_exports/README.md
+++ b/posthog/temporal/tests/batch_exports/README.md
@@ -36,3 +36,24 @@ For PostHog employees, check the password manager as a set of development creden
 ```bash
 DEBUG=1 REDSHIFT_HOST=workgroup.111222333.region.redshift-serverless.amazonaws.com REDSHIFT_USER=test_user REDSHIFT_PASSWORD=test_password pytest posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py
 ```
+
+Replace the `REDSHIFT_*` environment variables with the values obtained from the setup steps.
+
+## Testing S3 batch exports
+
+S3 batch exports are tested against a MinIO bucket available in the local development stack. However there are also unit tests that specifically target an S3 bucket. Additional setup is required to run those specific tests:
+
+1. Ensure you are logged in to an AWS account.
+2. Create or choose an existing S3 bucket from that AWS account to use as the test bucket.
+3. Create or choose an existing KMS key id from that AWS account to use in tests.
+4. Make sure the role/user you are logged in as has permissions to use the bucket and KMS key.
+
+For PostHog employees, check your password manager for these details.
+
+With these setup steps done, we can run all tests (MinIO and S3 bucket) from the root of the `posthog` repo with:
+
+```bash
+DEBUG=1 S3_TEST_KMS_KEY_ID='1111111-2222-3333-4444-55555555555' S3_TEST_BUCKET='your-test-bucket' pytest posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py
+```
+
+Replace the `S3_*` environment variables with the values obtained from the setup steps.
diff --git a/posthog/temporal/tests/batch_exports/base.py b/posthog/temporal/tests/batch_exports/base.py
deleted file mode 100644
index 69c00111d46155..00000000000000
--- a/posthog/temporal/tests/batch_exports/base.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import datetime as dt
-import json
-import typing
-import uuid
-
-from asgiref.sync import sync_to_async
-
-from ee.clickhouse.materialized_columns.columns import materialize
-from posthog.batch_exports.models import BatchExportBackfill
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
-
-
-class EventValues(typing.TypedDict):
-    """Events to be inserted for testing."""
-
-    _timestamp: str
-    created_at: str
-    distinct_id: str
-    elements_chain: str | None
-    event: str
-    inserted_at: str
-    person_id: str
-    person_properties: dict | None
-    properties: dict | None
-    team_id: int
-    timestamp: str
-    uuid: str
-
-
-async def insert_events(client: ClickHouseClient, events: list[EventValues]):
-    """Insert some events into the sharded_events table."""
-
-    await client.execute_query(
-        f"""
-        INSERT INTO `sharded_events` (
-            uuid,
-            event,
-            timestamp,
-            _timestamp,
-            person_id,
-            team_id,
-            properties,
-            elements_chain,
-            distinct_id,
-            inserted_at,
-            created_at,
-            person_properties
-        )
-        VALUES
-        """,
-        *[
-            (
-                event["uuid"],
-                event["event"],
-                event["timestamp"],
-                event["_timestamp"],
-                event["person_id"],
-                event["team_id"],
-                json.dumps(event["properties"]) if isinstance(event["properties"], dict) else event["properties"],
-                event["elements_chain"],
-                event["distinct_id"],
-                event["inserted_at"],
-                event["created_at"],
-                json.dumps(event["person_properties"])
-                if isinstance(event["person_properties"], dict)
-                else event["person_properties"],
-            )
-            for event in events
-        ],
-    )
-
-
-@sync_to_async
-def amaterialize(table: typing.Literal["events", "person", "groups"], column: str):
-    """Materialize a column in a table."""
-    return materialize(table, column)
-
-
-def to_isoformat(d: str | None) -> str | None:
-    """Parse a string and return it as default isoformatted."""
-    if d is None:
-        return None
-    return dt.datetime.fromisoformat(d).replace(tzinfo=dt.timezone.utc).isoformat()
-
-
-def fetch_batch_export_backfills(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportBackfill]:
-    """Fetch the BatchExportBackfills for a given BatchExport."""
-    return list(BatchExportBackfill.objects.filter(batch_export_id=batch_export_id).order_by("-created_at")[:limit])
-
-
-async def afetch_batch_export_backfills(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportBackfill]:
-    """Fetch the BatchExportBackfills for a given BatchExport."""
-    return await sync_to_async(fetch_batch_export_backfills)(batch_export_id, limit)  # type: ignore
diff --git a/posthog/temporal/tests/batch_exports/conftest.py b/posthog/temporal/tests/batch_exports/conftest.py
index ceb03e59e2a923..28ef7aee14c6c8 100644
--- a/posthog/temporal/tests/batch_exports/conftest.py
+++ b/posthog/temporal/tests/batch_exports/conftest.py
@@ -1,27 +1,42 @@
 import pytest
 import pytest_asyncio
-from django.conf import settings
 
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
+
+@pytest.fixture
+def interval(request) -> str:
+    """A parametrizable fixture to configure a batch export interval.
+
+    By decorating a test function with @pytest.mark.parametrize("interval", ..., indirect=True)
+    it's possible to set the interval that will be used to create a BatchExport.
+    Possible values are "hour", "day", or "every {value} {unit}".
+    As interval must be defined for every BatchExport, so we default to "hour" to
+    support tests that do not parametrize this.
+    """
+    try:
+        return request.param
+    except AttributeError:
+        return "hour"
 
 
 @pytest.fixture
-def ch_client():
-    """Fixture to provide a ClickHouseClient."""
-    client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-    yield client
+def exclude_events(request) -> list[str] | None:
+    """A parametrizable fixture to configure event names to exclude from a BatchExport.
+
+    By decorating a test function with @pytest.mark.parametrize("exclude_events", ..., indirect=True)
+    it's possible to set the exclude_events that will be used to create a BatchExport.
+    Any list of event names can be used, or None (the default).
+    """
+    try:
+        return request.param
+    except AttributeError:
+        return None
 
 
-@pytest_asyncio.fixture
-async def truncate_events(ch_client):
-    """Fixture to truncate sharded_events after a test.
+@pytest_asyncio.fixture(autouse=True)
+async def truncate_events(clickhouse_client):
+    """Fixture to automatically truncate sharded_events after a test.
 
     This is useful if during the test setup we insert a lot of events we wish to clean-up.
     """
     yield
-    await ch_client.execute_query("TRUNCATE TABLE `sharded_events`")
+    await clickhouse_client.execute_query("TRUNCATE TABLE `sharded_events`")
diff --git a/posthog/temporal/tests/batch_exports/fixtures.py b/posthog/temporal/tests/batch_exports/fixtures.py
deleted file mode 100644
index d54db02304cc53..00000000000000
--- a/posthog/temporal/tests/batch_exports/fixtures.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from uuid import UUID
-
-from asgiref.sync import sync_to_async
-from temporalio.client import Client
-
-from posthog.batch_exports.models import (
-    BatchExport,
-    BatchExportDestination,
-    BatchExportRun,
-)
-from posthog.batch_exports.service import sync_batch_export
-
-
-def create_batch_export(team_id: int, interval: str, name: str, destination_data: dict) -> BatchExport:
-    """Create a BatchExport and its underlying Schedule."""
-
-    destination = BatchExportDestination(**destination_data)
-    batch_export = BatchExport(team_id=team_id, destination=destination, interval=interval, name=name)
-
-    sync_batch_export(batch_export, created=True)
-
-    destination.save()
-    batch_export.save()
-
-    return batch_export
-
-
-async def acreate_batch_export(team_id: int, interval: str, name: str, destination_data: dict) -> BatchExport:
-    """Create a BatchExport and its underlying Schedule."""
-    return await sync_to_async(create_batch_export)(team_id, interval, name, destination_data)  # type: ignore
-
-
-def fetch_batch_export_runs(batch_export_id: UUID, limit: int = 100) -> list[BatchExportRun]:
-    """Fetch the BatchExportRuns for a given BatchExport."""
-    return list(BatchExportRun.objects.filter(batch_export_id=batch_export_id).order_by("-created_at")[:limit])
-
-
-async def afetch_batch_export_runs(batch_export_id: UUID, limit: int = 100) -> list[BatchExportRun]:
-    """Fetch the BatchExportRuns for a given BatchExport."""
-    return await sync_to_async(fetch_batch_export_runs)(batch_export_id, limit)  # type: ignore
-
-
-async def adelete_batch_export(batch_export: BatchExport, temporal: Client) -> None:
-    """Delete a BatchExport and its underlying Schedule."""
-    handle = temporal.get_schedule_handle(str(batch_export.id))
-    await handle.delete()
-
-    await sync_to_async(batch_export.delete)()  # type: ignore
diff --git a/posthog/temporal/tests/batch_exports/test_backfill_batch_export.py b/posthog/temporal/tests/batch_exports/test_backfill_batch_export.py
index 6b4ffbe4de5f97..105f331995d2f0 100644
--- a/posthog/temporal/tests/batch_exports/test_backfill_batch_export.py
+++ b/posthog/temporal/tests/batch_exports/test_backfill_batch_export.py
@@ -1,4 +1,3 @@
-import asyncio
 import datetime as dt
 import uuid
 
@@ -9,16 +8,12 @@
 import temporalio.common
 import temporalio.testing
 import temporalio.worker
-from asgiref.sync import sync_to_async
 from django.conf import settings
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.client import connect
-from posthog.temporal.tests.batch_exports.base import afetch_batch_export_backfills
-from posthog.temporal.tests.batch_exports.fixtures import (
+from posthog.temporal.tests.utils.models import (
     acreate_batch_export,
     adelete_batch_export,
+    afetch_batch_export_backfills,
 )
 from posthog.temporal.workflows.backfill_batch_export import (
     BackfillBatchExportInputs,
@@ -28,37 +23,8 @@
     backfill_schedule,
     get_schedule_frequency,
 )
-from posthog.temporal.workflows.batch_exports import (
-    create_batch_export_backfill_model,
-    update_batch_export_backfill_model_status,
-)
-from posthog.temporal.workflows.noop import NoOpWorkflow, noop_activity
-
-
-@pytest_asyncio.fixture
-async def temporal_client():
-    """Yield a Temporal Client."""
-    client = await connect(
-        settings.TEMPORAL_HOST,
-        settings.TEMPORAL_PORT,
-        settings.TEMPORAL_NAMESPACE,
-        settings.TEMPORAL_CLIENT_ROOT_CA,
-        settings.TEMPORAL_CLIENT_CERT,
-        settings.TEMPORAL_CLIENT_KEY,
-    )
-
-    return client
-
-
-@pytest_asyncio.fixture
-async def team():
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
 
-    yield team
-
-    sync_to_async(team.delete)()
-    sync_to_async(organization.delete)()
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest_asyncio.fixture
@@ -90,30 +56,6 @@ async def temporal_schedule(temporal_client, team):
     await adelete_batch_export(batch_export, temporal_client)
 
 
-@pytest_asyncio.fixture
-async def temporal_worker(temporal_client):
-    worker = temporalio.worker.Worker(
-        temporal_client,
-        task_queue=settings.TEMPORAL_TASK_QUEUE,
-        workflows=[NoOpWorkflow, BackfillBatchExportWorkflow],
-        activities=[
-            noop_activity,
-            backfill_schedule,
-            create_batch_export_backfill_model,
-            update_batch_export_backfill_model_status,
-            get_schedule_frequency,
-        ],
-        workflow_runner=temporalio.worker.UnsandboxedWorkflowRunner(),
-    )
-
-    worker_run = asyncio.create_task(worker.run())
-
-    yield worker
-
-    worker_run.cancel()
-    await asyncio.wait([worker_run])
-
-
 @pytest.mark.parametrize(
     "start_at,end_at,step,expected",
     [
@@ -189,7 +131,6 @@ def test_backfill_range(start_at, end_at, step, expected):
     assert result == expected
 
 
-@pytest.mark.asyncio
 @pytest.mark.django_db(transaction=True)
 async def test_get_schedule_frequency(activity_environment, temporal_worker, temporal_schedule):
     """Test get_schedule_frequency returns the correct interval."""
@@ -201,7 +142,6 @@ async def test_get_schedule_frequency(activity_environment, temporal_worker, tem
     assert result == expected
 
 
-@pytest.mark.asyncio
 @pytest.mark.django_db(transaction=True)
 async def test_backfill_schedule_activity(activity_environment, temporal_worker, temporal_schedule):
     """Test backfill_schedule activity schedules all backfill runs."""
@@ -228,7 +168,6 @@ async def test_backfill_schedule_activity(activity_environment, temporal_worker,
 
 
 @pytest.mark.django_db(transaction=True)
-@pytest.mark.asyncio
 async def test_backfill_batch_export_workflow(temporal_worker, temporal_schedule, temporal_client, team):
     """Test BackfillBatchExportWorkflow executes all backfill runs and updates model."""
     start_at = dt.datetime(2023, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc)
diff --git a/posthog/temporal/tests/batch_exports/test_batch_exports.py b/posthog/temporal/tests/batch_exports/test_batch_exports.py
index e59d6c178c7f1c..3b988307e2e91a 100644
--- a/posthog/temporal/tests/batch_exports/test_batch_exports.py
+++ b/posthog/temporal/tests/batch_exports/test_batch_exports.py
@@ -9,23 +9,19 @@
 import string
 import uuid
 from random import randint
-from typing import TypedDict
 from unittest.mock import patch
-from uuid import uuid4
 
-import aiohttp
 import pytest
-import pytest_asyncio
-from django.conf import settings
 from freezegun import freeze_time
 from temporalio import activity, workflow
 
 from posthog.clickhouse.log_entries import (
     KAFKA_LOG_ENTRIES,
 )
-from posthog.temporal.tests.batch_exports.base import (
+from posthog.temporal.tests.utils.datetimes import (
     to_isoformat,
 )
+from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
 from posthog.temporal.workflows.batch_exports import (
     BatchExportTemporaryFile,
     KafkaLoggingHandler,
@@ -35,330 +31,141 @@
     get_rows_count,
     json_dumps_bytes,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
-
-EventValues = TypedDict(
-    "EventValues",
-    {
-        "uuid": str,
-        "event": str,
-        "_timestamp": str,
-        "timestamp": str,
-        "inserted_at": str,
-        "created_at": str,
-        "distinct_id": str,
-        "person_id": str,
-        "person_properties": dict | None,
-        "team_id": int,
-        "properties": dict | None,
-        "elements_chain": str | None,
-        "elements": str | None,
-        "ip": str | None,
-        "site_url": str | None,
-        "set": str | None,
-        "set_once": str | None,
-    },
-)
-
-
-async def insert_events(ch_client: ClickHouseClient, events: list[EventValues]):
-    """Insert some events into the sharded_events table."""
-    await ch_client.execute_query(
-        f"""
-        INSERT INTO `sharded_events` (
-            uuid,
-            event,
-            timestamp,
-            _timestamp,
-            inserted_at,
-            person_id,
-            team_id,
-            properties,
-            elements_chain,
-            distinct_id,
-            created_at,
-            person_properties
-        )
-        VALUES
-        """,
-        *[
-            (
-                event["uuid"],
-                event["event"],
-                event["timestamp"],
-                event["_timestamp"],
-                event["inserted_at"],
-                event["person_id"],
-                event["team_id"],
-                json.dumps(event["properties"]) if isinstance(event["properties"], dict) else event["properties"],
-                event["elements_chain"],
-                event["distinct_id"],
-                event["created_at"],
-                json.dumps(event["person_properties"])
-                if isinstance(event["person_properties"], dict)
-                else event["person_properties"],
-            )
-            for event in events
-        ],
-    )
 
+pytestmark = [pytest.mark.django_db, pytest.mark.asyncio]
 
-@pytest_asyncio.fixture
-async def client():
-    async with aiohttp.ClientSession() as session:
-        client = ClickHouseClient(
-            session=session,
-            url=settings.CLICKHOUSE_HTTP_URL,
-            user=settings.CLICKHOUSE_USER,
-            password=settings.CLICKHOUSE_PASSWORD,
-            database=settings.CLICKHOUSE_DATABASE,
-        )
-        count = int(await client.read_query("SELECT count(*) FROM `sharded_events`"))
-
-        yield client
 
-        new_count = int(await client.read_query("SELECT count(*) FROM `sharded_events`"))
-        if new_count > count:
-            await client.execute_query("TRUNCATE TABLE `sharded_events`")
-
-
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_get_rows_count(client):
+async def test_get_rows_count(clickhouse_client):
     """Test the count of rows returned by get_rows_count."""
     team_id = randint(1, 1000000)
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "http://localhost.com",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    await insert_events(
-        ch_client=client,
-        events=events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    _ = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=False,
     )
 
-    row_count = await get_rows_count(client, team_id, "2023-04-20 14:30:00", "2023-04-20 14:31:00")
+    row_count = await get_rows_count(
+        clickhouse_client, team_id, data_interval_start.isoformat(), data_interval_end.isoformat()
+    )
     assert row_count == 10000
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_get_rows_count_handles_duplicates(client):
+async def test_get_rows_count_handles_duplicates(clickhouse_client):
     """Test the count of rows returned by get_rows_count are de-duplicated."""
     team_id = randint(1, 1000000)
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "http://localhost.com",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    # Duplicate everything
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    _ = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=True,
     )
 
-    row_count = await get_rows_count(client, team_id, "2023-04-20 14:30:00", "2023-04-20 14:31:00")
-    assert row_count == 10000
+    row_count = await get_rows_count(
+        clickhouse_client, team_id, data_interval_start.isoformat(), data_interval_end.isoformat()
+    )
+    assert row_count == 10
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_get_rows_count_can_exclude_events(client):
+async def test_get_rows_count_can_exclude_events(clickhouse_client):
     """Test the count of rows returned by get_rows_count can exclude events."""
     team_id = randint(1, 1000000)
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "http://localhost.com",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    # Duplicate everything
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=False,
     )
 
     # Exclude the latter half of events.
-    exclude_events = (f"test-{i}" for i in range(5000, 10000))
+    exclude_events = (event["event"] for event in events[5000:])
     row_count = await get_rows_count(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         exclude_events=exclude_events,
     )
     assert row_count == 5000
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_get_rows_count_can_include_events(client):
+async def test_get_rows_count_can_include_events(clickhouse_client):
     """Test the count of rows returned by get_rows_count can include events."""
     team_id = randint(1, 1000000)
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "http://localhost.com",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    # Duplicate everything
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=5000,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=False,
     )
 
     # Include the latter half of events.
-    include_events = (f"test-{i}" for i in range(5000, 10000))
+    include_events = (event["event"] for event in events[2500:])
     row_count = await get_rows_count(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         include_events=include_events,
     )
-    assert row_count == 5000
+    assert row_count == 2500
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
 @pytest.mark.parametrize("include_person_properties", (False, True))
-async def test_get_results_iterator(client, include_person_properties):
+async def test_get_results_iterator(clickhouse_client, include_person_properties):
     """Test the rows returned by get_results_iterator."""
     team_id = randint(1, 1000000)
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(20000)
-    ]
-    await insert_events(
-        ch_client=client,
-        events=events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=False,
+        person_properties={"$browser": "Chrome", "$os": "Mac OS X"},
     )
 
     iter_ = get_results_iterator(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         include_person_properties=include_person_properties,
     )
     rows = [row for row in iter_]
@@ -382,52 +189,30 @@ async def test_get_results_iterator(client, include_person_properties):
             assert value == expected_value, f"{key} value in {result} didn't match value in {expected}"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
 @pytest.mark.parametrize("include_person_properties", (False, True))
-async def test_get_results_iterator_handles_duplicates(client, include_person_properties):
+async def test_get_results_iterator_handles_duplicates(clickhouse_client, include_person_properties):
     """Test the rows returned by get_results_iterator are de-duplicated."""
     team_id = randint(1, 1000000)
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=True,
+        person_properties={"$browser": "Chrome", "$os": "Mac OS X"},
     )
 
     iter_ = get_results_iterator(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         include_person_properties=include_person_properties,
     )
     rows = [row for row in iter_]
@@ -452,54 +237,32 @@ async def test_get_results_iterator_handles_duplicates(client, include_person_pr
             assert value == expected_value, f"{key} value in {result} didn't match value in {expected}"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
 @pytest.mark.parametrize("include_person_properties", (False, True))
-async def test_get_results_iterator_can_exclude_events(client, include_person_properties):
+async def test_get_results_iterator_can_exclude_events(clickhouse_client, include_person_properties):
     """Test the rows returned by get_results_iterator can exclude events."""
     team_id = randint(1, 1000000)
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=True,
+        person_properties={"$browser": "Chrome", "$os": "Mac OS X"},
     )
 
     # Exclude the latter half of events.
-    exclude_events = (f"test-{i}" for i in range(5000, 10000))
+    exclude_events = (event["event"] for event in events[5000:])
     iter_ = get_results_iterator(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         exclude_events=exclude_events,
         include_person_properties=include_person_properties,
     )
@@ -525,54 +288,32 @@ async def test_get_results_iterator_can_exclude_events(client, include_person_pr
             assert value == expected_value, f"{key} value in {result} didn't match value in {expected}"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
 @pytest.mark.parametrize("include_person_properties", (False, True))
-async def test_get_results_iterator_can_include_events(client, include_person_properties):
+async def test_get_results_iterator_can_include_events(clickhouse_client, include_person_properties):
     """Test the rows returned by get_results_iterator can include events."""
     team_id = randint(1, 1000000)
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "127.0.0.1",
-                "$current_url": "http://localhost.com",
-            },
-            "elements_chain": "this that and the other",
-            "elements": json.dumps("this that and the other"),
-            "ip": "127.0.0.1",
-            "site_url": "",
-            "set": None,
-            "set_once": None,
-        }
-        for i in range(10000)
-    ]
-    duplicate_events = events * 2
-
-    await insert_events(
-        ch_client=client,
-        events=duplicate_events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:31:00.000000+00:00")
+    data_interval_start = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=0,
+        count_other_team=0,
+        duplicate=True,
+        person_properties={"$browser": "Chrome", "$os": "Mac OS X"},
     )
 
     # Include the latter half of events.
-    include_events = (f"test-{i}" for i in range(5000, 10000))
+    include_events = (event["event"] for event in events[5000:])
     iter_ = get_results_iterator(
-        client,
+        clickhouse_client,
         team_id,
-        "2023-04-20 14:30:00",
-        "2023-04-20 14:31:00",
+        data_interval_start.isoformat(),
+        data_interval_end.isoformat(),
         include_events=include_events,
         include_person_properties=include_person_properties,
     )
diff --git a/posthog/temporal/tests/batch_exports/test_bigquery_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_bigquery_batch_export_workflow.py
index d939495a9abe97..72646e2e993c47 100644
--- a/posthog/temporal/tests/batch_exports/test_bigquery_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_bigquery_batch_export_workflow.py
@@ -2,12 +2,12 @@
 import datetime as dt
 import json
 import os
+import typing
 from random import randint
 from uuid import uuid4
 
 import pytest
 import pytest_asyncio
-from asgiref.sync import sync_to_async
 from django.conf import settings
 from freezegun.api import freeze_time
 from google.cloud import bigquery
@@ -17,19 +17,8 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.client import connect
-from posthog.temporal.tests.batch_exports.base import (
-    EventValues,
-    amaterialize,
-    insert_events,
-)
-from posthog.temporal.tests.batch_exports.fixtures import (
-    acreate_batch_export,
-    adelete_batch_export,
-    afetch_batch_export_runs,
-)
+from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
+from posthog.temporal.tests.utils.models import acreate_batch_export, adelete_batch_export, afetch_batch_export_runs
 from posthog.temporal.workflows.batch_exports import (
     create_export_run,
     update_export_run_status,
@@ -40,14 +29,17 @@
     BigQueryInsertInputs,
     insert_into_bigquery_activity,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
+
+pytestmark = [pytest.mark.asyncio, pytest.mark.django_db]
 
 TEST_TIME = dt.datetime.utcnow()
 
 
-def assert_events_in_bigquery(client, table_id, dataset_id, events, bq_ingested_timestamp):
+def assert_events_in_bigquery(
+    client, table_id, dataset_id, events, bq_ingested_timestamp, exclude_events: list[str] | None = None
+):
     """Assert provided events written to a given BigQuery table."""
-    query_job = client.query(f"SELECT * FROM {dataset_id}.{table_id} ORDER BY timestamp")
+    query_job = client.query(f"SELECT * FROM {dataset_id}.{table_id} ORDER BY event, timestamp")
     result = query_job.result()
 
     inserted_events = []
@@ -57,15 +49,32 @@ def assert_events_in_bigquery(client, table_id, dataset_id, events, bq_ingested_
         inserted_event = {k: json.loads(v) if k in json_columns and v is not None else v for k, v in row.items()}
         inserted_events.append(inserted_event)
 
+    # Reconstruct bq_ingested_timestamp in case we are faking dates.
+    bq_ingested_timestamp = dt.datetime(
+        bq_ingested_timestamp.year,
+        bq_ingested_timestamp.month,
+        bq_ingested_timestamp.day,
+        bq_ingested_timestamp.hour,
+        bq_ingested_timestamp.minute,
+        bq_ingested_timestamp.second,
+        bq_ingested_timestamp.microsecond,
+        bq_ingested_timestamp.tzinfo,
+    )
+
     expected_events = []
     for event in events:
+        event_name = event.get("event")
+
+        if exclude_events is not None and event_name in exclude_events:
+            continue
+
         properties = event.get("properties", None)
         elements_chain = event.get("elements_chain", None)
         expected_event = {
             "bq_ingested_timestamp": bq_ingested_timestamp,
             "distinct_id": event.get("distinct_id"),
             "elements": json.dumps(elements_chain),
-            "event": event.get("event"),
+            "event": event_name,
             "ip": properties.get("$ip", None) if properties else None,
             "properties": event.get("properties"),
             "set": properties.get("$set", None) if properties else None,
@@ -78,12 +87,11 @@ def assert_events_in_bigquery(client, table_id, dataset_id, events, bq_ingested_
         }
         expected_events.append(expected_event)
 
-    expected_events.sort(key=lambda x: x["timestamp"])
+    expected_events.sort(key=lambda x: (x["event"], x["timestamp"]))
 
     # First check one event, the first one, so that we can get a nice diff if
     # the included data is different.
     assert inserted_events[0] == expected_events[0]
-    assert len(inserted_events) == len(expected_events)
     assert inserted_events == expected_events
 
 
@@ -107,7 +115,8 @@ def bigquery_config() -> dict[str, str]:
 
 
 @pytest.fixture
-def bigquery_client() -> bigquery.Client:
+def bigquery_client() -> typing.Generator[bigquery.Client, None, None]:
+    """Manage a bigquery.Client for testing."""
     client = bigquery.Client()
 
     try:
@@ -120,135 +129,74 @@ def bigquery_client() -> bigquery.Client:
     "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ,
     reason="Google credentials not set in environment",
 )
-@pytest.mark.django_db
-@pytest.mark.asyncio
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
-    activity_environment, bigquery_client, bigquery_config
+    clickhouse_client, activity_environment, bigquery_client, bigquery_config, exclude_events
 ):
-    """Test that the insert_into_bigquery_activity function inserts data into a Bigquery table."""
-
-    data_interval_start = "2023-04-20 14:00:00"
-    data_interval_end = "2023-04-25 15:00:00"
+    """Test that the insert_into_bigquery_activity function inserts data into a BigQuery table.
+
+    We use the generate_test_events_in_clickhouse function to generate several sets
+    of events. Some of these sets are expected to be exported, and others not. Expected
+    events are those that:
+    * Are created for the team_id of the batch export.
+    * Are created in the date range of the batch export.
+    * Are not duplicates of other events that are in the same batch.
+    * Do not have an event name contained in the batch export's exclude_events.
+
+    Once we have these events, we pass them to the assert_events_in_bigquery function to check
+    that they appear in the expected BigQuery table.
+    """
+    data_interval_start = dt.datetime(2023, 4, 20, 14, 0, 0, tzinfo=dt.timezone.utc)
+    data_interval_end = dt.datetime(2023, 4, 25, 15, 0, 0, tzinfo=dt.timezone.utc)
 
     # Generate a random team id integer. There's still a chance of a collision,
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    # Add a materialized column such that we can verify that it is NOT included
-    # in the export.
-    await amaterialize("events", "$browser")
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "elements_chain": "",
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(10000)
-    ]
-
-    events += [
-        # Insert an events with an empty string in `properties` and
-        # `person_properties` to ensure that we handle empty strings correctly.
-        EventValues(
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "_timestamp": "2023-04-20 14:29:00",
-                "timestamp": "2023-04-20 14:29:00.000000",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:29:00.000000",
-                "distinct_id": str(uuid4()),
-                "person_id": str(uuid4()),
-                "person_properties": None,
-                "team_id": team_id,
-                "properties": None,
-                "elements_chain": "",
-            }
-        )
-    ]
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=1000,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=5,
+        count_outside_range=0,
+        count_other_team=0,
+        properties=None,
+        person_properties=None,
     )
 
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    other_team_id = team_id + 1
-    await insert_events(
-        client=ch_client,
-        events=[
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 13:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 15:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 14:30:00",
-                "_timestamp": "2023-04-20 14:30:00",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": other_team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-        ],
-    )
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=team_id,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
 
     insert_inputs = BigQueryInsertInputs(
         team_id=team_id,
         table_id=f"test_insert_activity_table_{team_id}",
-        data_interval_start=data_interval_start,
-        data_interval_end=data_interval_end,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
         **bigquery_config,
     )
 
@@ -261,130 +209,103 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
             client=bigquery_client,
             table_id=f"test_insert_activity_table_{team_id}",
             dataset_id=bigquery_config["dataset_id"],
-            events=events,
+            events=events + events_with_no_properties,
             bq_ingested_timestamp=ingested_timestamp,
+            exclude_events=exclude_events,
         )
 
 
-@pytest.mark.skipif(
-    "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ,
-    reason="Google credentials not set in environment",
-)
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("interval", ["hour", "day"])
-async def test_bigquery_export_workflow(
-    bigquery_config,
-    bigquery_client,
-    interval,
-):
-    """Test BigQuery Export Workflow end-to-end by using a local PG database."""
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
+@pytest.fixture
+def table_id(ateam, interval):
+    return f"test_workflow_table_{ateam.pk}_{interval}"
+
 
-    test_table_id = f"test_workflow_table_{team.pk}_{interval}"
+@pytest_asyncio.fixture
+async def bigquery_batch_export(ateam, table_id, bigquery_config, interval, exclude_events, temporal_client):
     destination_data = {
         "type": "BigQuery",
-        "config": {**bigquery_config, "table_id": test_table_id},
+        "config": {
+            **bigquery_config,
+            "table_id": table_id,
+            "exclude_events": exclude_events,
+        },
     }
+
     batch_export_data = {
-        "name": "my-production-bigquery-export",
+        "name": "my-production-bigquery-destination",
         "destination": destination_data,
         "interval": interval,
     }
 
     batch_export = await acreate_batch_export(
-        team_id=team.pk,
+        team_id=ateam.pk,
         name=batch_export_data["name"],
         destination_data=batch_export_data["destination"],
         interval=batch_export_data["interval"],
     )
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": "2023-04-25 13:30:00.000000",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "172.16.0.1",
-                "$current_url": "https://app.posthog.com",
-            },
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": "2023-04-25 14:29:00.000000",
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": str(uuid4()),
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$current_url": "https://app.posthog.com",
-                "$ip": "172.16.0.1",
-            },
-            "team_id": team.pk,
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-    ]
-
-    if interval == "day":
-        # Add an event outside the hour range but within the day range to ensure it's exported too.
-        events_outside_hour: list[EventValues] = [
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-25 00:30:00.000000",
-                "created_at": "2023-04-25 00:30:00.000000",
-                "inserted_at": "2023-04-25 00:30:00.000000",
-                "_timestamp": "2023-04-25 00:30:00",
-                "person_id": str(uuid4()),
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "team_id": team.pk,
-                "properties": {
-                    "$browser": "Chrome",
-                    "$os": "Mac OS X",
-                    "$current_url": "https://app.posthog.com",
-                    "$ip": "172.16.0.1",
-                },
-                "distinct_id": str(uuid4()),
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            }
-        ]
-        events += events_outside_hour
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
+    yield batch_export
+
+    await adelete_batch_export(batch_export, temporal_client)
 
-    await insert_events(
-        client=ch_client,
-        events=events,
+
+@pytest.mark.skipif(
+    "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ,
+    reason="Google credentials not set in environment",
+)
+@pytest.mark.parametrize("interval", ["hour", "day"])
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+async def test_bigquery_export_workflow(
+    clickhouse_client,
+    bigquery_config,
+    bigquery_client,
+    bigquery_batch_export,
+    interval,
+    exclude_events,
+    ateam,
+    table_id,
+):
+    """Test BigQuery Export Workflow end-to-end.
+
+    The workflow should update the batch export run status to completed and produce the expected
+    records to the configured BigQuery table.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - bigquery_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=ateam.pk,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
+
     workflow_id = str(uuid4())
     inputs = BigQueryBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(bigquery_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
         interval=interval,
-        **batch_export.destination.config,
+        **bigquery_batch_export.destination.config,
     )
 
     with freeze_time(TEST_TIME) as frozen_time:
@@ -409,86 +330,38 @@ async def test_bigquery_export_workflow(
                     execution_timeout=dt.timedelta(seconds=10),
                 )
 
-                runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-                assert len(runs) == 1
-
-                run = runs[0]
-                assert run.status == "Completed"
-
-                ingested_timestamp = frozen_time().replace(tzinfo=dt.timezone.utc)
-                assert_events_in_bigquery(
-                    client=bigquery_client,
-                    table_id=test_table_id,
-                    dataset_id=bigquery_config["dataset_id"],
-                    events=events,
-                    bq_ingested_timestamp=ingested_timestamp,
-                )
-
-
-@pytest_asyncio.fixture
-async def organization():
-    organization = await acreate_organization("test")
-    yield organization
-    await sync_to_async(organization.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def team(organization):
-    team = await acreate_team(organization=organization)
-    yield team
-    await sync_to_async(team.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def batch_export(team):
-    destination_data = {
-        "type": "BigQuery",
-        "config": {
-            "table_id": f"test_workflow_table_{team.pk}",
-            "project_id": "project_id",
-            "private_key": "private_key",
-            "private_key_id": "private_key_id",
-            "token_uri": "token_uri",
-            "client_email": "client_email",
-            "dataset_id": "BatchExports",
-        },
-    }
-    batch_export_data = {
-        "name": "my-production-bigquery-export",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
+        runs = await afetch_batch_export_runs(batch_export_id=bigquery_batch_export.id)
+        assert len(runs) == 1
 
-    yield batch_export
+        run = runs[0]
+        assert run.status == "Completed"
 
-    client = await connect(
-        settings.TEMPORAL_HOST,
-        settings.TEMPORAL_PORT,
-        settings.TEMPORAL_NAMESPACE,
-        settings.TEMPORAL_CLIENT_ROOT_CA,
-        settings.TEMPORAL_CLIENT_CERT,
-        settings.TEMPORAL_CLIENT_KEY,
-    )
-    await adelete_batch_export(batch_export, client)
+        ingested_timestamp = frozen_time().replace(tzinfo=dt.timezone.utc)
+        assert_events_in_bigquery(
+            client=bigquery_client,
+            table_id=table_id,
+            dataset_id=bigquery_config["dataset_id"],
+            events=events,
+            bq_ingested_timestamp=ingested_timestamp,
+            exclude_events=exclude_events,
+        )
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_bigquery_export_workflow_handles_insert_activity_errors(team, batch_export):
+@pytest.mark.skipif(
+    "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ,
+    reason="Google credentials not set in environment",
+)
+async def test_bigquery_export_workflow_handles_insert_activity_errors(ateam, bigquery_batch_export, interval):
     """Test that BigQuery Export Workflow can gracefully handle errors when inserting BigQuery data."""
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
     workflow_id = str(uuid4())
     inputs = BigQueryBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(bigquery_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **bigquery_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_bigquery_activity")
@@ -516,27 +389,32 @@ async def insert_into_bigquery_activity_mocked(_: BigQueryInsertInputs) -> str:
                     retry_policy=RetryPolicy(maximum_attempts=1),
                 )
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=bigquery_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Failed"
-        assert run.latest_error == "ValueError: A useful error message"
+    run = runs[0]
+    assert run.status == "Failed"
+    assert run.latest_error == "ValueError: A useful error message"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_bigquery_export_workflow_handles_cancellation(team, batch_export):
+@pytest.mark.skipif(
+    "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ,
+    reason="Google credentials not set in environment",
+)
+async def test_bigquery_export_workflow_handles_cancellation(ateam, bigquery_batch_export, interval):
     """Test that BigQuery Export Workflow can gracefully handle cancellations when inserting BigQuery data."""
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
     workflow_id = str(uuid4())
     inputs = BigQueryBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(bigquery_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **bigquery_batch_export.destination.config,
     )
 
-    @activity.defn(name="insert_into_s3_activity")
+    @activity.defn(name="insert_into_bigquery_activity")
     async def never_finish_activity(_: BigQueryInsertInputs) -> str:
         while True:
             activity.heartbeat()
@@ -567,9 +445,9 @@ async def never_finish_activity(_: BigQueryInsertInputs) -> str:
             with pytest.raises(WorkflowFailureError):
                 await handle.result()
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=bigquery_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Cancelled"
-        assert run.latest_error == "Cancelled"
+    run = runs[0]
+    assert run.status == "Cancelled"
+    assert run.latest_error == "Cancelled"
diff --git a/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
index d7ca05c0784b6f..1e0643f4f1b9bd 100644
--- a/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_postgres_batch_export_workflow.py
@@ -7,7 +7,6 @@
 import psycopg2
 import pytest
 import pytest_asyncio
-from asgiref.sync import sync_to_async
 from django.conf import settings
 from django.test import override_settings
 from psycopg2 import sql
@@ -17,24 +16,12 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.client import connect
-from posthog.temporal.tests.batch_exports.base import (
-    EventValues,
-    amaterialize,
-    insert_events,
-)
-from posthog.temporal.tests.batch_exports.fixtures import (
-    acreate_batch_export,
-    adelete_batch_export,
-    afetch_batch_export_runs,
-)
+from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
+from posthog.temporal.tests.utils.models import acreate_batch_export, adelete_batch_export, afetch_batch_export_runs
 from posthog.temporal.workflows.batch_exports import (
     create_export_run,
     update_export_run_status,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
 from posthog.temporal.workflows.postgres_batch_export import (
     PostgresBatchExportInputs,
     PostgresBatchExportWorkflow,
@@ -42,14 +29,15 @@
     insert_into_postgres_activity,
 )
 
+pytestmark = [pytest.mark.asyncio, pytest.mark.django_db]
 
-def assert_events_in_postgres(connection, schema, table_name, events):
-    """Assert provided events written to a given Postgres table."""
 
+def assert_events_in_postgres(connection, schema, table_name, events, exclude_events: list[str] | None = None):
+    """Assert provided events written to a given Postgres table."""
     inserted_events = []
 
     with connection.cursor() as cursor:
-        cursor.execute(sql.SQL("SELECT * FROM {} ORDER BY timestamp").format(sql.Identifier(schema, table_name)))
+        cursor.execute(sql.SQL("SELECT * FROM {} ORDER BY event, timestamp").format(sql.Identifier(schema, table_name)))
         columns = [column.name for column in cursor.description]
 
         for row in cursor.fetchall():
@@ -59,6 +47,11 @@ def assert_events_in_postgres(connection, schema, table_name, events):
 
     expected_events = []
     for event in events:
+        event_name = event.get("event")
+
+        if exclude_events is not None and event_name in exclude_events:
+            continue
+
         properties = event.get("properties", None)
         elements_chain = event.get("elements_chain", None)
         expected_event = {
@@ -78,9 +71,8 @@ def assert_events_in_postgres(connection, schema, table_name, events):
         }
         expected_events.append(expected_event)
 
-    expected_events.sort(key=lambda x: x["timestamp"])
+    expected_events.sort(key=lambda x: (x["event"], x["timestamp"]))
 
-    assert len(inserted_events) == len(expected_events)
     # First check one event, the first one, so that we can get a nice diff if
     # the included data is different.
     assert inserted_events[0] == expected_events[0]
@@ -170,137 +162,76 @@ def postgres_connection(postgres_config, setup_test_db):
     connection.close()
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 async def test_insert_into_postgres_activity_inserts_data_into_postgres_table(
-    activity_environment, postgres_connection, postgres_config
+    clickhouse_client, activity_environment, postgres_connection, postgres_config, exclude_events
 ):
-    """Test that the insert_into_postgres_activity function inserts data into a Postgres table."""
-
-    data_interval_start = "2023-04-20 14:00:00"
-    data_interval_end = "2023-04-25 15:00:00"
+    """Test that the insert_into_postgres_activity function inserts data into a PostgreSQL table.
+
+    We use the generate_test_events_in_clickhouse function to generate several sets
+    of events. Some of these sets are expected to be exported, and others not. Expected
+    events are those that:
+    * Are created for the team_id of the batch export.
+    * Are created in the date range of the batch export.
+    * Are not duplicates of other events that are in the same batch.
+    * Do not have an event name contained in the batch export's exclude_events.
+
+    Once we have these events, we pass them to the assert_events_in_postgres function to check
+    that they appear in the expected PostgreSQL table. This function utilizes the local
+    development postgres instance for testing. But we setup and manage our own database
+    to avoid conflicting with PostHog itself.
+    """
+    data_interval_start = dt.datetime(2023, 4, 20, 14, 0, 0, tzinfo=dt.timezone.utc)
+    data_interval_end = dt.datetime(2023, 4, 25, 15, 0, 0, tzinfo=dt.timezone.utc)
 
     # Generate a random team id integer. There's still a chance of a collision,
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    # Add a materialized column such that we can verify that it is NOT included
-    # in the export.
-    await amaterialize("events", "$browser")
-
-    # Create enough events to ensure we span more than 5MB, the smallest
-    # multipart chunk size for multipart uploads to POSTGRES.
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(10000)
-    ]
-
-    events += [
-        # Insert an events with an empty string in `properties` and
-        # `person_properties` to ensure that we handle empty strings correctly.
-        EventValues(
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "_timestamp": "2023-04-20 14:29:00",
-                "timestamp": "2023-04-20 14:29:00.000000",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:29:00.000000",
-                "distinct_id": str(uuid4()),
-                "person_id": str(uuid4()),
-                "person_properties": None,
-                "team_id": team_id,
-                "properties": None,
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            }
-        )
-    ]
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=5,
+        count_outside_range=0,
+        count_other_team=0,
+        properties=None,
+        person_properties=None,
     )
 
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    other_team_id = team_id + 1
-    await insert_events(
-        client=ch_client,
-        events=[
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 13:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 15:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 14:30:00",
-                "_timestamp": "2023-04-20 14:30:00",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": other_team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-        ],
-    )
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=team_id,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
 
     insert_inputs = PostgresInsertInputs(
         team_id=team_id,
         table_name="test_table",
-        data_interval_start=data_interval_start,
-        data_interval_end=data_interval_end,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
         **postgres_config,
     )
 
@@ -311,23 +242,21 @@ async def test_insert_into_postgres_activity_inserts_data_into_postgres_table(
         connection=postgres_connection,
         schema=postgres_config["schema"],
         table_name="test_table",
-        events=events,
+        events=events + events_with_no_properties,
+        exclude_events=exclude_events,
     )
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("interval", ["hour", "day"])
-async def test_postgres_export_workflow(
-    postgres_config,
-    postgres_connection,
-    interval,
-):
-    """Test Postgres Export Workflow end-to-end by using a local PG database."""
-    table_name = "test_workflow_table"
+@pytest.fixture
+def table_name(ateam, interval):
+    return f"test_workflow_table_{ateam.pk}_{interval}"
+
+
+@pytest_asyncio.fixture
+async def postgres_batch_export(ateam, table_name, postgres_config, interval, exclude_events, temporal_client):
     destination_data = {
         "type": "Postgres",
-        "config": {**postgres_config, "table_name": table_name},
+        "config": {**postgres_config, "table_name": table_name, "exclude_events": exclude_events},
     }
     batch_export_data = {
         "name": "my-production-postgres-export",
@@ -335,100 +264,71 @@ async def test_postgres_export_workflow(
         "interval": interval,
     }
 
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
     batch_export = await acreate_batch_export(
-        team_id=team.pk,
+        team_id=ateam.pk,
         name=batch_export_data["name"],
         destination_data=batch_export_data["destination"],
         interval=batch_export_data["interval"],
     )
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": "2023-04-25 13:30:00.000000",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "172.16.0.1",
-                "$current_url": "https://app.posthog.com",
-            },
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": "2023-04-25 14:29:00.000000",
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": str(uuid4()),
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$current_url": "https://app.posthog.com",
-                "$ip": "172.16.0.1",
-            },
-            "team_id": team.pk,
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-    ]
-
-    if interval == "day":
-        # Add an event outside the hour range but within the day range to ensure it's exported too.
-        events_outside_hour: list[EventValues] = [
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-25 00:30:00.000000",
-                "created_at": "2023-04-25 00:30:00.000000",
-                "inserted_at": "2023-04-25 00:30:00.000000",
-                "_timestamp": "2023-04-25 00:30:00",
-                "person_id": str(uuid4()),
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "team_id": team.pk,
-                "properties": {
-                    "$browser": "Chrome",
-                    "$os": "Mac OS X",
-                    "$current_url": "https://app.posthog.com",
-                    "$ip": "172.16.0.1",
-                },
-                "distinct_id": str(uuid4()),
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            }
-        ]
-        events += events_outside_hour
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
+    yield batch_export
 
-    await insert_events(
-        client=ch_client,
-        events=events,
+    await adelete_batch_export(batch_export, temporal_client)
+
+
+@pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+async def test_postgres_export_workflow(
+    clickhouse_client,
+    postgres_config,
+    postgres_connection,
+    postgres_batch_export,
+    interval,
+    exclude_events,
+    ateam,
+    table_name,
+):
+    """Test Postgres Export Workflow end-to-end by using a local PG database.
+
+    The workflow should update the batch export run status to completed and produce the expected
+    records to the local development PostgreSQL database.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - postgres_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=ateam.pk,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
+
     workflow_id = str(uuid4())
     inputs = PostgresBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(postgres_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
         interval=interval,
-        **batch_export.destination.config,
+        **postgres_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -453,72 +353,32 @@ async def test_postgres_export_workflow(
                     execution_timeout=dt.timedelta(seconds=10),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=postgres_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
     assert run.status == "Completed"
 
-    assert_events_in_postgres(postgres_connection, postgres_config["schema"], table_name, events)
-
-
-@pytest_asyncio.fixture
-async def organization():
-    organization = await acreate_organization("test")
-    yield organization
-    await sync_to_async(organization.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def team(organization):
-    team = await acreate_team(organization=organization)
-    yield team
-    await sync_to_async(team.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def batch_export(team, postgres_config):
-    table_name = "test_workflow_table"
-    destination_data = {
-        "type": "Postgres",
-        "config": {**postgres_config, "table_name": table_name},
-    }
-    batch_export_data = {
-        "name": "my-production-postgres-export",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    yield batch_export
-
-    client = await connect(
-        settings.TEMPORAL_HOST,
-        settings.TEMPORAL_PORT,
-        settings.TEMPORAL_NAMESPACE,
-        settings.TEMPORAL_CLIENT_ROOT_CA,
-        settings.TEMPORAL_CLIENT_CERT,
-        settings.TEMPORAL_CLIENT_KEY,
+    assert_events_in_postgres(
+        postgres_connection,
+        postgres_config["schema"],
+        table_name,
+        events=events,
+        exclude_events=exclude_events,
     )
-    await adelete_batch_export(batch_export, client)
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_postgres_export_workflow_handles_insert_activity_errors(team, batch_export):
+async def test_postgres_export_workflow_handles_insert_activity_errors(ateam, postgres_batch_export, interval):
     """Test that Postgres Export Workflow can gracefully handle errors when inserting Postgres data."""
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
     workflow_id = str(uuid4())
     inputs = PostgresBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(postgres_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **postgres_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_postgres_activity")
@@ -546,7 +406,7 @@ async def insert_into_postgres_activity_mocked(_: PostgresInsertInputs) -> str:
                     retry_policy=RetryPolicy(maximum_attempts=1),
                 )
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+        runs = await afetch_batch_export_runs(batch_export_id=postgres_batch_export.id)
         assert len(runs) == 1
 
         run = runs[0]
@@ -554,16 +414,17 @@ async def insert_into_postgres_activity_mocked(_: PostgresInsertInputs) -> str:
         assert run.latest_error == "ValueError: A useful error message"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_postgres_export_workflow_handles_cancellation(team, batch_export):
+async def test_postgres_export_workflow_handles_cancellation(ateam, postgres_batch_export, interval):
     """Test that Postgres Export Workflow can gracefully handle cancellations when inserting Postgres data."""
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
     workflow_id = str(uuid4())
     inputs = PostgresBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(postgres_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **postgres_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_postgres_activity")
@@ -597,9 +458,9 @@ async def never_finish_activity(_: PostgresInsertInputs) -> str:
             with pytest.raises(WorkflowFailureError):
                 await handle.result()
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=postgres_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Cancelled"
-        assert run.latest_error == "Cancelled"
+    run = runs[0]
+    assert run.status == "Cancelled"
+    assert run.latest_error == "Cancelled"
diff --git a/posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py
index 812a4f7edd00c2..28884840773713 100644
--- a/posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py
@@ -6,6 +6,7 @@
 
 import psycopg2
 import pytest
+import pytest_asyncio
 from django.conf import settings
 from django.test import override_settings
 from psycopg2 import sql
@@ -13,22 +14,12 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.tests.batch_exports.base import (
-    EventValues,
-    amaterialize,
-    insert_events,
-)
-from posthog.temporal.tests.batch_exports.fixtures import (
-    acreate_batch_export,
-    afetch_batch_export_runs,
-)
+from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
+from posthog.temporal.tests.utils.models import acreate_batch_export, adelete_batch_export, afetch_batch_export_runs
 from posthog.temporal.workflows.batch_exports import (
     create_export_run,
     update_export_run_status,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
 from posthog.temporal.workflows.redshift_batch_export import (
     RedshiftBatchExportInputs,
     RedshiftBatchExportWorkflow,
@@ -42,13 +33,15 @@
     "REDSHIFT_HOST",
 )
 
-pytestmark = pytest.mark.skipif(
+SKIP_IF_MISSING_REQUIRED_ENV_VARS = pytest.mark.skipif(
     any(env_var not in os.environ for env_var in REQUIRED_ENV_VARS),
     reason="Redshift required env vars are not set",
 )
 
+pytestmark = [SKIP_IF_MISSING_REQUIRED_ENV_VARS, pytest.mark.django_db, pytest.mark.asyncio]
+
 
-def assert_events_in_redshift(connection, schema, table_name, events):
+def assert_events_in_redshift(connection, schema, table_name, events, exclude_events: list[str] | None = None):
     """Assert provided events written to a given Redshift table."""
 
     inserted_events = []
@@ -64,12 +57,17 @@ def assert_events_in_redshift(connection, schema, table_name, events):
 
     expected_events = []
     for event in events:
+        event_name = event.get("event")
+
+        if exclude_events is not None and event_name in exclude_events:
+            continue
+
         properties = event.get("properties", None)
         elements_chain = event.get("elements_chain", None)
         expected_event = {
             "distinct_id": event.get("distinct_id"),
             "elements": json.dumps(elements_chain) if elements_chain else None,
-            "event": event.get("event"),
+            "event": event_name,
             "ip": properties.get("$ip", None) if properties else None,
             "properties": json.dumps(properties) if properties else None,
             "set": properties.get("$set", None) if properties else None,
@@ -194,137 +192,74 @@ def psycopg2_connection(redshift_config, setup_test_db):
     connection.close()
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
-    activity_environment, psycopg2_connection, redshift_config
+    clickhouse_client, activity_environment, psycopg2_connection, redshift_config, exclude_events
 ):
-    """Test that the insert_into_postgres_activity function inserts data into a Postgres table."""
-
-    data_interval_start = "2023-04-20 14:00:00"
-    data_interval_end = "2023-04-25 15:00:00"
+    """Test that the insert_into_redshift_activity function inserts data into a Redshift table.
+
+    We use the generate_test_events_in_clickhouse function to generate several sets
+    of events. Some of these sets are expected to be exported, and others not. Expected
+    events are those that:
+    * Are created for the team_id of the batch export.
+    * Are created in the date range of the batch export.
+    * Are not duplicates of other events that are in the same batch.
+    * Do not have an event name contained in the batch export's exclude_events.
+
+    Once we have these events, we pass them to the assert_events_in_redshift function to check
+    that they appear in the expected Redshift table.
+    """
+    data_interval_start = dt.datetime(2023, 4, 20, 14, 0, 0, tzinfo=dt.timezone.utc)
+    data_interval_end = dt.datetime(2023, 4, 25, 15, 0, 0, tzinfo=dt.timezone.utc)
 
     # Generate a random team id integer. There's still a chance of a collision,
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    # Add a materialized column such that we can verify that it is NOT included
-    # in the export.
-    await amaterialize("events", "$browser")
-
-    # Create enough events to ensure we span more than 5MB, the smallest
-    # multipart chunk size for multipart uploads to POSTGRES.
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(1000)
-    ]
-
-    events += [
-        # Insert an events with an empty string in `properties` and
-        # `person_properties` to ensure that we handle empty strings correctly.
-        EventValues(
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "_timestamp": "2023-04-20 14:29:00",
-                "timestamp": "2023-04-20 14:29:00.000000",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:29:00.000000",
-                "distinct_id": str(uuid4()),
-                "person_id": str(uuid4()),
-                "person_properties": None,
-                "team_id": team_id,
-                "properties": None,
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            }
-        )
-    ]
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=1000,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=5,
+        count_outside_range=0,
+        count_other_team=0,
+        properties=None,
+        person_properties=None,
     )
 
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    other_team_id = team_id + 1
-    await insert_events(
-        client=ch_client,
-        events=[
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 13:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 15:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 14:30:00",
-                "_timestamp": "2023-04-20 14:30:00",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": other_team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            },
-        ],
-    )
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=team_id,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
 
     insert_inputs = RedshiftInsertInputs(
         team_id=team_id,
         table_name="test_table",
-        data_interval_start=data_interval_start,
-        data_interval_end=data_interval_end,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
         **redshift_config,
     )
 
@@ -334,23 +269,21 @@ async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
         connection=psycopg2_connection,
         schema=redshift_config["schema"],
         table_name="test_table",
-        events=events,
+        events=events + events_with_no_properties,
+        exclude_events=exclude_events,
     )
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("interval", ["hour", "day"])
-async def test_redshift_export_workflow(
-    redshift_config,
-    psycopg2_connection,
-    interval,
-):
-    """Test Redshift Export Workflow end-to-end."""
-    table_name = "test_workflow_table"
+@pytest.fixture
+def table_name(ateam, interval):
+    return f"test_workflow_table_{ateam.pk}_{interval}"
+
+
+@pytest_asyncio.fixture
+async def redshift_batch_export(ateam, table_name, redshift_config, interval, exclude_events, temporal_client):
     destination_data = {
         "type": "Redshift",
-        "config": {**redshift_config, "table_name": table_name},
+        "config": {**redshift_config, "table_name": table_name, "exclude_events": exclude_events},
     }
     batch_export_data = {
         "name": "my-production-redshift-export",
@@ -358,100 +291,70 @@ async def test_redshift_export_workflow(
         "interval": interval,
     }
 
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
     batch_export = await acreate_batch_export(
-        team_id=team.pk,
+        team_id=ateam.pk,
         name=batch_export_data["name"],
         destination_data=batch_export_data["destination"],
         interval=batch_export_data["interval"],
     )
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": "2023-04-25 13:30:00.000000",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$ip": "172.16.0.1",
-                "$current_url": "https://app.posthog.com",
-            },
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": "2023-04-25 14:29:00.000000",
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": str(uuid4()),
-            "properties": {
-                "$browser": "Chrome",
-                "$os": "Mac OS X",
-                "$current_url": "https://app.posthog.com",
-                "$ip": "172.16.0.1",
-            },
-            "team_id": team.pk,
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-        },
-    ]
-
-    if interval == "day":
-        # Add an event outside the hour range but within the day range to ensure it's exported too.
-        events_outside_hour: list[EventValues] = [
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-25 00:30:00.000000",
-                "created_at": "2023-04-25 00:30:00.000000",
-                "inserted_at": "2023-04-25 00:30:00.000000",
-                "_timestamp": "2023-04-25 00:30:00",
-                "person_id": str(uuid4()),
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "team_id": team.pk,
-                "properties": {
-                    "$browser": "Chrome",
-                    "$os": "Mac OS X",
-                    "$current_url": "https://app.posthog.com",
-                    "$ip": "172.16.0.1",
-                },
-                "distinct_id": str(uuid4()),
-                "elements_chain": 'strong.pricingpage:attr__class="pricingpage"nth-child="1"nth-of-type="1"text="A question?";',
-            }
-        ]
-        events += events_outside_hour
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
+    yield batch_export
 
-    await insert_events(
-        client=ch_client,
-        events=events,
+    await adelete_batch_export(batch_export, temporal_client)
+
+
+@pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+async def test_redshift_export_workflow(
+    clickhouse_client,
+    redshift_config,
+    psycopg2_connection,
+    interval,
+    redshift_batch_export,
+    ateam,
+    exclude_events,
+):
+    """Test Redshift Export Workflow end-to-end.
+
+    The workflow should update the batch export run status to completed and produce the expected
+    records to the provided Redshift instance.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - redshift_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=ateam.pk,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
+
     workflow_id = str(uuid4())
     inputs = RedshiftBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(redshift_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
         interval=interval,
-        **batch_export.destination.config,
+        **redshift_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -476,10 +379,16 @@ async def test_redshift_export_workflow(
                     execution_timeout=dt.timedelta(seconds=10),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=redshift_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
     assert run.status == "Completed"
 
-    assert_events_in_redshift(psycopg2_connection, redshift_config["schema"], table_name, events)
+    assert_events_in_redshift(
+        psycopg2_connection,
+        redshift_config["schema"],
+        table_name,
+        events=events,
+        exclude_events=exclude_events,
+    )
diff --git a/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py
index ae112af3529a6e..416d9eefdf554d 100644
--- a/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py
@@ -3,7 +3,6 @@
 import datetime as dt
 import functools
 import gzip
-import itertools
 import json
 import os
 from random import randint
@@ -15,9 +14,7 @@
 import brotli
 import pytest
 import pytest_asyncio
-from asgiref.sync import sync_to_async
 from django.conf import settings
-from django.test import Client as HttpClient
 from django.test import override_settings
 from temporalio import activity
 from temporalio.client import WorkflowFailureError
@@ -25,25 +22,13 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.client import connect
-from posthog.temporal.tests.batch_exports.base import (
-    EventValues,
-    amaterialize,
-    insert_events,
-    to_isoformat,
-)
-from posthog.temporal.tests.batch_exports.fixtures import (
-    acreate_batch_export,
-    adelete_batch_export,
-    afetch_batch_export_runs,
-)
+from posthog.temporal.tests.utils.datetimes import to_isoformat
+from posthog.temporal.tests.utils.events import EventValues, generate_test_events_in_clickhouse
+from posthog.temporal.tests.utils.models import acreate_batch_export, adelete_batch_export, afetch_batch_export_runs
 from posthog.temporal.workflows.batch_exports import (
     create_export_run,
     update_export_run_status,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
 from posthog.temporal.workflows.s3_batch_export import (
     HeartbeatDetails,
     S3BatchExportInputs,
@@ -53,7 +38,11 @@
     insert_into_s3_activity,
 )
 
+pytestmark = [pytest.mark.asyncio, pytest.mark.django_db]
+
 TEST_ROOT_BUCKET = "test-batch-exports"
+SESSION = aioboto3.Session()
+create_test_client = functools.partial(SESSION.client, endpoint_url=settings.OBJECT_STORAGE_ENDPOINT)
 
 
 async def check_valid_credentials() -> bool:
@@ -68,53 +57,91 @@ async def check_valid_credentials() -> bool:
         return True
 
 
-SESSION = aioboto3.Session()
-create_test_client = functools.partial(SESSION.client, endpoint_url=settings.OBJECT_STORAGE_ENDPOINT)
+@pytest.fixture
+def compression(request) -> str | None:
+    """A parametrizable fixture to configure compression.
+
+    By decorating a test function with @pytest.mark.parametrize("compression", ..., indirect=True)
+    it's possible to set the compression that will be used to create an S3
+    BatchExport. Possible values are "brotli", "gzip", or None.
+    """
+    try:
+        return request.param
+    except AttributeError:
+        return None
+
+
+@pytest.fixture
+def encryption(request) -> str | None:
+    """A parametrizable fixture to configure a batch export encryption.
+
+    By decorating a test function with @pytest.mark.parametrize("encryption", ..., indirect=True)
+    it's possible to set the exclude_events that will be used to create an S3
+    BatchExport. Any list of event names can be used, or None.
+    """
+    try:
+        return request.param
+    except AttributeError:
+        return None
 
 
 @pytest.fixture
-def bucket_name() -> str:
+def bucket_name(request) -> str:
     """Name for a test S3 bucket."""
-    return f"{TEST_ROOT_BUCKET}-{str(uuid4())}"
+    try:
+        return request.param
+    except AttributeError:
+        return f"{TEST_ROOT_BUCKET}-{str(uuid4())}"
+
+
+@pytest.fixture
+def s3_key_prefix():
+    """An S3 key prefix to use when putting files in a bucket."""
+    return f"posthog-events-{str(uuid4())}"
+
+
+async def delete_all_from_s3(minio_client, bucket_name: str, key_prefix: str):
+    """Delete all objects in bucket_name under key_prefix."""
+    response = await minio_client.list_objects_v2(Bucket=bucket_name, Prefix=key_prefix)
+
+    if "Contents" in response:
+        for obj in response["Contents"]:
+            if "Key" in obj:
+                await minio_client.delete_object(Bucket=bucket_name, Key=obj["Key"])
 
 
 @pytest_asyncio.fixture
-async def s3_client(bucket_name):
-    """Manage a testing S3 client to interact with a testing S3 bucket.
+async def minio_client(bucket_name):
+    """Manage an S3 client to interact with a MinIO bucket.
 
-    Yields the test S3 client after creating a testing S3 bucket. Upon resuming, we delete
+    Yields the client after creating a bucket. Upon resuming, we delete
     the contents and the bucket itself.
     """
     async with create_test_client(
         "s3",
         aws_access_key_id="object_storage_root_user",
         aws_secret_access_key="object_storage_root_password",
-    ) as s3_client:
-        await s3_client.create_bucket(Bucket=bucket_name)
+    ) as minio_client:
+        await minio_client.create_bucket(Bucket=bucket_name)
 
-        yield s3_client
-
-        response = await s3_client.list_objects_v2(Bucket=bucket_name)
+        yield minio_client
 
-        if "Contents" in response:
-            for obj in response["Contents"]:
-                if "Key" in obj:
-                    await s3_client.delete_object(Bucket=bucket_name, Key=obj["Key"])
+        await delete_all_from_s3(minio_client, bucket_name, key_prefix="/")
 
-        await s3_client.delete_bucket(Bucket=bucket_name)
+        await minio_client.delete_bucket(Bucket=bucket_name)
 
 
 async def assert_events_in_s3(
-    s3_client,
-    bucket_name,
-    key_prefix,
-    events,
+    s3_compatible_client,
+    bucket_name: str,
+    key_prefix: str,
+    events: list[EventValues],
     compression: str | None = None,
     exclude_events: list[str] | None = None,
 ):
     """Assert provided events written to JSON in key_prefix in S3 bucket_name."""
     # List the objects in the bucket with the prefix.
-    objects = await s3_client.list_objects_v2(Bucket=bucket_name, Prefix=key_prefix)
+    objects = await s3_compatible_client.list_objects_v2(Bucket=bucket_name, Prefix=key_prefix)
 
     # Check that there is only one object.
     assert len(objects.get("Contents", [])) == 1
@@ -122,7 +149,7 @@ async def assert_events_in_s3(
     # Get the object.
     key = objects["Contents"][0].get("Key")
     assert key
-    s3_object = await s3_client.get_object(Bucket=bucket_name, Key=key)
+    s3_object = await s3_compatible_client.get_object(Bucket=bucket_name, Key=key)
     data = await s3_object["Body"].read()
 
     # Check that the data is correct.
@@ -137,7 +164,7 @@ async def assert_events_in_s3(
     json_data = [json.loads(line) for line in data.decode("utf-8").split("\n") if line]
     # Pull out the fields we inserted only
 
-    json_data.sort(key=lambda x: x["timestamp"])
+    json_data.sort(key=lambda x: (x["event"], x["created_at"]))
 
     # Remove team_id, _timestamp from events
     if exclude_events is None:
@@ -149,9 +176,10 @@ def to_expected_event(event):
             "inserted_at": to_isoformat,
             "created_at": to_isoformat,
         }
-        return {
-            k: mapping_functions.get(k, lambda x: x)(v) for k, v in event.items() if k not in ["team_id", "_timestamp"]
-        }
+        # These are inserted/returned by the ClickHouse event generators, but we do not export them
+        # or we export them as properties.
+        not_exported = {"team_id", "_timestamp", "set", "set_once", "ip", "site_url", "elements"}
+        return {k: mapping_functions.get(k, lambda x: x)(v) for k, v in event.items() if k not in not_exported}
 
     expected_events = list(
         map(
@@ -160,7 +188,7 @@ def to_expected_event(event):
         )
     )
 
-    expected_events.sort(key=lambda x: x["timestamp"] if x["timestamp"] is not None else 0)
+    expected_events.sort(key=lambda x: (x["event"], x["created_at"]))
 
     # First check one event, the first one, so that we can get a nice diff if
     # the included data is different.
@@ -168,135 +196,68 @@ def to_expected_event(event):
     assert json_data == expected_events
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "compression,exclude_events",
-    itertools.product([None, "gzip", "brotli"], [None, ["test-exclude"]]),
-)
+@pytest.mark.parametrize("compression", [None, "gzip", "brotli"], indirect=True)
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 async def test_insert_into_s3_activity_puts_data_into_s3(
-    bucket_name, s3_client, activity_environment, compression, exclude_events
+    clickhouse_client, bucket_name, minio_client, activity_environment, compression, exclude_events
 ):
-    """Test that the insert_into_s3_activity function puts data into S3."""
-
-    data_interval_start = "2023-04-20 14:00:00"
-    data_interval_end = "2023-04-25 15:00:00"
+    """Test that the insert_into_s3_activity function ends up with data into S3.
+
+    We use the generate_test_events_in_clickhouse function to generate several sets
+    of events. Some of these sets are expected to be exported, and others not. Expected
+    events are those that:
+    * Are created for the team_id of the batch export.
+    * Are created in the date range of the batch export.
+    * Are not duplicates of other events that are in the same batch.
+    * Do not have an event name contained in the batch export's exclude_events.
+
+    Once we have these events, we pass them to the assert_events_in_s3 function to check
+    that they appear in the expected S3 bucket and key.
+    """
+    data_interval_start = dt.datetime(2023, 4, 20, 14, 0, 0, tzinfo=dt.timezone.utc)
+    data_interval_end = dt.datetime(2023, 4, 25, 15, 0, 0, tzinfo=dt.timezone.utc)
 
     # Generate a random team id integer. There's still a chance of a collision,
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10000,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    # Add a materialized column such that we can verify that it is NOT included
-    # in the export.
-    await amaterialize("events", "$browser")
-
-    # Create enough events to ensure we span more than 5MB, the smallest
-    # multipart chunk size for multipart uploads to S3.
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "elements_chain": "this that and the other",
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(10000)
-    ]
-
-    events += [
-        # Insert an events with an empty string in `properties` and
-        # `person_properties` to ensure that we handle empty strings correctly.
-        EventValues(
-            {
-                "uuid": str(uuid4()),
-                "event": "test-exclude",
-                "_timestamp": "2023-04-20 14:29:00",
-                "timestamp": "2023-04-20 14:29:00.000000",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:29:00.000000",
-                "distinct_id": str(uuid4()),
-                "person_id": str(uuid4()),
-                "person_properties": None,
-                "team_id": team_id,
-                "properties": None,
-                "elements_chain": "",
-            }
-        )
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=client,
-        events=events,
+    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=team_id,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=5,
+        count_outside_range=0,
+        count_other_team=0,
+        properties=None,
+        person_properties=None,
     )
 
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    other_team_id = team_id + 1
-    await insert_events(
-        client=client,
-        events=[
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 13:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 15:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 14:30:00",
-                "_timestamp": "2023-04-20 14:30:00",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": other_team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-        ],
-    )
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=team_id,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
 
     # Make a random string to prefix the S3 keys with. This allows us to ensure
     # isolation of the test, and also to check that the data is being written.
@@ -307,8 +268,8 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
         region="us-east-1",
         prefix=prefix,
         team_id=team_id,
-        data_interval_start=data_interval_start,
-        data_interval_end=data_interval_end,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
         aws_access_key_id="object_storage_root_user",
         aws_secret_access_key="object_storage_root_password",
         compression=compression,
@@ -324,38 +285,32 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
         ):
             await activity_environment.run(insert_into_s3_activity, insert_inputs)
 
-    await assert_events_in_s3(s3_client, bucket_name, prefix, events, compression, exclude_events)
+    await assert_events_in_s3(
+        minio_client,
+        bucket_name,
+        prefix,
+        events=events + events_with_no_properties,
+        compression=compression,
+        exclude_events=exclude_events,
+    )
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "interval,compression,exclude_events",
-    itertools.product(
-        ["hour", "day", "every 5 minutes"],
-        [None, "gzip", "brotli"],
-        [None, ["test-exclude"]],
-    ),
-)
-async def test_s3_export_workflow_with_minio_bucket(
-    client: HttpClient, s3_client, bucket_name, interval, compression, exclude_events
+@pytest_asyncio.fixture
+async def s3_batch_export(
+    ateam, s3_key_prefix, bucket_name, compression, interval, exclude_events, temporal_client, encryption
 ):
-    """Test S3 Export Workflow end-to-end by using a local MinIO bucket instead of S3.
-
-    The workflow should update the batch export run status to completed and produce the expected
-    records to the MinIO bucket.
-    """
-    prefix = f"posthog-events-{str(uuid4())}"
     destination_data = {
         "type": "S3",
         "config": {
             "bucket_name": bucket_name,
             "region": "us-east-1",
-            "prefix": prefix,
+            "prefix": s3_key_prefix,
             "aws_access_key_id": "object_storage_root_user",
             "aws_secret_access_key": "object_storage_root_password",
             "compression": compression,
             "exclude_events": exclude_events,
+            "encryption": encryption,
+            "kms_key_id": os.getenv("S3_TEST_KMS_KEY_ID") if encryption == "aws:kms" else None,
         },
     }
 
@@ -365,77 +320,77 @@ async def test_s3_export_workflow_with_minio_bucket(
         "interval": interval,
     }
 
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
     batch_export = await acreate_batch_export(
-        team_id=team.pk,
+        team_id=ateam.pk,
         name=batch_export_data["name"],
         destination_data=batch_export_data["destination"],
         interval=batch_export_data["interval"],
     )
 
-    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000")
+    yield batch_export
 
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S.%f"),
-            "created_at": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S.%f"),
-            "inserted_at": (data_interval_end - (batch_export.interval_time_delta / i)).strftime(
-                "%Y-%m-%d %H:%M:%S.%f"
-            ),
-            "_timestamp": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S"),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        }
-        for i in range(1, 3)
-    ]
-
-    if interval == "day":
-        # Add an event outside the hour range but within the day range to ensure it's exported too.
-        events_outside_hour: list[EventValues] = [
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-25 00:30:00.000000",
-                "created_at": "2023-04-25 00:30:00.000000",
-                "inserted_at": "2023-04-25 00:30:00.000000",
-                "_timestamp": "2023-04-25 00:30:00",
-                "person_id": str(uuid4()),
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "team_id": team.pk,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "distinct_id": str(uuid4()),
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            }
-        ]
-        events += events_outside_hour
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
+    await adelete_batch_export(batch_export, temporal_client)
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+
+@pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
+@pytest.mark.parametrize("compression", [None, "gzip", "brotli"], indirect=True)
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+async def test_s3_export_workflow_with_minio_bucket(
+    clickhouse_client,
+    minio_client,
+    ateam,
+    s3_batch_export,
+    bucket_name,
+    interval,
+    compression,
+    exclude_events,
+    s3_key_prefix,
+):
+    """Test S3BatchExport Workflow end-to-end by using a local MinIO bucket instead of S3.
+
+    The workflow should update the batch export run status to completed and produce the expected
+    records to the MinIO bucket.
+
+    We use a BatchExport model to provide accurate inputs to the Workflow and because the Workflow
+    will require its prescense in the database when running. This model is indirectly parametrized
+    by several fixtures. Refer to them for more information.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=ateam.pk,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
+
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
-        **batch_export.destination.config,
+        **s3_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -450,6 +405,7 @@ async def test_s3_export_workflow_with_minio_bucket(
             ],
             workflow_runner=UnsandboxedWorkflowRunner(),
         ):
+            # We patch the S3 client to return our client that targets MinIO.
             with mock.patch(
                 "posthog.temporal.workflows.s3_batch_export.aioboto3.Session.client",
                 side_effect=create_test_client,
@@ -463,31 +419,59 @@ async def test_s3_export_workflow_with_minio_bucket(
                     execution_timeout=dt.timedelta(minutes=10),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(s3_client, bucket_name, prefix, events, compression, exclude_events)
+    await assert_events_in_s3(
+        minio_client,
+        bucket_name,
+        s3_key_prefix,
+        events=events,
+        compression=compression,
+        exclude_events=exclude_events,
+    )
+
+
+@pytest_asyncio.fixture
+async def s3_client(bucket_name, s3_key_prefix):
+    """Manage an S3 client to interact with an S3 bucket.
+
+    Yields the client after assuming the test bucket exists. Upon resuming, we delete
+    the contents of the bucket under the key prefix we are testing. This opens up the door
+    to bugs that could delete all other data in your bucket. I *strongly* recommend
+    using a disposable bucket to run these tests or sticking to other tests that use the
+    local development MinIO.
+    """
+    async with aioboto3.Session().client("s3") as minio_client:
+        yield minio_client
+
+        await delete_all_from_s3(minio_client, bucket_name, key_prefix=s3_key_prefix)
 
 
 @pytest.mark.skipif(
     "S3_TEST_BUCKET" not in os.environ or not check_valid_credentials(),
     reason="AWS credentials not set in environment or missing S3_TEST_BUCKET variable",
 )
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "interval,compression,encryption,exclude_events",
-    itertools.product(
-        ["hour", "day", "every 5 minutes"],
-        [None, "gzip", "brotli"],
-        [None, "AES256", "aws:kms"],
-        [None, ["test-exclude"]],
-    ),
-)
-async def test_s3_export_workflow_with_s3_bucket(interval, compression, encryption, exclude_events):
+@pytest.mark.parametrize("interval", ["hour", "day", "every 5 minutes"], indirect=True)
+@pytest.mark.parametrize("compression", [None, "gzip", "brotli"], indirect=True)
+@pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("encryption", [None, "AES256", "aws:kms"], indirect=True)
+@pytest.mark.parametrize("bucket_name", [os.getenv("S3_TEST_BUCKET")], indirect=True)
+async def test_s3_export_workflow_with_s3_bucket(
+    s3_client,
+    clickhouse_client,
+    interval,
+    s3_batch_export,
+    bucket_name,
+    compression,
+    s3_key_prefix,
+    encryption,
+    exclude_events,
+    ateam,
+):
     """Test S3 Export Workflow end-to-end by using an S3 bucket.
 
     The S3_TEST_BUCKET environment variable is used to set the name of the bucket for this test.
@@ -496,220 +480,53 @@ async def test_s3_export_workflow_with_s3_bucket(interval, compression, encrypti
 
     The workflow should update the batch export run status to completed and produce the expected
     records to the S3 bucket.
-    """
-    bucket_name = os.getenv("S3_TEST_BUCKET")
-    kms_key_id = os.getenv("S3_TEST_KMS_KEY_ID")
-    prefix = f"posthog-events-{str(uuid4())}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": bucket_name,
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": compression,
-            "exclude_events": exclude_events,
-            "encryption": encryption,
-            "kms_key_id": kms_key_id if encryption == "aws:kms" else None,
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": interval,
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
 
+    We use a BatchExport model to provide accurate inputs to the Workflow and because the Workflow
+    will require its prescense in the database when running. This model is indirectly parametrized
+    by several fixtures. Refer to them for more information.
+    """
     data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000")
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S.%f"),
-            "created_at": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S.%f"),
-            "inserted_at": (data_interval_end - (batch_export.interval_time_delta / i)).strftime(
-                "%Y-%m-%d %H:%M:%S.%f"
-            ),
-            "_timestamp": (data_interval_end - (batch_export.interval_time_delta / i)).strftime("%Y-%m-%d %H:%M:%S"),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        }
-        for i in range(1, 3)
-    ]
-
-    if interval == "day":
-        # Add an event outside the hour range but within the day range to ensure it's exported too.
-        events_outside_hour: list[EventValues] = [
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-25 00:30:00.000000",
-                "created_at": "2023-04-25 00:30:00.000000",
-                "inserted_at": "2023-04-25 00:30:00.000000",
-                "_timestamp": "2023-04-25 00:30:00",
-                "person_id": str(uuid4()),
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "team_id": team.pk,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "distinct_id": str(uuid4()),
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            }
-        ]
-        events += events_outside_hour
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
-    )
+    if exclude_events:
+        for event_name in exclude_events:
+            await generate_test_events_in_clickhouse(
+                client=clickhouse_client,
+                team_id=ateam.pk,
+                start_time=data_interval_start,
+                end_time=data_interval_end,
+                count=5,
+                count_outside_range=0,
+                count_other_team=0,
+                event_name=event_name,
+            )
 
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
-        **batch_export.destination.config,
-    )
-
-    async with aioboto3.Session().client("s3") as s3_client:
-
-        @contextlib.asynccontextmanager
-        async def create_s3_client(*args, **kwargs):
-            """Mock function to return an already initialized S3 client."""
-            yield s3_client
-
-        async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
-            async with Worker(
-                activity_environment.client,
-                task_queue=settings.TEMPORAL_TASK_QUEUE,
-                workflows=[S3BatchExportWorkflow],
-                activities=[
-                    create_export_run,
-                    insert_into_s3_activity,
-                    update_export_run_status,
-                ],
-                workflow_runner=UnsandboxedWorkflowRunner(),
-            ):
-                with mock.patch(
-                    "posthog.temporal.workflows.s3_batch_export.aioboto3.Session.client",
-                    side_effect=create_s3_client,
-                ):
-                    await activity_environment.client.execute_workflow(
-                        S3BatchExportWorkflow.run,
-                        inputs,
-                        id=workflow_id,
-                        task_queue=settings.TEMPORAL_TASK_QUEUE,
-                        retry_policy=RetryPolicy(maximum_attempts=1),
-                        execution_timeout=dt.timedelta(seconds=10),
-                    )
-
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
-
-        run = runs[0]
-        assert run.status == "Completed"
-
-        await assert_events_in_s3(s3_client, bucket_name, prefix, events, compression, exclude_events)
-
-
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("compression", [None, "gzip"])
-async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(s3_client, bucket_name, compression):
-    """Test the full S3 workflow targetting a MinIO bucket.
-
-    The workflow should update the batch export run status to completed and produce the expected
-    records to the MinIO bucket.
-    """
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
-    prefix = f"posthog-events-{str(uuid4())}-{{year}}-{{month}}-{{day}}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": bucket_name,
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": compression,
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": f"test-{i}",
-            "timestamp": f"2023-04-25 13:30:00.{i:06}",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": f"2023-04-25 13:30:00.{i:06}",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        }
-        for i in range(1000000)
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+        **s3_batch_export.destination.config,
     )
 
-    workflow_id = str(uuid4())
-    inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
-    )
+    @contextlib.asynccontextmanager
+    async def create_minio_client(*args, **kwargs):
+        """Mock function to return an already initialized S3 client."""
+        yield s3_client
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
         async with Worker(
@@ -725,7 +542,7 @@ async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(s3_client,
         ):
             with mock.patch(
                 "posthog.temporal.workflows.s3_batch_export.aioboto3.Session.client",
-                side_effect=create_test_client,
+                side_effect=create_minio_client,
             ):
                 await activity_environment.client.execute_workflow(
                     S3BatchExportWorkflow.run,
@@ -733,10 +550,10 @@ async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(s3_client,
                     id=workflow_id,
                     task_queue=settings.TEMPORAL_TASK_QUEUE,
                     retry_policy=RetryPolicy(maximum_attempts=1),
-                    execution_timeout=dt.timedelta(seconds=360),
+                    execution_timeout=dt.timedelta(seconds=10),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
@@ -745,99 +562,52 @@ async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(s3_client,
     await assert_events_in_s3(
         s3_client,
         bucket_name,
-        prefix.format(year=2023, month="04", day="25"),
-        events,
-        compression,
+        s3_key_prefix,
+        events=events,
+        compression=compression,
+        exclude_events=exclude_events,
     )
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("compression", [None, "gzip", "brotli"])
-async def test_s3_export_workflow_defaults_to_timestamp_on_null_inserted_at(s3_client, bucket_name, compression):
-    """Test the full S3 workflow targetting a MinIO bucket.
+async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(
+    clickhouse_client,
+    minio_client,
+    bucket_name,
+    ateam,
+    compression,
+    exclude_events,
+    s3_key_prefix,
+    interval,
+    s3_batch_export,
+):
+    """Test the S3BatchExport Workflow end-to-end by using a local MinIO bucket instead of S3.
 
-    In this scenario we assert that when inserted_at is NULL, we default to _timestamp.
-    This scenario is relevant values inserted before the migration happened.
+    This test is the same as test_s3_export_workflow_with_minio_bucket, but we significantly increase the number
+    of rows generated to export to provide some guidance on whether we can perform under load.
     """
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
-    prefix = f"posthog-events-{str(uuid4())}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": bucket_name,
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": compression,
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": None,
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        },
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": None,
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        },
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=1000000,
+        count_outside_range=1000,
+        count_other_team=1000,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **s3_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -862,90 +632,58 @@ async def test_s3_export_workflow_defaults_to_timestamp_on_null_inserted_at(s3_c
                     id=workflow_id,
                     task_queue=settings.TEMPORAL_TASK_QUEUE,
                     retry_policy=RetryPolicy(maximum_attempts=1),
-                    execution_timeout=dt.timedelta(seconds=10),
+                    execution_timeout=dt.timedelta(seconds=360),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(s3_client, bucket_name, prefix, events, compression)
-
-
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("compression", [None, "gzip", "brotli"])
-async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix(s3_client, bucket_name, compression):
-    """Test the S3BatchExport Workflow utilizing a custom key prefix.
-
-    We will be asserting that exported events land in the appropiate S3 key according to the prefix.
-    """
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
+    await assert_events_in_s3(
+        minio_client,
+        bucket_name,
+        s3_key_prefix,
+        events=events,
+        compression=compression,
+        exclude_events=exclude_events,
     )
 
-    prefix = "posthog-{table}/{year}-{month}-{day}/{hour}:{minute}:{second}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": bucket_name,
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": compression,
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
 
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": "2023-04-25 13:31:00.000000",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        },
-    ]
+async def test_s3_export_workflow_defaults_to_timestamp_on_null_inserted_at(
+    clickhouse_client, minio_client, bucket_name, compression, interval, s3_batch_export, s3_key_prefix, ateam
+):
+    """Test the S3BatchExport Workflow end-to-end by using a local MinIO bucket instead of S3.
 
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
+    This test is the same as test_s3_export_workflow_with_minio_bucket, but we create events with None as
+    inserted_at to assert we properly default to _timestamp. This is relevant for rows inserted before inserted_at
+    was added.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
+        inserted_at=None,
     )
 
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **s3_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -973,134 +711,64 @@ async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix(s3_cli
                     execution_timeout=dt.timedelta(seconds=10),
                 )
 
-    runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+    runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
     assert len(runs) == 1
 
     run = runs[0]
     assert run.status == "Completed"
 
-    expected_key_prefix = prefix.format(
-        table="events",
-        year="2023",
-        month="04",
-        day="25",
-        hour="14",
-        minute="30",
-        second="00",
+    await assert_events_in_s3(
+        minio_client,
+        bucket_name,
+        s3_key_prefix,
+        events,
+        compression,
     )
-    objects = await s3_client.list_objects_v2(Bucket=bucket_name, Prefix=expected_key_prefix)
-    key = objects["Contents"][0].get("Key")
-    assert len(objects.get("Contents", [])) == 1
-    assert key.startswith(expected_key_prefix)
 
-    await assert_events_in_s3(s3_client, bucket_name, expected_key_prefix, events, compression)
 
+@pytest.mark.parametrize(
+    "s3_key_prefix",
+    [
+        "posthog-{table}/{year}-{month}-{day}/{hour}:{minute}:{second}",
+        "posthog-{table}/{hour}:{minute}:{second}/{year}-{month}-{day}",
+        "posthog-{table}/{hour}:{minute}:{second}",
+        "posthog/{year}-{month}-{day}/{hour}:{minute}:{second}",
+        "{year}-{month}-{day}",
+    ],
+    indirect=True,
+)
+async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix(
+    clickhouse_client, ateam, minio_client, bucket_name, compression, interval, s3_batch_export, s3_key_prefix
+):
+    """Test the S3BatchExport Workflow end-to-end by specifying a custom key prefix.
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-@pytest.mark.parametrize("compression", [None, "gzip", "brotli"])
-async def test_s3_export_workflow_with_minio_bucket_produces_no_duplicates(s3_client, bucket_name, compression):
-    """Test that S3 Export Workflow end-to-end by using a local MinIO bucket instead of S3.
-
-    In this particular instance of the test, we assert no duplicates are exported to S3.
+    This test is the same as test_s3_export_workflow_with_minio_bucket, but we create events with None as
+    inserted_at to assert we properly default to _timestamp. This is relevant for rows inserted before inserted_at
+    was added.
     """
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
-    prefix = f"posthog-events-{str(uuid4())}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": bucket_name,
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": compression,
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    duplicate_id = str(uuid4())
-    duplicate_distinct_id = str(uuid4())
-    duplicate_person_id = str(uuid4())
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "timestamp": "2023-04-25 13:30:00.000000",
-            "created_at": "2023-04-25 13:30:00.000000",
-            "inserted_at": f"2023-04-25 13:30:00.000000",
-            "_timestamp": "2023-04-25 13:30:00",
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": str(uuid4()),
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        },
-        {
-            "uuid": duplicate_id,
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": f"2023-04-25 14:29:00.000000",
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": duplicate_person_id,
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": duplicate_distinct_id,
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        },
-    ]
-    events_with_duplicates = events + [
-        {
-            "uuid": duplicate_id,
-            "event": "test",
-            "timestamp": "2023-04-25 14:29:00.000000",
-            "created_at": "2023-04-25 14:29:00.000000",
-            "inserted_at": f"2023-04-25 14:29:00.000000",
-            "_timestamp": "2023-04-25 14:29:00",
-            "person_id": duplicate_person_id,
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "distinct_id": duplicate_distinct_id,
-            "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-        }
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events_with_duplicates,
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **s3_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -1125,82 +793,47 @@ async def test_s3_export_workflow_with_minio_bucket_produces_no_duplicates(s3_cl
                     id=workflow_id,
                     task_queue=settings.TEMPORAL_TASK_QUEUE,
                     retry_policy=RetryPolicy(maximum_attempts=1),
+                    execution_timeout=dt.timedelta(seconds=10),
                 )
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
-
-        run = runs[0]
-        assert run.status == "Completed"
-
-    await assert_events_in_s3(s3_client, bucket_name, prefix, events, compression)
-
-
-@pytest_asyncio.fixture
-async def organization():
-    organization = await acreate_organization("test")
-    yield organization
-    await sync_to_async(organization.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def team(organization):
-    team = await acreate_team(organization=organization)
-    yield team
-    await sync_to_async(team.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def batch_export(team):
-    prefix = f"posthog-events-{str(uuid4())}"
-    destination_data = {
-        "type": "S3",
-        "config": {
-            "bucket_name": "test-bucket",
-            "region": "us-east-1",
-            "prefix": prefix,
-            "aws_access_key_id": "object_storage_root_user",
-            "aws_secret_access_key": "object_storage_root_password",
-            "compression": "gzip",
-        },
-    }
+    runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
+    assert len(runs) == 1
 
-    batch_export_data = {
-        "name": "my-production-s3-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
+    run = runs[0]
+    assert run.status == "Completed"
 
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
+    expected_key_prefix = s3_key_prefix.format(
+        table="events",
+        year=data_interval_end.year,
+        # All of these must include leading 0s.
+        month=data_interval_end.strftime("%m"),
+        day=data_interval_end.strftime("%d"),
+        hour=data_interval_end.strftime("%H"),
+        minute=data_interval_end.strftime("%M"),
+        second=data_interval_end.strftime("%S"),
     )
+    objects = await minio_client.list_objects_v2(Bucket=bucket_name, Prefix=expected_key_prefix)
+    key = objects["Contents"][0].get("Key")
+    assert len(objects.get("Contents", [])) == 1
+    assert key.startswith(expected_key_prefix)
 
-    yield batch_export
+    await assert_events_in_s3(minio_client, bucket_name, expected_key_prefix, events, compression)
 
-    client = await connect(
-        settings.TEMPORAL_HOST,
-        settings.TEMPORAL_PORT,
-        settings.TEMPORAL_NAMESPACE,
-        settings.TEMPORAL_CLIENT_ROOT_CA,
-        settings.TEMPORAL_CLIENT_CERT,
-        settings.TEMPORAL_CLIENT_KEY,
-    )
-    await adelete_batch_export(batch_export, client)
 
+async def test_s3_export_workflow_handles_insert_activity_errors(ateam, s3_batch_export, interval):
+    """Test S3BatchExport Workflow can handle errors from executing the insert into S3 activity.
+
+    Currently, this only means we do the right updates to the BatchExportRun model.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_s3_export_workflow_handles_insert_activity_errors(team, batch_export):
-    """Test that S3 Export Workflow can gracefully handle errors when inserting S3 data."""
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **s3_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_s3_activity")
@@ -1228,7 +861,7 @@ async def insert_into_s3_activity_mocked(_: S3InsertInputs) -> str:
                     retry_policy=RetryPolicy(maximum_attempts=1),
                 )
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+        runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
         assert len(runs) == 1
 
         run = runs[0]
@@ -1236,16 +869,21 @@ async def insert_into_s3_activity_mocked(_: S3InsertInputs) -> str:
         assert run.latest_error == "ValueError: A useful error message"
 
 
-@pytest.mark.django_db
 @pytest.mark.asyncio
-async def test_s3_export_workflow_handles_cancellation(team, batch_export):
-    """Test that S3 Export Workflow can gracefully handle cancellations when inserting S3 data."""
+async def test_s3_export_workflow_handles_cancellation(ateam, s3_batch_export, interval):
+    """Test that S3 Export Workflow can gracefully handle cancellations when inserting S3 data.
+
+    Currently, this only means we do the right updates to the BatchExportRun model.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+
     workflow_id = str(uuid4())
     inputs = S3BatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(s3_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **s3_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_s3_activity")
@@ -1279,7 +917,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
             with pytest.raises(WorkflowFailureError):
                 await handle.result()
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
+        runs = await afetch_batch_export_runs(batch_export_id=s3_batch_export.id)
         assert len(runs) == 1
 
         run = runs[0]
@@ -1438,148 +1076,47 @@ def test_get_s3_key(inputs, expected):
     assert result == expected
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_insert_into_s3_activity_heartbeats(bucket_name, s3_client, activity_environment):
-    """Test that the insert_into_s3_activity sends heartbeats."""
-
-    data_interval_start = "2023-04-20 14:00:00"
-    data_interval_end = "2023-04-25 15:00:00"
-
-    # Generate a random team id integer. There's still a chance of a collision,
-    # but it's very small.
-    team_id = randint(1, 1000000)
-
-    client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
+async def test_insert_into_s3_activity_heartbeats(
+    clickhouse_client, ateam, bucket_name, s3_batch_export, minio_client, activity_environment, s3_key_prefix
+):
+    """Test that the insert_into_s3_activity activity sends heartbeats.
 
-    # Add a materialized column such that we can verify that it is NOT included
-    # in the export.
-    await amaterialize("events", "$browser")
-
-    # Create enough events to ensure we span more than 5MB, the smallest
-    # multipart chunk size for multipart uploads to S3.
-    events: list[EventValues] = [
-        {
-            "uuid": str(uuid4()),
-            "event": "test",
-            "_timestamp": "2023-04-20 14:30:00",
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "created_at": "2023-04-20 14:30:00.000000",
-            "distinct_id": str(uuid4()),
-            "person_id": str(uuid4()),
-            "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team_id,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "elements_chain": "this that and the other",
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(50000)
-    ]
-
-    events += [
-        # Insert an events with an empty string in `properties` and
-        # `person_properties` to ensure that we handle empty strings correctly.
-        EventValues(
-            {
-                "uuid": str(uuid4()),
-                "event": "test-exclude",
-                "_timestamp": "2023-04-20 14:29:00",
-                "timestamp": "2023-04-20 14:29:00.000000",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:29:00.000000",
-                "distinct_id": str(uuid4()),
-                "person_id": str(uuid4()),
-                "person_properties": None,
-                "team_id": team_id,
-                "properties": None,
-                "elements_chain": "",
-            }
+    We use a function that runs on_heartbeat to check and track the heartbeat contents.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-20T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
+
+    events_in_parts = []
+    n_expected_parts = 3
+
+    for i in range(1, n_expected_parts + 1):
+        part_inserted_at = data_interval_end - s3_batch_export.interval_time_delta / i
+
+        (events, _, _) = await generate_test_events_in_clickhouse(
+            client=clickhouse_client,
+            team_id=ateam.pk,
+            start_time=data_interval_start,
+            end_time=data_interval_end,
+            count=1,
+            count_outside_range=0,
+            count_other_team=0,
+            duplicate=False,
+            # We need at least 5MB for a multi-part upload which is what we are testing.
+            properties={"$chonky": ("a" * 5 * 1024**2)},
+            inserted_at=part_inserted_at,
         )
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=client,
-        events=events,
-    )
-
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    other_team_id = team_id + 1
-    await insert_events(
-        client=client,
-        events=[
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 13:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 15:30:00",
-                "_timestamp": "2023-04-20 13:30:00",
-                "inserted_at": "2023-04-20 13:30:00.000000",
-                "created_at": "2023-04-20 13:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-            {
-                "uuid": str(uuid4()),
-                "event": "test",
-                "timestamp": "2023-04-20 14:30:00",
-                "_timestamp": "2023-04-20 14:30:00",
-                "inserted_at": "2023-04-20 14:30:00.000000",
-                "created_at": "2023-04-20 14:30:00.000000",
-                "person_id": str(uuid4()),
-                "distinct_id": str(uuid4()),
-                "team_id": other_team_id,
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "elements_chain": "this is a comman, separated, list, of css selectors(?)",
-            },
-        ],
-    )
-
-    # Make a random string to prefix the S3 keys with. This allows us to ensure
-    # isolation of the test, and also to check that the data is being written.
-    prefix = str(uuid4())
+        events_in_parts += events
 
     current_part_number = 1
 
     def assert_heartbeat_details(*details):
+        """A function to track and assert we are heartbeating."""
         nonlocal current_part_number
 
         details = HeartbeatDetails.from_activity_details(details)
 
         last_uploaded_part_dt = dt.datetime.fromisoformat(details.last_uploaded_part_timestamp)
-        assert last_uploaded_part_dt.year == 2023
-        assert last_uploaded_part_dt.month == 4
-        assert last_uploaded_part_dt.day == 20
-        assert last_uploaded_part_dt.hour == 14
-        assert last_uploaded_part_dt.minute == 30
-        assert last_uploaded_part_dt.second == 0
+        assert last_uploaded_part_dt == data_interval_end - s3_batch_export.interval_time_delta / current_part_number
 
         assert len(details.upload_state.parts) == current_part_number
         current_part_number = len(details.upload_state.parts) + 1
@@ -1589,10 +1126,10 @@ def assert_heartbeat_details(*details):
     insert_inputs = S3InsertInputs(
         bucket_name=bucket_name,
         region="us-east-1",
-        prefix=prefix,
-        team_id=team_id,
-        data_interval_start=data_interval_start,
-        data_interval_end=data_interval_end,
+        prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start.isoformat(),
+        data_interval_end=data_interval_end.isoformat(),
         aws_access_key_id="object_storage_root_user",
         aws_secret_access_key="object_storage_root_password",
     )
@@ -1604,6 +1141,7 @@ def assert_heartbeat_details(*details):
         ):
             await activity_environment.run(insert_into_s3_activity, insert_inputs)
 
-    # This checks that the assert_heartbeat_details function was actually called
-    assert current_part_number > 1
-    await assert_events_in_s3(s3_client, bucket_name, prefix, events, None, None)
+    # This checks that the assert_heartbeat_details function was actually called.
+    # The '+ 1' is because we increment current_part_number one last time after we are done.
+    assert current_part_number == n_expected_parts + 1
+    await assert_events_in_s3(minio_client, bucket_name, s3_key_prefix, events_in_parts, None, None)
diff --git a/posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py
index 2205977459b91f..53f8d5f855e5d8 100644
--- a/posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py
+++ b/posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py
@@ -9,7 +9,6 @@
 import pytest
 import pytest_asyncio
 import responses
-from asgiref.sync import sync_to_async
 from django.conf import settings
 from django.test import override_settings
 from requests.models import PreparedRequest
@@ -20,24 +19,13 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
-from posthog.api.test.test_organization import acreate_organization
-from posthog.api.test.test_team import acreate_team
-from posthog.temporal.client import connect
-from posthog.temporal.tests.batch_exports.base import (
-    EventValues,
-    insert_events,
-    to_isoformat,
-)
-from posthog.temporal.tests.batch_exports.fixtures import (
-    acreate_batch_export,
-    adelete_batch_export,
-    afetch_batch_export_runs,
-)
+from posthog.temporal.tests.utils.datetimes import to_isoformat
+from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
+from posthog.temporal.tests.utils.models import acreate_batch_export, adelete_batch_export, afetch_batch_export_runs
 from posthog.temporal.workflows.batch_exports import (
     create_export_run,
     update_export_run_status,
 )
-from posthog.temporal.workflows.clickhouse import ClickHouseClient
 from posthog.temporal.workflows.snowflake_batch_export import (
     SnowflakeBatchExportInputs,
     SnowflakeBatchExportWorkflow,
@@ -45,6 +33,8 @@
     insert_into_snowflake_activity,
 )
 
+pytestmark = [pytest.mark.asyncio, pytest.mark.django_db]
+
 
 def contains_queries_in_order(queries: list[str], *queries_to_find: str):
     """Check if a list of queries contains a list of queries in order."""
@@ -214,21 +204,8 @@ def query_request_handler(request: PreparedRequest):
     return queries, staged_files
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_snowflake_export_workflow_exports_events_in_the_last_hour_for_the_right_team():
-    """Test that the whole workflow not just the activity works.
-
-    It should update the batch export run status to completed, as well as updating the record
-    count.
-    """
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
+@pytest_asyncio.fixture
+async def snowflake_batch_export(ateam, interval, temporal_client):
     destination_data = {
         "type": "Snowflake",
         "config": {
@@ -243,107 +220,53 @@ async def test_snowflake_export_workflow_exports_events_in_the_last_hour_for_the
     }
 
     batch_export_data = {
-        "name": "my-production-snowflake-bucket-destination",
+        "name": "my-production-snowflake-export",
         "destination": destination_data,
-        "interval": "hour",
+        "interval": interval,
     }
 
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
     batch_export = await acreate_batch_export(
-        team_id=team.pk,
+        team_id=ateam.pk,
         name=batch_export_data["name"],
         destination_data=batch_export_data["destination"],
         interval=batch_export_data["interval"],
     )
 
-    # Create enough events to ensure we span more than 5MB, the smallest
-    # multipart chunk size for multipart uploads to Snowflake.
-    events: list[EventValues] = [
-        {
-            "_timestamp": "2023-04-20 14:30:00",
-            "created_at": f"2023-04-20 14:30:00.{i:06d}",
-            "distinct_id": str(uuid4()),
-            "elements_chain": None,
-            "event": "test",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "person_id": str(uuid4()),
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "person_properties": {},
-            "team_id": team.pk,
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "uuid": str(uuid4()),
-        }
-        # NOTE: we have to do a lot here, otherwise we do not trigger a
-        # multipart upload, and the minimum part chunk size is 5MB.
-        for i in range(2)
-    ]
-
-    # Insert some data into the `sharded_events` table.
-    await insert_events(
-        client=ch_client,
-        events=events,
-    )
+    yield batch_export
 
-    other_team = await acreate_team(organization=organization)
-
-    # Insert some events before the hour and after the hour, as well as some
-    # events from another team to ensure that we only export the events from
-    # the team that the batch export is for.
-    await insert_events(
-        client=ch_client,
-        events=[
-            {
-                "_timestamp": "2023-04-20 13:30:00",
-                "created_at": "2023-04-20 13:30:00",
-                "distinct_id": str(uuid4()),
-                "elements_chain": None,
-                "event": "test",
-                "inserted_at": "2023-04-20 13:30:00",
-                "person_id": str(uuid4()),
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {},
-                "team_id": team.pk,
-                "timestamp": "2023-04-20 13:30:00",
-                "uuid": str(uuid4()),
-            },
-            {
-                "_timestamp": "2023-04-20 15:30:00",
-                "created_at": "2023-04-20 15:30:00",
-                "distinct_id": str(uuid4()),
-                "elements_chain": None,
-                "event": "test",
-                "inserted_at": "2023-04-20 15:30:00",
-                "person_id": str(uuid4()),
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {},
-                "team_id": team.pk,
-                "timestamp": "2023-04-20 15:30:00",
-                "uuid": str(uuid4()),
-            },
-            {
-                "_timestamp": "2023-04-20 14:30:00",
-                "created_at": "2023-04-20 14:30:00",
-                "distinct_id": str(uuid4()),
-                "elements_chain": None,
-                "event": "test",
-                "inserted_at": "2023-04-20 14:30:00",
-                "person_id": str(uuid4()),
-                "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-                "person_properties": {},
-                "team_id": other_team.pk,
-                "timestamp": "2023-04-20 14:30:00",
-                "uuid": str(uuid4()),
-            },
-        ],
+    await adelete_batch_export(batch_export, temporal_client)
+
+
+@pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
+async def test_snowflake_export_workflow_exports_events(ateam, clickhouse_client, snowflake_batch_export, interval):
+    """Test that the whole workflow not just the activity works.
+
+    It should update the batch export run status to completed, as well as updating the record
+    count.
+    """
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - snowflake_batch_export.interval_time_delta
+
+    (events, _, _) = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=10,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
     workflow_id = str(uuid4())
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-20 14:40:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **snowflake_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -399,6 +322,7 @@ async def test_snowflake_export_workflow_exports_events_in_the_last_hour_for_the
                     for event in json_data
                 ]
                 json_data.sort(key=lambda x: x["timestamp"])
+
                 # Drop _timestamp and team_id from events
                 expected_events = []
                 for event in events:
@@ -409,24 +333,27 @@ async def test_snowflake_export_workflow_exports_events_in_the_last_hour_for_the
                     }
                     expected_event["timestamp"] = to_isoformat(event["timestamp"])
                     expected_events.append(expected_event)
+                expected_events.sort(key=lambda x: x["timestamp"])
 
                 assert json_data[0] == expected_events[0]
                 assert json_data == expected_events
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=snowflake_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Completed"
+    run = runs[0]
+    assert run.status == "Completed"
 
-    # Check that the workflow runs successfully for a period that has no
-    # events.
 
+@pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
+async def test_snowflake_export_workflow_without_events(ateam, snowflake_batch_export, interval):
+    workflow_id = str(uuid4())
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
         data_interval_end="2023-03-20 14:40:00.000000",
-        **batch_export.destination.config,
+        interval=interval,
+        **snowflake_batch_export.destination.config,
     )
 
     async with await WorkflowEnvironment.start_time_skipping() as activity_environment:
@@ -476,79 +403,38 @@ async def test_snowflake_export_workflow_exports_events_in_the_last_hour_for_the
                 json_data.sort(key=lambda x: x["timestamp"])
                 assert json_data == []
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 2
+        runs = await afetch_batch_export_runs(batch_export_id=snowflake_batch_export.id)
+        assert len(runs) == 1
 
-        run = runs[1]
+        run = runs[0]
         assert run.status == "Completed"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_snowflake_export_workflow_raises_error_on_put_fail():
-    destination_data = {
-        "type": "Snowflake",
-        "config": {
-            "user": "hazzadous",
-            "password": "password",
-            "account": "account",
-            "database": "PostHog",
-            "schema": "test",
-            "warehouse": "COMPUTE_WH",
-            "table_name": "events",
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-snowflake-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
-    events: list[EventValues] = [
-        {
-            "_timestamp": "2023-04-20 14:30:00",
-            "created_at": "2023-04-20 14:30:00",
-            "distinct_id": str(uuid4()),
-            "elements_chain": None,
-            "event": "test",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "person_id": str(uuid4()),
-            "person_properties": None,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "uuid": str(uuid4()),
-        }
-        for i in range(2)
-    ]
-
-    await insert_events(
-        client=ch_client,
-        events=events,
+async def test_snowflake_export_workflow_raises_error_on_put_fail(
+    clickhouse_client, ateam, snowflake_batch_export, interval
+):
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - snowflake_batch_export.interval_time_delta
+
+    _ = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-20 14:40:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **snowflake_batch_export.destination.config,
     )
 
     workflow_id = str(uuid4())
@@ -586,72 +472,31 @@ async def test_snowflake_export_workflow_raises_error_on_put_fail():
                 assert err.__cause__.__cause__.type == "SnowflakeFileNotUploadedError"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_snowflake_export_workflow_raises_error_on_copy_fail():
-    destination_data = {
-        "type": "Snowflake",
-        "config": {
-            "user": "hazzadous",
-            "password": "password",
-            "account": "account",
-            "database": "PostHog",
-            "schema": "test",
-            "warehouse": "COMPUTE_WH",
-            "table_name": "events",
-        },
-    }
-
-    batch_export_data = {
-        "name": "my-production-snowflake-bucket-destination",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    organization = await acreate_organization("test")
-    team = await acreate_team(organization=organization)
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    ch_client = ClickHouseClient(
-        url=settings.CLICKHOUSE_HTTP_URL,
-        user=settings.CLICKHOUSE_USER,
-        password=settings.CLICKHOUSE_PASSWORD,
-        database=settings.CLICKHOUSE_DATABASE,
-    )
-
-    events: list[EventValues] = [
-        {
-            "_timestamp": "2023-04-20 14:30:00",
-            "created_at": "2023-04-20 14:30:00",
-            "distinct_id": str(uuid4()),
-            "elements_chain": None,
-            "event": "test",
-            "inserted_at": f"2023-04-20 14:30:00.{i:06d}",
-            "person_id": str(uuid4()),
-            "person_properties": None,
-            "properties": {"$browser": "Chrome", "$os": "Mac OS X"},
-            "team_id": team.pk,
-            "timestamp": f"2023-04-20 14:30:00.{i:06d}",
-            "uuid": str(uuid4()),
-        }
-        for i in range(2)
-    ]
-
-    await insert_events(
-        client=ch_client,
-        events=events,
+async def test_snowflake_export_workflow_raises_error_on_copy_fail(
+    clickhouse_client, ateam, snowflake_batch_export, interval
+):
+    data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000+00:00")
+    data_interval_start = data_interval_end - snowflake_batch_export.interval_time_delta
+
+    _ = await generate_test_events_in_clickhouse(
+        client=clickhouse_client,
+        team_id=ateam.pk,
+        start_time=data_interval_start,
+        end_time=data_interval_end,
+        count=100,
+        count_outside_range=10,
+        count_other_team=10,
+        duplicate=True,
+        properties={"$browser": "Chrome", "$os": "Mac OS X"},
+        person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
-        data_interval_end="2023-04-20 14:40:00.000000",
-        **batch_export.destination.config,
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
+        data_interval_end=data_interval_end.isoformat(),
+        interval=interval,
+        **snowflake_batch_export.destination.config,
     )
 
     workflow_id = str(uuid4())
@@ -689,70 +534,14 @@ async def test_snowflake_export_workflow_raises_error_on_copy_fail():
                 assert err.__cause__.__cause__.type == "SnowflakeFileNotLoadedError"
 
 
-@pytest_asyncio.fixture
-async def organization():
-    organization = await acreate_organization("test")
-    yield organization
-    await sync_to_async(organization.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def team(organization):
-    team = await acreate_team(organization=organization)
-    yield team
-    await sync_to_async(team.delete)()  # type: ignore
-
-
-@pytest_asyncio.fixture
-async def batch_export(team):
-    destination_data = {
-        "type": "Snowflake",
-        "config": {
-            "user": "hazzadous",
-            "password": "password",
-            "account": "account",
-            "database": "PostHog",
-            "schema": "test",
-            "warehouse": "COMPUTE_WH",
-            "table_name": "events",
-        },
-    }
-    batch_export_data = {
-        "name": "my-production-snowflake-export",
-        "destination": destination_data,
-        "interval": "hour",
-    }
-
-    batch_export = await acreate_batch_export(
-        team_id=team.pk,
-        name=batch_export_data["name"],
-        destination_data=batch_export_data["destination"],
-        interval=batch_export_data["interval"],
-    )
-
-    yield batch_export
-
-    client = await connect(
-        settings.TEMPORAL_HOST,
-        settings.TEMPORAL_PORT,
-        settings.TEMPORAL_NAMESPACE,
-        settings.TEMPORAL_CLIENT_ROOT_CA,
-        settings.TEMPORAL_CLIENT_CERT,
-        settings.TEMPORAL_CLIENT_KEY,
-    )
-    await adelete_batch_export(batch_export, client)
-
-
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_snowflake_export_workflow_handles_insert_activity_errors(team, batch_export):
+async def test_snowflake_export_workflow_handles_insert_activity_errors(ateam, snowflake_batch_export):
     """Test that Snowflake Export Workflow can gracefully handle errors when inserting Snowflake data."""
     workflow_id = str(uuid4())
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        **snowflake_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_snowflake_activity")
@@ -780,24 +569,22 @@ async def insert_into_snowflake_activity_mocked(_: SnowflakeInsertInputs) -> str
                     retry_policy=RetryPolicy(maximum_attempts=1),
                 )
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=snowflake_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Failed"
-        assert run.latest_error == "ValueError: A useful error message"
+    run = runs[0]
+    assert run.status == "Failed"
+    assert run.latest_error == "ValueError: A useful error message"
 
 
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def test_snowflake_export_workflow_handles_cancellation(team, batch_export):
+async def test_snowflake_export_workflow_handles_cancellation(ateam, snowflake_batch_export):
     """Test that Snowflake Export Workflow can gracefully handle cancellations when inserting Snowflake data."""
     workflow_id = str(uuid4())
     inputs = SnowflakeBatchExportInputs(
-        team_id=team.pk,
-        batch_export_id=str(batch_export.id),
+        team_id=ateam.pk,
+        batch_export_id=str(snowflake_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
-        **batch_export.destination.config,
+        **snowflake_batch_export.destination.config,
     )
 
     @activity.defn(name="insert_into_snowflake_activity")
@@ -831,9 +618,9 @@ async def never_finish_activity(_: SnowflakeInsertInputs) -> str:
             with pytest.raises(WorkflowFailureError):
                 await handle.result()
 
-        runs = await afetch_batch_export_runs(batch_export_id=batch_export.id)
-        assert len(runs) == 1
+    runs = await afetch_batch_export_runs(batch_export_id=snowflake_batch_export.id)
+    assert len(runs) == 1
 
-        run = runs[0]
-        assert run.status == "Cancelled"
-        assert run.latest_error == "Cancelled"
+    run = runs[0]
+    assert run.status == "Cancelled"
+    assert run.latest_error == "Cancelled"
diff --git a/posthog/temporal/tests/conftest.py b/posthog/temporal/tests/conftest.py
index 44cf05fe63ce1e..7c756ed44f717a 100644
--- a/posthog/temporal/tests/conftest.py
+++ b/posthog/temporal/tests/conftest.py
@@ -1,13 +1,23 @@
+import asyncio
+import random
+
 import pytest
+import pytest_asyncio
+import temporalio.worker
+from asgiref.sync import sync_to_async
+from django.conf import settings
 from temporalio.testing import ActivityEnvironment
 
 from posthog.models import Organization, Team
+from posthog.temporal.client import connect
+from posthog.temporal.workflows.clickhouse import ClickHouseClient
 
 
 @pytest.fixture
 def organization():
     """A test organization."""
-    org = Organization.objects.create(name="TempHog")
+    name = f"BatchExportsTestOrg-{random.randint(1, 99999)}"
+    org = Organization.objects.create(name=name)
     org.save()
 
     yield org
@@ -18,7 +28,8 @@ def organization():
 @pytest.fixture
 def team(organization):
     """A test team."""
-    team = Team.objects.create(organization=organization, name="TempHog-1")
+    name = f"BatchExportsTestTeam-{random.randint(1, 99999)}"
+    team = Team.objects.create(organization=organization, name=name)
     team.save()
 
     yield team
@@ -26,7 +37,110 @@ def team(organization):
     team.delete()
 
 
+@pytest_asyncio.fixture
+async def aorganization():
+    name = f"BatchExportsTestOrg-{random.randint(1, 99999)}"
+    org = await sync_to_async(Organization.objects.create)(name=name)  # type: ignore
+
+    yield org
+
+    await sync_to_async(org.delete)()  # type: ignore
+
+
+@pytest_asyncio.fixture
+async def ateam(aorganization):
+    name = f"BatchExportsTestTeam-{random.randint(1, 99999)}"
+    team = await sync_to_async(Team.objects.create)(organization=aorganization, name=name)  # type: ignore
+
+    yield team
+
+    await sync_to_async(team.delete)()  # type: ignore
+
+
 @pytest.fixture
 def activity_environment():
     """Return a testing temporal ActivityEnvironment."""
     return ActivityEnvironment()
+
+
+@pytest.fixture(scope="module")
+def clickhouse_client():
+    """Provide a ClickHouseClient to use in tests."""
+    client = ClickHouseClient(
+        url=settings.CLICKHOUSE_HTTP_URL,
+        user=settings.CLICKHOUSE_USER,
+        password=settings.CLICKHOUSE_PASSWORD,
+        database=settings.CLICKHOUSE_DATABASE,
+    )
+
+    yield client
+
+
+@pytest.fixture(scope="module")
+def event_loop():
+    loop = asyncio.get_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest_asyncio.fixture(scope="module")
+async def temporal_client():
+    """Provide a temporalio.client.Client to use in tests."""
+    client = await connect(
+        settings.TEMPORAL_HOST,
+        settings.TEMPORAL_PORT,
+        settings.TEMPORAL_NAMESPACE,
+        settings.TEMPORAL_CLIENT_ROOT_CA,
+        settings.TEMPORAL_CLIENT_CERT,
+        settings.TEMPORAL_CLIENT_KEY,
+    )
+
+    yield client
+
+
+@pytest_asyncio.fixture()
+async def workflows(request):
+    """Return Temporal workflows to initialize a test worker.
+
+    By default (no parametrization), we return all available workflows. Optionally,
+    with @pytest.mark.parametrize it is possible to customize which workflows the worker starts with.
+    """
+    try:
+        return request.param
+    except AttributeError:
+        from posthog.temporal.workflows import WORKFLOWS
+
+        return WORKFLOWS
+
+
+@pytest_asyncio.fixture()
+async def activities(request):
+    """Return Temporal activities to initialize a test worker.
+
+    By default (no parametrization), we return all available activities. Optionally,
+    with @pytest.mark.parametrize it is possible to customize which activities the worker starts with.
+    """
+    try:
+        return request.param
+    except AttributeError:
+        from posthog.temporal.workflows import ACTIVITIES
+
+        return ACTIVITIES
+
+
+@pytest_asyncio.fixture
+async def temporal_worker(temporal_client, workflows, activities):
+    worker = temporalio.worker.Worker(
+        temporal_client,
+        task_queue=settings.TEMPORAL_TASK_QUEUE,
+        workflows=workflows,
+        activities=activities,
+        workflow_runner=temporalio.worker.UnsandboxedWorkflowRunner(),
+    )
+
+    worker_run = asyncio.create_task(worker.run())
+
+    yield worker
+
+    worker_run.cancel()
+    await asyncio.wait([worker_run])
diff --git a/posthog/temporal/tests/utils/__init__.py b/posthog/temporal/tests/utils/__init__.py
new file mode 100644
index 00000000000000..c4c83ce96a4ddf
--- /dev/null
+++ b/posthog/temporal/tests/utils/__init__.py
@@ -0,0 +1 @@
+"""This module contains test utilities used in all batch export tests."""
diff --git a/posthog/temporal/tests/utils/datetimes.py b/posthog/temporal/tests/utils/datetimes.py
new file mode 100644
index 00000000000000..ec0c10980bbdf0
--- /dev/null
+++ b/posthog/temporal/tests/utils/datetimes.py
@@ -0,0 +1,18 @@
+"""Test utilities that operate with datetime.datetimes."""
+import datetime as dt
+
+
+def date_range(start: dt.datetime, stop: dt.datetime, step: dt.timedelta):
+    """Generate a range of dates between two dates."""
+    current = start
+
+    while current < stop:
+        yield current
+        current += step
+
+
+def to_isoformat(d: str | None) -> str | None:
+    """Parse a string and return it as default isoformatted."""
+    if d is None:
+        return None
+    return dt.datetime.fromisoformat(d).replace(tzinfo=dt.timezone.utc).isoformat()
diff --git a/posthog/temporal/tests/utils/events.py b/posthog/temporal/tests/utils/events.py
new file mode 100644
index 00000000000000..58142fb21466fa
--- /dev/null
+++ b/posthog/temporal/tests/utils/events.py
@@ -0,0 +1,212 @@
+"""Test utilities that deal with test event generation."""
+import datetime as dt
+import json
+import random
+import typing
+import uuid
+
+from posthog.temporal.tests.utils.datetimes import date_range
+from posthog.temporal.workflows.clickhouse import ClickHouseClient
+
+
+class EventValues(typing.TypedDict):
+    """Events to be inserted for testing."""
+
+    _timestamp: str
+    created_at: str
+    distinct_id: str
+    elements: str | None
+    elements_chain: str | None
+    event: str
+    inserted_at: str | None
+    person_id: str
+    person_properties: dict | None
+    properties: dict | None
+    team_id: int
+    timestamp: str
+    uuid: str
+    ip: str | None
+    site_url: str | None
+    set: dict | None
+    set_once: dict | None
+
+
+def generate_test_events(
+    count: int,
+    team_id: int,
+    possible_datetimes: list[dt.datetime],
+    event_name: str,
+    inserted_at: str | dt.datetime | None = "_timestamp",
+    properties: dict | None = None,
+    person_properties: dict | None = None,
+    ip: str | None = None,
+    site_url: str | None = "",
+    set_field: dict | None = None,
+    set_once: dict | None = None,
+):
+    """Generate a list of events for testing."""
+    _timestamp = random.choice(possible_datetimes)
+
+    if inserted_at == "_timestamp":
+        inserted_at_value = _timestamp.strftime("%Y-%m-%d %H:%M:%S.%f")
+    elif inserted_at is None:
+        inserted_at_value = None
+    else:
+        if not isinstance(inserted_at, dt.datetime):
+            raise ValueError(f"Unsupported value for inserted_at: '{inserted_at}'")
+        inserted_at_value = inserted_at.strftime("%Y-%m-%d %H:%M:%S.%f")
+
+    events: list[EventValues] = [
+        {
+            "_timestamp": _timestamp.strftime("%Y-%m-%d %H:%M:%S"),
+            "created_at": random.choice(possible_datetimes).strftime("%Y-%m-%d %H:%M:%S.%f"),
+            "distinct_id": str(uuid.uuid4()),
+            "elements": json.dumps("css selectors;"),
+            "elements_chain": "css selectors;",
+            "event": event_name.format(i=i),
+            "inserted_at": inserted_at_value,
+            "person_id": str(uuid.uuid4()),
+            "person_properties": person_properties,
+            "properties": properties,
+            "team_id": team_id,
+            "timestamp": random.choice(possible_datetimes).strftime("%Y-%m-%d %H:%M:%S.%f"),
+            "uuid": str(uuid.uuid4()),
+            "ip": ip,
+            "site_url": site_url,
+            "set": set_field,
+            "set_once": set_once,
+        }
+        for i in range(count)
+    ]
+
+    return events
+
+
+async def insert_event_values_in_clickhouse(client: ClickHouseClient, events: list[EventValues]):
+    """Execute an insert query to insert provided EventValues into sharded_events."""
+    await client.execute_query(
+        f"""
+        INSERT INTO `sharded_events` (
+            uuid,
+            event,
+            timestamp,
+            _timestamp,
+            person_id,
+            team_id,
+            properties,
+            elements_chain,
+            distinct_id,
+            inserted_at,
+            created_at,
+            person_properties
+        )
+        VALUES
+        """,
+        *[
+            (
+                event["uuid"],
+                event["event"],
+                event["timestamp"],
+                event["_timestamp"],
+                event["person_id"],
+                event["team_id"],
+                json.dumps(event["properties"]) if isinstance(event["properties"], dict) else event["properties"],
+                event["elements_chain"],
+                event["distinct_id"],
+                event["inserted_at"],
+                event["created_at"],
+                json.dumps(event["person_properties"])
+                if isinstance(event["person_properties"], dict)
+                else event["person_properties"],
+            )
+            for event in events
+        ],
+    )
+
+
+async def generate_test_events_in_clickhouse(
+    client: ClickHouseClient,
+    team_id: int,
+    start_time: dt.datetime,
+    end_time: dt.datetime,
+    count: int = 100,
+    count_outside_range: int = 10,
+    count_other_team: int = 10,
+    event_name: str = "test-{i}",
+    properties: dict | None = None,
+    person_properties: dict | None = None,
+    inserted_at: str | dt.datetime | None = "_timestamp",
+    duplicate: bool = False,
+) -> tuple[list[EventValues], list[EventValues], list[EventValues]]:
+    """Insert test events into the sharded_events table.
+
+    These events are used in most batch exports tests, so we have a function here to generate
+    multiple events with different characteristics.
+
+    Args:
+        client: A ClickHouseClient to insert events in ClickHouse.
+        team_id: The ID of the team assigned to the generated events.
+        start_time: The start of the date range for datetime event fields (like inserted_at).
+            This should match the start of the batch export.
+        end_time: The end of the date range for datetime event fields (like inserted_at).
+            This should match the end of the batch export.
+        count: Number of events to generate.
+        count_outside_range: Number of events to generate for the same team_id but outside the
+            provided date range given by start_time and end_time.
+        count_other_team: Number of events to generate in the same date range but with a different
+            team_id to the one provided.
+        event_name: A string to name events. This will be formatted with the event number using the 'i'
+            key. If the key is ommitted from the event name then all events will have the same event name.
+        properties: A properties dictionary for events.
+        person_properties: A person_properties for events.
+        duplicate: Generate and insert duplicate events.
+    """
+    possible_datetimes = list(date_range(start_time, end_time, dt.timedelta(minutes=1)))
+
+    # Base events
+    events = generate_test_events(
+        count=count,
+        team_id=team_id,
+        possible_datetimes=possible_datetimes,
+        event_name=event_name,
+        properties=properties,
+        person_properties=person_properties,
+        inserted_at=inserted_at,
+    )
+
+    # Add duplicates if required
+    duplicate_events = []
+    if duplicate is True:
+        duplicate_events = events
+
+    # Events outside original date range
+    delta = end_time - start_time
+    possible_datetimes_outside_range = list(
+        date_range(end_time + dt.timedelta(seconds=1), end_time + delta, dt.timedelta(minutes=1))
+    ) + list(date_range(start_time - dt.timedelta(seconds=1), start_time - delta, dt.timedelta(minutes=1)))
+
+    events_outside_range = generate_test_events(
+        count=count_outside_range,
+        team_id=team_id,
+        possible_datetimes=possible_datetimes_outside_range,
+        event_name=event_name,
+        properties=properties,
+        person_properties=person_properties,
+        inserted_at=inserted_at,
+    )
+
+    # Events generated for a different team
+    events_from_other_team = generate_test_events(
+        count=count_other_team,
+        team_id=team_id + random.randint(1, 1000),
+        possible_datetimes=possible_datetimes,
+        event_name=event_name,
+        properties=properties,
+        person_properties=person_properties,
+        inserted_at=inserted_at,
+    )
+
+    await insert_event_values_in_clickhouse(
+        client=client, events=events + events_outside_range + events_from_other_team + duplicate_events
+    )
+    return (events, events_outside_range, events_from_other_team)
diff --git a/posthog/temporal/tests/utils/models.py b/posthog/temporal/tests/utils/models.py
new file mode 100644
index 00000000000000..01286c7c373f33
--- /dev/null
+++ b/posthog/temporal/tests/utils/models.py
@@ -0,0 +1,55 @@
+"""Test utilities to manipulate BatchExport* models."""
+import uuid
+
+import temporalio.client
+from asgiref.sync import sync_to_async
+
+from posthog.batch_exports.models import BatchExport, BatchExportBackfill, BatchExportDestination, BatchExportRun
+from posthog.batch_exports.service import sync_batch_export
+
+
+def create_batch_export(team_id: int, interval: str, name: str, destination_data: dict) -> BatchExport:
+    """Create a BatchExport and its underlying Schedule."""
+
+    destination = BatchExportDestination(**destination_data)
+    batch_export = BatchExport(team_id=team_id, destination=destination, interval=interval, name=name)
+
+    sync_batch_export(batch_export, created=True)
+
+    destination.save()
+    batch_export.save()
+
+    return batch_export
+
+
+async def acreate_batch_export(team_id: int, interval: str, name: str, destination_data: dict) -> BatchExport:
+    """Async create a BatchExport and its underlying Schedule."""
+    return await sync_to_async(create_batch_export)(team_id, interval, name, destination_data)  # type: ignore
+
+
+async def adelete_batch_export(batch_export: BatchExport, temporal_client: temporalio.client.Client) -> None:
+    """Async delete a BatchExport and its underlying Schedule."""
+    handle = temporal_client.get_schedule_handle(str(batch_export.id))
+    await handle.delete()
+
+    await sync_to_async(batch_export.delete)()  # type: ignore
+
+
+def fetch_batch_export_runs(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportRun]:
+    """Fetch the BatchExportRuns for a given BatchExport."""
+    return list(BatchExportRun.objects.filter(batch_export_id=batch_export_id).order_by("-created_at")[:limit])
+
+
+async def afetch_batch_export_runs(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportRun]:
+    """Async fetch the BatchExportRuns for a given BatchExport."""
+    return await sync_to_async(fetch_batch_export_runs)(batch_export_id, limit)  # type: ignore
+
+
+def fetch_batch_export_backfills(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportBackfill]:
+    """Fetch the BatchExportBackfills for a given BatchExport."""
+    return list(BatchExportBackfill.objects.filter(batch_export_id=batch_export_id).order_by("-created_at")[:limit])
+
+
+async def afetch_batch_export_backfills(batch_export_id: uuid.UUID, limit: int = 100) -> list[BatchExportBackfill]:
+    """Fetch the BatchExportBackfills for a given BatchExport."""
+    return await sync_to_async(fetch_batch_export_backfills)(batch_export_id, limit)  # type: ignore
diff --git a/posthog/temporal/workflows/backfill_batch_export.py b/posthog/temporal/workflows/backfill_batch_export.py
index 17f55ae1d8b544..5e510b07b01bef 100644
--- a/posthog/temporal/workflows/backfill_batch_export.py
+++ b/posthog/temporal/workflows/backfill_batch_export.py
@@ -36,14 +36,14 @@ class HeartbeatDetails(typing.NamedTuple):
     def make_activity_heartbeat_while_running(
         self, function_to_run: collections.abc.Callable, heartbeat_every: dt.timedelta
     ) -> collections.abc.Callable[..., collections.abc.Coroutine]:
-        """Return a callable that returns a coroutine that hearbeats with these HeartbeatDetails.
+        """Return a callable that returns a coroutine that heartbeats with these HeartbeatDetails.
 
-        The returned callable wraps 'function_to_run' while heartbeatting 'factor' times for every
-        'heartbeat_timeout'.
+        The returned callable wraps 'function_to_run' while heartbeating every 'heartbeat_every'
+        seconds.
         """
 
         async def heartbeat() -> None:
-            """Heartbeat factor times every heartbeat_timeout."""
+            """Heartbeat every 'heartbeat_every' seconds."""
             while True:
                 await asyncio.sleep(heartbeat_every.total_seconds())
                 temporalio.activity.heartbeat(self)
@@ -99,8 +99,8 @@ class BackfillScheduleInputs:
 async def backfill_schedule(inputs: BackfillScheduleInputs) -> None:
     """Temporal Activity to backfill a Temporal Schedule.
 
-    The backfill is broken up into batches of inputs.buffer_limit size. After a backfill batch is requested,
-    we wait for it to be done before continuing with the next.
+    The backfill is broken up into batches of inputs.buffer_limit size. After a backfill batch is
+    requested, we wait for it to be done before continuing with the next.
 
     This activity heartbeats while waiting to allow cancelling an ongoing backfill.
     """
diff --git a/posthog/temporal/workflows/batch_exports.py b/posthog/temporal/workflows/batch_exports.py
index 063069388801ff..6efba93df53735 100644
--- a/posthog/temporal/workflows/batch_exports.py
+++ b/posthog/temporal/workflows/batch_exports.py
@@ -14,6 +14,7 @@
 
 import brotli
 from asgiref.sync import sync_to_async
+from prometheus_client import Counter
 from temporalio import activity, exceptions, workflow
 from temporalio.common import RetryPolicy
 
@@ -47,6 +48,15 @@
     """
 )
 
+ROWS_EXPORTED = Counter("batch_export_rows_exported", "Number of rows exported.", labelnames=("destination",))
+BYTES_EXPORTED = Counter("batch_export_bytes_exported", "Number of bytes exported.", labelnames=("destination",))
+EXPORT_STARTED = Counter("batch_export_started", "Number of batch exports started.", labelnames=("destination",))
+EXPORT_FINISHED = Counter(
+    "batch_export_finished",
+    "Number of batch exports finished, for any reason (including failure).",
+    labelnames=("destination", "status"),
+)
+
 
 async def get_rows_count(
     client,
@@ -246,7 +256,7 @@ def get_data_interval(interval: str, data_interval_end: str | None) -> tuple[dt.
             msg = (
                 "Expected 'TemporalScheduledStartTime' of type 'list[str]' or 'list[datetime], found 'NoneType'."
                 "This should be set by the Temporal Schedule unless triggering workflow manually."
-                "In the latter case, ensure 'S3BatchExportInputs.data_interval_end' is set."
+                "In the latter case, ensure '{Type}BatchExportInputs.data_interval_end' is set."
             )
             raise TypeError(msg)
 
@@ -260,7 +270,7 @@ def get_data_interval(interval: str, data_interval_end: str | None) -> tuple[dt.
 
         else:
             msg = (
-                f"Expected search attribute to be of type 'str' or 'datetime' found '{data_interval_end_search_attr[0]}' "
+                f"Expected search attribute to be of type 'str' or 'datetime' but found '{data_interval_end_search_attr[0]}' "
                 f"of type '{type(data_interval_end_search_attr[0])}'."
             )
             raise TypeError(msg)
@@ -670,8 +680,8 @@ class CreateBatchExportBackfillInputs:
 async def create_batch_export_backfill_model(inputs: CreateBatchExportBackfillInputs) -> str:
     """Activity that creates an BatchExportBackfill.
 
-    Intended to be used in all export workflows, usually at the start, to create a model
-    instance to represent them in our database.
+    Intended to be used in all batch export backfill workflows, usually at the start, to create a
+    model instance to represent them in our database.
     """
     logger = get_batch_exports_logger(inputs=inputs)
     logger.info(f"Creating BatchExportBackfill model instance in team {inputs.team_id}.")
@@ -735,6 +745,7 @@ async def execute_batch_export_insert_activity(
         maximum_retry_interval_seconds: Maximum interval in seconds between retries.
     """
     logger = get_batch_exports_logger(inputs=inputs)
+    destination = workflow.info().workflow_type.lower()
 
     retry_policy = RetryPolicy(
         initial_interval=dt.timedelta(seconds=initial_retry_interval_seconds),
@@ -743,6 +754,7 @@ async def execute_batch_export_insert_activity(
         non_retryable_error_types=non_retryable_error_types,
     )
     try:
+        EXPORT_STARTED.labels(destination=destination).inc()
         await workflow.execute_activity(
             activity,
             inputs,
@@ -773,6 +785,7 @@ async def execute_batch_export_insert_activity(
         )
 
     finally:
+        EXPORT_FINISHED.labels(destination=destination, status=update_inputs.status.lower()).inc()
         await workflow.execute_activity(
             update_export_run_status,
             update_inputs,
diff --git a/posthog/temporal/workflows/bigquery_batch_export.py b/posthog/temporal/workflows/bigquery_batch_export.py
index d9557d31bb07b3..531b3c7445baa6 100644
--- a/posthog/temporal/workflows/bigquery_batch_export.py
+++ b/posthog/temporal/workflows/bigquery_batch_export.py
@@ -21,6 +21,8 @@
     get_data_interval,
     get_results_iterator,
     get_rows_count,
+    ROWS_EXPORTED,
+    BYTES_EXPORTED,
 )
 from posthog.temporal.workflows.clickhouse import get_client
 
@@ -162,6 +164,17 @@ async def insert_into_bigquery_activity(inputs: BigQueryInsertInputs):
             )
 
             with BatchExportTemporaryFile() as jsonl_file:
+
+                def flush_to_bigquery():
+                    logger.info(
+                        "Copying %s records of size %s bytes to BigQuery",
+                        jsonl_file.records_since_last_reset,
+                        jsonl_file.bytes_since_last_reset,
+                    )
+                    load_jsonl_file_to_bigquery_table(jsonl_file, bigquery_table, table_schema, bq_client)
+                    ROWS_EXPORTED.labels(destination="bigquery").inc(jsonl_file.records_since_last_reset)
+                    BYTES_EXPORTED.labels(destination="bigquery").inc(jsonl_file.bytes_since_last_reset)
+
                 for result in results_iterator:
                     row = {
                         field.name: json.dumps(result[field.name]) if field.name in json_columns else result[field.name]
@@ -173,26 +186,11 @@ async def insert_into_bigquery_activity(inputs: BigQueryInsertInputs):
                     jsonl_file.write_records_to_jsonl([row])
 
                     if jsonl_file.tell() > settings.BATCH_EXPORT_BIGQUERY_UPLOAD_CHUNK_SIZE_BYTES:
-                        logger.info(
-                            "Copying %s records of size %s bytes to BigQuery",
-                            jsonl_file.records_since_last_reset,
-                            jsonl_file.bytes_since_last_reset,
-                        )
-                        load_jsonl_file_to_bigquery_table(
-                            jsonl_file,
-                            bigquery_table,
-                            table_schema,
-                            bq_client,
-                        )
+                        flush_to_bigquery()
                         jsonl_file.reset()
 
                 if jsonl_file.tell() > 0:
-                    logger.info(
-                        "Copying %s records of size %s bytes to BigQuery",
-                        jsonl_file.records_since_last_reset,
-                        jsonl_file.bytes_since_last_reset,
-                    )
-                    load_jsonl_file_to_bigquery_table(jsonl_file, bigquery_table, table_schema, bq_client)
+                    flush_to_bigquery()
 
 
 @workflow.defn(name="bigquery-export")
diff --git a/posthog/temporal/workflows/postgres_batch_export.py b/posthog/temporal/workflows/postgres_batch_export.py
index 8b66cfb0abb2cd..a7ff877e0f1a7b 100644
--- a/posthog/temporal/workflows/postgres_batch_export.py
+++ b/posthog/temporal/workflows/postgres_batch_export.py
@@ -23,6 +23,8 @@
     get_data_interval,
     get_results_iterator,
     get_rows_count,
+    ROWS_EXPORTED,
+    BYTES_EXPORTED,
 )
 from posthog.temporal.workflows.clickhouse import get_client
 
@@ -218,29 +220,8 @@ async def insert_into_postgres_activity(inputs: PostgresInsertInputs):
 
         with BatchExportTemporaryFile() as pg_file:
             with postgres_connection(inputs) as connection:
-                for result in results_iterator:
-                    row = {
-                        key: json.dumps(result[key]) if key in json_columns and result[key] is not None else result[key]
-                        for key in schema_columns
-                    }
-                    pg_file.write_records_to_tsv([row], fieldnames=schema_columns)
 
-                    if pg_file.tell() > settings.BATCH_EXPORT_POSTGRES_UPLOAD_CHUNK_SIZE_BYTES:
-                        logger.info(
-                            "Copying %s records of size %s bytes to Postgres",
-                            pg_file.records_since_last_reset,
-                            pg_file.bytes_since_last_reset,
-                        )
-                        copy_tsv_to_postgres(
-                            pg_file,
-                            connection,
-                            inputs.schema,
-                            inputs.table_name,
-                            schema_columns,
-                        )
-                        pg_file.reset()
-
-                if pg_file.tell() > 0:
+                def flush_to_postgres():
                     logger.info(
                         "Copying %s records of size %s bytes to Postgres",
                         pg_file.records_since_last_reset,
@@ -253,6 +234,22 @@ async def insert_into_postgres_activity(inputs: PostgresInsertInputs):
                         inputs.table_name,
                         schema_columns,
                     )
+                    ROWS_EXPORTED.labels(destination="postgres").inc(pg_file.records_since_last_reset)
+                    BYTES_EXPORTED.labels(destination="postgres").inc(pg_file.bytes_since_last_reset)
+
+                for result in results_iterator:
+                    row = {
+                        key: json.dumps(result[key]) if key in json_columns and result[key] is not None else result[key]
+                        for key in schema_columns
+                    }
+                    pg_file.write_records_to_tsv([row], fieldnames=schema_columns)
+
+                    if pg_file.tell() > settings.BATCH_EXPORT_POSTGRES_UPLOAD_CHUNK_SIZE_BYTES:
+                        flush_to_postgres()
+                        pg_file.reset()
+
+                if pg_file.tell() > 0:
+                    flush_to_postgres()
 
 
 @workflow.defn(name="postgres-export")
diff --git a/posthog/temporal/workflows/redshift_batch_export.py b/posthog/temporal/workflows/redshift_batch_export.py
index 74c1fb52662cc3..572ce243196d85 100644
--- a/posthog/temporal/workflows/redshift_batch_export.py
+++ b/posthog/temporal/workflows/redshift_batch_export.py
@@ -22,6 +22,7 @@
     get_data_interval,
     get_results_iterator,
     get_rows_count,
+    ROWS_EXPORTED,
 )
 from posthog.temporal.workflows.clickhouse import get_client
 from posthog.temporal.workflows.postgres_batch_export import (
@@ -69,17 +70,24 @@ def insert_records_to_redshift(
         )
         template = sql.SQL("({})").format(sql.SQL(", ").join(map(sql.Placeholder, columns)))
 
+        def flush_to_redshift():
+            psycopg2.extras.execute_values(cursor, query, batch, template)
+            ROWS_EXPORTED.labels(destination="redshift").inc(len(batch))
+            # It would be nice to record BYTES_EXPORTED for Redshift, but it's not worth estimating
+            # the byte size of each batch the way things are currently written. We can revisit this
+            # in the future if we decide it's useful enough.
+
         for record in records:
             batch.append(record)
 
             if len(batch) < batch_size:
                 continue
 
-            psycopg2.extras.execute_values(cursor, query, batch, template)
+            flush_to_redshift()
             batch = []
 
         if len(batch) > 0:
-            psycopg2.extras.execute_values(cursor, query, batch, template)
+            flush_to_redshift()
 
 
 @dataclass
diff --git a/posthog/temporal/workflows/s3_batch_export.py b/posthog/temporal/workflows/s3_batch_export.py
index 6a81aeeb93a777..0d06c8abde9b49 100644
--- a/posthog/temporal/workflows/s3_batch_export.py
+++ b/posthog/temporal/workflows/s3_batch_export.py
@@ -24,6 +24,8 @@
     get_data_interval,
     get_results_iterator,
     get_rows_count,
+    ROWS_EXPORTED,
+    BYTES_EXPORTED,
 )
 from posthog.temporal.workflows.clickhouse import get_client
 
@@ -425,6 +427,22 @@ async def worker_shutdown_handler():
 
         async with s3_upload as s3_upload:
             with BatchExportTemporaryFile(compression=inputs.compression) as local_results_file:
+
+                async def flush_to_s3(last_uploaded_part_timestamp: str, last=False):
+                    logger.info(
+                        "Uploading %spart %s containing %s records with size %s bytes to S3",
+                        "last " if last else "",
+                        s3_upload.part_number + 1,
+                        local_results_file.records_since_last_reset,
+                        local_results_file.bytes_since_last_reset,
+                    )
+
+                    await s3_upload.upload_part(local_results_file)
+                    ROWS_EXPORTED.labels(destination="s3").inc(local_results_file.records_since_last_reset)
+                    BYTES_EXPORTED.labels(destination="s3").inc(local_results_file.bytes_since_last_reset)
+
+                    activity.heartbeat(last_uploaded_part_timestamp, s3_upload.to_state())
+
                 for result in results_iterator:
                     record = {
                         "created_at": result["created_at"],
@@ -442,32 +460,13 @@ async def worker_shutdown_handler():
                     local_results_file.write_records_to_jsonl([record])
 
                     if local_results_file.tell() > settings.BATCH_EXPORT_S3_UPLOAD_CHUNK_SIZE_BYTES:
-                        logger.info(
-                            "Uploading part %s containing %s records with size %s bytes to S3",
-                            s3_upload.part_number + 1,
-                            local_results_file.records_since_last_reset,
-                            local_results_file.bytes_since_last_reset,
-                        )
-
-                        await s3_upload.upload_part(local_results_file)
-
                         last_uploaded_part_timestamp = result["inserted_at"]
-                        activity.heartbeat(last_uploaded_part_timestamp, s3_upload.to_state())
-
+                        await flush_to_s3(last_uploaded_part_timestamp)
                         local_results_file.reset()
 
                 if local_results_file.tell() > 0 and result is not None:
-                    logger.info(
-                        "Uploading last part %s containing %s records with size %s bytes to S3",
-                        s3_upload.part_number + 1,
-                        local_results_file.records_since_last_reset,
-                        local_results_file.bytes_since_last_reset,
-                    )
-
-                    await s3_upload.upload_part(local_results_file)
-
                     last_uploaded_part_timestamp = result["inserted_at"]
-                    activity.heartbeat(last_uploaded_part_timestamp, s3_upload.to_state())
+                    await flush_to_s3(last_uploaded_part_timestamp, last=True)
 
             await s3_upload.complete()
 
diff --git a/posthog/temporal/workflows/snowflake_batch_export.py b/posthog/temporal/workflows/snowflake_batch_export.py
index ec556e527192a5..800991a42a4cfd 100644
--- a/posthog/temporal/workflows/snowflake_batch_export.py
+++ b/posthog/temporal/workflows/snowflake_batch_export.py
@@ -20,6 +20,8 @@
     get_data_interval,
     get_results_iterator,
     get_rows_count,
+    ROWS_EXPORTED,
+    BYTES_EXPORTED,
 )
 from posthog.temporal.workflows.clickhouse import get_client
 
@@ -174,6 +176,14 @@ async def insert_into_snowflake_activity(inputs: SnowflakeInsertInputs):
             )
             result = None
             local_results_file = tempfile.NamedTemporaryFile(suffix=".jsonl")
+            rows_in_file = 0
+
+            def flush_to_snowflake(lrf: tempfile._TemporaryFileWrapper, rows_in_file: int):
+                lrf.flush()
+                put_file_to_snowflake_table(cursor, lrf.name, inputs.table_name)
+                ROWS_EXPORTED.labels(destination="snowflake").inc(rows_in_file)
+                BYTES_EXPORTED.labels(destination="snowflake").inc(lrf.tell())
+
             try:
                 while True:
                     try:
@@ -212,6 +222,7 @@ async def insert_into_snowflake_activity(inputs: SnowflakeInsertInputs):
                     # Write the results to a local file
                     local_results_file.write(json.dumps(result).encode("utf-8"))
                     local_results_file.write("\n".encode("utf-8"))
+                    rows_in_file += 1
 
                     # Write results to Snowflake when the file reaches 50MB and
                     # reset the file, or if there is nothing else to write.
@@ -222,16 +233,15 @@ async def insert_into_snowflake_activity(inputs: SnowflakeInsertInputs):
                         logger.info("Uploading to Snowflake")
 
                         # Flush the file to make sure everything is written
-                        local_results_file.flush()
-                        put_file_to_snowflake_table(cursor, local_results_file.name, inputs.table_name)
+                        flush_to_snowflake(local_results_file, rows_in_file)
 
                         # Delete the temporary file and create a new one
                         local_results_file.close()
                         local_results_file = tempfile.NamedTemporaryFile(suffix=".jsonl")
+                        rows_in_file = 0
 
                 # Flush the file to make sure everything is written
-                local_results_file.flush()
-                put_file_to_snowflake_table(cursor, local_results_file.name, inputs.table_name)
+                flush_to_snowflake(local_results_file, rows_in_file)
 
                 # We don't need the file anymore, close (and delete) it.
                 local_results_file.close()
diff --git a/posthog/test/__snapshots__/test_feature_flag.ambr b/posthog/test/__snapshots__/test_feature_flag.ambr
index f7a912fe972b7b..613f7a067054f2 100644
--- a/posthog/test/__snapshots__/test_feature_flag.ambr
+++ b/posthog/test/__snapshots__/test_feature_flag.ambr
@@ -345,6 +345,114 @@
          AND "posthog_group"."group_type_index" = 2)
   '
 ---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_cohorts_and_nested_cohorts
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE (NOT "posthog_cohort"."deleted"
+         AND "posthog_cohort"."team_id" = 2)
+  '
+---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_cohorts_and_nested_cohorts.1
+  '
+  SELECT (((("posthog_person"."properties" -> 'number') > '"100"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'string')
+           OR (("posthog_person"."properties" -> 'number') > '100.0'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'number'))
+          AND "posthog_person"."properties" ? 'number'
+          AND NOT (("posthog_person"."properties" -> 'number') = 'null')) AS "flag_X_condition_0",
+         (((("posthog_person"."properties" -> 'version') > '"1.05"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'version')) = 'string')
+           OR (("posthog_person"."properties" -> 'version') > '1.05'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'version')) = 'number'))
+          AND "posthog_person"."properties" ? 'version'
+          AND NOT (("posthog_person"."properties" -> 'version') = 'null')) AS "flag_X_condition_0",
+         (((("posthog_person"."properties" -> 'number') < '"31"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'string')
+           OR (("posthog_person"."properties" -> 'number') < '31.0'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'number'))
+          AND "posthog_person"."properties" ? 'number'
+          AND NOT (("posthog_person"."properties" -> 'number') = 'null')
+          AND ((("posthog_person"."properties" -> 'nested_prop') > '"20"'
+                AND JSONB_TYPEOF(("posthog_person"."properties" -> 'nested_prop')) = 'string')
+               OR (("posthog_person"."properties" -> 'nested_prop') > '20.0'
+                   AND JSONB_TYPEOF(("posthog_person"."properties" -> 'nested_prop')) = 'number'))
+          AND "posthog_person"."properties" ? 'nested_prop'
+          AND NOT (("posthog_person"."properties" -> 'nested_prop') = 'null')) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = '307'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_groups_and_person_flags
+  '
+  SELECT "posthog_grouptypemapping"."id",
+         "posthog_grouptypemapping"."team_id",
+         "posthog_grouptypemapping"."group_type",
+         "posthog_grouptypemapping"."group_type_index",
+         "posthog_grouptypemapping"."name_singular",
+         "posthog_grouptypemapping"."name_plural"
+  FROM "posthog_grouptypemapping"
+  WHERE "posthog_grouptypemapping"."team_id" = 2
+  '
+---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_groups_and_person_flags.1
+  '
+  SELECT (((("posthog_person"."properties" -> 'number') >= '"20"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'string')
+           OR (("posthog_person"."properties" -> 'number') >= '20.0'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number')) = 'number'))
+          AND "posthog_person"."properties" ? 'number'
+          AND NOT (("posthog_person"."properties" -> 'number') = 'null')) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = '307'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_groups_and_person_flags.2
+  '
+  SELECT (((("posthog_group"."group_properties" -> 'number') > '"100"'
+            AND JSONB_TYPEOF(("posthog_group"."group_properties" -> 'number')) = 'string')
+           OR (("posthog_group"."group_properties" -> 'number') > '100.0'
+               AND JSONB_TYPEOF(("posthog_group"."group_properties" -> 'number')) = 'number'))
+          AND "posthog_group"."group_properties" ? 'number'
+          AND NOT (("posthog_group"."group_properties" -> 'number') = 'null')) AS "flag_X_condition_0"
+  FROM "posthog_group"
+  WHERE ("posthog_group"."team_id" = 2
+         AND "posthog_group"."group_key" = 'foo'
+         AND "posthog_group"."group_type_index" = 0)
+  '
+---
+# name: TestFeatureFlagMatcher.test_numeric_operator_with_groups_and_person_flags.3
+  '
+  SELECT (("posthog_group"."group_properties" -> 'number') > '"100b2c"'
+          AND "posthog_group"."group_properties" ? 'number'
+          AND NOT (("posthog_group"."group_properties" -> 'number') = 'null')) AS "flag_X_condition_0"
+  FROM "posthog_group"
+  WHERE ("posthog_group"."team_id" = 2
+         AND "posthog_group"."group_key" = 'foo-project'
+         AND "posthog_group"."group_type_index" = 1)
+  '
+---
 # name: TestFeatureFlagMatcher.test_super_condition_matches_string
   '
   SELECT ((("posthog_person"."properties" -> 'is_enabled') = 'true'
@@ -365,6 +473,145 @@
          AND "posthog_person"."team_id" = 2)
   '
 ---
+# name: TestFeatureFlagMatcher.test_with_sql_injection_properties_and_other_aliases
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestFeatureFlagMatcher.test_with_sql_injection_properties_and_other_aliases.1
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."active"
+         AND NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."team_id" = 2)
+  '
+---
+# name: TestFeatureFlagMatcher.test_with_sql_injection_properties_and_other_aliases.2
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE (NOT "posthog_cohort"."deleted"
+         AND "posthog_cohort"."team_id" = 2)
+  '
+---
+# name: TestFeatureFlagMatcher.test_with_sql_injection_properties_and_other_aliases.3
+  '
+  SELECT (((("posthog_person"."properties" -> 'number space') > '"100"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number space')) = 'string')
+           OR (("posthog_person"."properties" -> 'number space') > '100.0'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'number space')) = 'number'))
+          AND "posthog_person"."properties" ? 'number space'
+          AND NOT (("posthog_person"."properties" -> 'number space') = 'null')
+          AND ((JSONB_TYPEOF(("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;')) = 'string'
+                AND ("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') > '"100"')
+               OR (JSONB_TYPEOF(("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;')) = 'number'
+                   AND ("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') > '100.0'))
+          AND "posthog_person"."properties" ? ';''" SELECT 1; DROP TABLE posthog_featureflag;'
+          AND NOT (("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') = 'null')) AS "flag_X_condition_0",
+         (((JSONB_TYPEOF(("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;')) = 'string'
+            AND ("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') > '"100"')
+           OR (JSONB_TYPEOF(("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;')) = 'number'
+               AND ("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') > '100.0'))
+          AND "posthog_person"."properties" ? ';''" SELECT 1; DROP TABLE posthog_featureflag;'
+          AND NOT (("posthog_person"."properties" -> ';''" SELECT 1; DROP TABLE posthog_featureflag;') = 'null')) AS "flag_X_condition_1",
+         (((("posthog_person"."properties" -> 'version!!!') > '"1.05"'
+            AND JSONB_TYPEOF(("posthog_person"."properties" -> 'version!!!')) = 'string')
+           OR (("posthog_person"."properties" -> 'version!!!') > '1.05'
+               AND JSONB_TYPEOF(("posthog_person"."properties" -> 'version!!!')) = 'number'))
+          AND "posthog_person"."properties" ? 'version!!!'
+          AND NOT (("posthog_person"."properties" -> 'version!!!') = 'null')) AS "flag_X_condition_2",
+         ((("posthog_person"."properties" -> 'nested_prop --random #comment //test') = '"21"'
+           OR ("posthog_person"."properties" -> 'nested_prop --random #comment //test') = '21')
+          AND "posthog_person"."properties" ? 'nested_prop --random #comment //test'
+          AND NOT (("posthog_person"."properties" -> 'nested_prop --random #comment //test') = 'null')) AS "flag_X_condition_3"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = '307'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
 # name: TestHashKeyOverridesRaceConditions.test_hash_key_overrides_with_simulated_error_race_conditions_on_person_merging
   '
   
diff --git a/posthog/test/base.py b/posthog/test/base.py
index 105285fa3073ef..3cd830a68a49da 100644
--- a/posthog/test/base.py
+++ b/posthog/test/base.py
@@ -460,13 +460,14 @@ def assertQueryMatchesSnapshot(self, query, params=None, replace_all_numbers=Fal
         if replace_all_numbers:
             query = re.sub(r"(\"?) = \d+", r"\1 = 2", query)
             query = re.sub(r"(\"?) IN \(\d+(, \d+)*\)", r"\1 IN (1, 2, 3, 4, 5 /* ... */)", query)
-            # feature flag conditions use primary keys as columns in queries, so replace those too
-            query = re.sub(r"flag_\d+_condition", r"flag_X_condition", query)
-            query = re.sub(r"flag_\d+_super_condition", r"flag_X_super_condition", query)
         else:
             query = re.sub(r"(team|cohort)_id(\"?) = \d+", r"\1_id\2 = 2", query)
             query = re.sub(r"\d+ as (team|cohort)_id(\"?)", r"2 as \1_id\2", query)
 
+        # feature flag conditions use primary keys as columns in queries, so replace those always
+        query = re.sub(r"flag_\d+_condition", r"flag_X_condition", query)
+        query = re.sub(r"flag_\d+_super_condition", r"flag_X_super_condition", query)
+
         # hog ql checks team ids differently
         query = re.sub(
             r"equals\(([^.]+\.)?team_id?, \d+\)",
diff --git a/posthog/test/test_feature_flag.py b/posthog/test/test_feature_flag.py
index dbcda391f1f22c..da323dd5cb32fd 100644
--- a/posthog/test/test_feature_flag.py
+++ b/posthog/test/test_feature_flag.py
@@ -1,4 +1,5 @@
 import concurrent.futures
+from datetime import datetime
 from typing import cast
 from unittest.mock import patch
 
@@ -6,6 +7,7 @@
 from django.db import IntegrityError, connection
 from django.test import TransactionTestCase
 from django.utils import timezone
+from freezegun import freeze_time
 import pytest
 
 from posthog.models import Cohort, FeatureFlag, GroupTypeMapping, Person
@@ -4139,6 +4141,903 @@ def create_groups(self):
     def create_feature_flag(self, key="beta-feature", **kwargs):
         return FeatureFlag.objects.create(team=self.team, name="Beta feature", key=key, created_by=self.user, **kwargs)
 
+    def test_numeric_operator(self):
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=["307"],
+            properties={"number": 30, "string_number": "30", "version": "1.24"},
+        )
+
+        feature_flag1 = self.create_feature_flag(
+            key="random1",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "100",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag2 = self.create_feature_flag(
+            key="random2",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "100b2c",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag3 = self.create_feature_flag(
+            key="random3",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "3.1x00b2c",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag4 = self.create_feature_flag(
+            key="random4",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "20",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag5 = self.create_feature_flag(
+            key="random5",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.05",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.15",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.1200",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                ]
+            },
+        )
+
+        feature_flag6 = self.create_feature_flag(
+            key="random6",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.206.0",
+                                "operator": "lt",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307"),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag2, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag3, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag4, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # even though we can parse as a number, only do string comparison
+        self.assertEqual(
+            self.match_flag(feature_flag5, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag6, "307"),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+
+    def test_numeric_operator_with_groups_and_person_flags(self):
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=["307"],
+            properties={"number": 30, "string_number": "30", "version": "1.24"},
+        )
+        GroupTypeMapping.objects.create(team=self.team, group_type="organization", group_type_index=0)
+        GroupTypeMapping.objects.create(team=self.team, group_type="project", group_type_index=1)
+
+        Group.objects.create(
+            team=self.team,
+            group_type_index=0,
+            group_key="foo",
+            group_properties={"name": "foo.inc", "number": 50, "string_number": "50"},
+            version=1,
+        )
+        Group.objects.create(
+            team=self.team,
+            group_type_index=1,
+            group_key="foo-project",
+            group_properties={"name": "foo-project", "number": 20, "string_number": "20"},
+            version=1,
+        )
+
+        feature_flag1 = self.create_feature_flag(
+            key="random1",
+            filters={
+                "aggregation_group_type_index": 0,
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "100",
+                                "operator": "gt",
+                                "group_type_index": 0,
+                                "type": "group",
+                            },
+                        ]
+                    }
+                ],
+            },
+        )
+
+        feature_flag2 = self.create_feature_flag(
+            key="random2",
+            filters={
+                "aggregation_group_type_index": 1,
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "100b2c",
+                                "operator": "gt",
+                                "group_type_index": 1,
+                                "type": "group",
+                            },
+                        ]
+                    }
+                ],
+            },
+        )
+
+        feature_flag3 = self.create_feature_flag(
+            key="random3",
+            filters={
+                "aggregation_group_type_index": 0,
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "3.1x00b2c",
+                                "operator": "gte",
+                                "type": "person",
+                                "group_type_index": 0,
+                                "type": "group",
+                            },
+                        ]
+                    }
+                ],
+            },
+        )
+
+        feature_flag4 = self.create_feature_flag(
+            key="random4",
+            filters={
+                "aggregation_group_type_index": 0,
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "20",
+                                "operator": "gt",
+                                "group_type_index": 0,
+                                "type": "group",
+                            },
+                        ]
+                    }
+                ],
+            },
+        )
+
+        feature_flag4_person = self.create_feature_flag(
+            key="random4_person",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "number",
+                                "value": "20",
+                                "operator": "gte",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag5 = self.create_feature_flag(
+            key="random5",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.05",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.15",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.1200",
+                                "operator": "gte",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                ]
+            },
+        )
+
+        feature_flag6 = self.create_feature_flag(
+            key="random6",
+            filters={
+                "aggregation_group_type_index": 0,
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "version",
+                                "value": "1.206.0",
+                                "operator": "lt",
+                                "group_type_index": 0,
+                                "type": "group",
+                            },
+                        ]
+                    }
+                ],
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag2, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag3, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag4, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # even though we can parse as a number, only do string comparison
+        self.assertEqual(
+            self.match_flag(feature_flag5, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag6, "307", groups={"organization": "foo", "project": "foo-project"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+
+        # Make sure clashes on property name doesn't affect computation
+        with snapshot_postgres_queries_context(self, replace_all_numbers=False):
+            self.assertEqual(
+                FeatureFlagMatcher(
+                    [feature_flag1, feature_flag2, feature_flag4_person],
+                    "307",
+                    groups={"organization": "foo", "project": "foo-project"},
+                ).get_matches()[1],
+                {
+                    "random1": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.NO_CONDITION_MATCH,
+                    },
+                    "random2": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                    "random4_person": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                },
+            )
+
+        # handle overrides in group properties
+        self.assertEqual(
+            self.match_flag(
+                feature_flag1,
+                "307",
+                groups={"organization": "foo", "project": "foo-project"},
+                group_property_value_overrides={"organization": {"number": 200}, "project": {"number": 1}},
+            ),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # string '30' > string '100' (lexicographically)
+        self.assertEqual(
+            self.match_flag(
+                feature_flag1,
+                "307",
+                groups={"organization": "foo", "project": "foo-project"},
+                group_property_value_overrides={"organization": {"number": "30"}, "project": {"number": 1}},
+            ),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(
+                feature_flag1,
+                "307",
+                groups={"organization": "foo", "project": "foo-project"},
+                group_property_value_overrides={"organization": {"number": "01323"}, "project": {"number": 1}},
+            ),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(
+                feature_flag1,
+                "307",
+                groups={"organization": "foo", "project": "foo-project"},
+                group_property_value_overrides={"organization": {"number": 0}, "project": {"number": 1}},
+            ),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(
+                feature_flag2,
+                "307",
+                groups={"organization": "foo", "project": "foo-project"},
+                group_property_value_overrides={"organization": {"number": "0"}, "project": {"number": 19.999999}},
+            ),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+    def test_numeric_operator_with_cohorts_and_nested_cohorts(self):
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=["307"],
+            properties={"number": 30, "string_number": "30", "version": "1.24", "nested_prop": 21},
+        )
+        cohort1 = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "number",
+                            "value": "100",
+                            "type": "person",
+                            "operator": "gt",
+                        }
+                    ]
+                }
+            ],
+        )
+        feature_flag1 = self.create_feature_flag(
+            key="random1",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "id",
+                                "value": cohort1.pk,
+                                "type": "cohort",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307"),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+
+        cohort2 = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "version",
+                            "value": "1.05",
+                            "operator": "gt",
+                            "type": "person",
+                        },
+                    ]
+                }
+            ],
+        )
+        feature_flag2 = self.create_feature_flag(
+            key="random2",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "id",
+                                "value": cohort2.pk,
+                                "type": "cohort",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag2, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        cohort_nest = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "nested_prop",
+                            "value": "20",
+                            "operator": "gt",
+                            "type": "person",
+                        },
+                    ]
+                }
+            ],
+        )
+
+        cohort3 = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "number",
+                            "value": "31",
+                            "operator": "lt",
+                            "type": "person",
+                        },
+                        {
+                            "key": "id",
+                            "value": str(cohort_nest.pk),
+                            "type": "cohort",
+                        },
+                    ]
+                }
+            ],
+        )
+        feature_flag3 = self.create_feature_flag(
+            key="random3",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "id",
+                                "value": str(cohort3.pk),
+                                "type": "cohort",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag3, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # Make sure clashes on property name doesn't affect computation
+        with snapshot_postgres_queries_context(self, replace_all_numbers=False):
+            self.assertEqual(
+                FeatureFlagMatcher(
+                    [feature_flag1, feature_flag2, feature_flag3],
+                    "307",
+                ).get_matches()[1],
+                {
+                    "random1": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.NO_CONDITION_MATCH,
+                    },
+                    "random2": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                    "random3": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                },
+            )
+
+    @snapshot_postgres_queries
+    def test_with_sql_injection_properties_and_other_aliases(self):
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=["307"],
+            properties={
+                "number space": 30,
+                ";'\" SELECT 1; DROP TABLE posthog_featureflag;": "30",
+                "version!!!": "1.24",
+                "nested_prop --random #comment //test": 21,
+            },
+        )
+        cohort1 = Cohort.objects.create(
+            team=self.team,
+            groups=[
+                {
+                    "properties": [
+                        {
+                            "key": "number space",
+                            "value": "100",
+                            "type": "person",
+                            "operator": "gt",
+                        },
+                        {
+                            "key": ";'\" SELECT 1; DROP TABLE posthog_featureflag;",
+                            "value": "100",
+                            "type": "person",
+                            "operator": "gt",
+                        },
+                    ]
+                }
+            ],
+        )
+        feature_flag1 = self.create_feature_flag(
+            key="random1",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "id",
+                                "value": cohort1.pk,
+                                "type": "cohort",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": ";'\" SELECT 1; DROP TABLE posthog_featureflag;",
+                                "value": "100",
+                                "type": "person",
+                                "operator": "gt",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "version!!!",
+                                "value": "1.05",
+                                "operator": "gt",
+                                "type": "person",
+                            },
+                        ]
+                    },
+                    {
+                        "properties": [
+                            {
+                                "key": "nested_prop --random #comment //test",
+                                "value": "21",
+                                "type": "person",
+                            },
+                        ],
+                    },
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 1),
+        )
+
+    @freeze_time("2022-05-01")
+    def test_relative_date_operator(self):
+        Person.objects.create(
+            team=self.team,
+            distinct_ids=["307"],
+            properties={
+                "date_1": "2022-04-30",
+                "date_2": "2022-03-01",
+                "date_3": "2022-04-30T12:00:00-10:00",
+                "date_invalid": "2022-3443",
+            },
+        )
+
+        feature_flag1 = self.create_feature_flag(
+            key="random1",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "date_1",
+                                "value": "6h",
+                                "operator": "is_relative_date_before",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag2 = self.create_feature_flag(
+            key="random2",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "date_3",
+                                "value": "2d",
+                                "operator": "is_relative_date_after",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag3 = self.create_feature_flag(
+            key="random3",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "date_3",
+                                "value": "2h",
+                                "operator": "is_relative_date_after",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag4_invalid_prop = self.create_feature_flag(
+            key="random4",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "date_invalid",
+                                "value": "2h",
+                                "operator": "is_relative_date_after",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        feature_flag5_invalid_flag = self.create_feature_flag(
+            key="random5",
+            filters={
+                "groups": [
+                    {
+                        "properties": [
+                            {
+                                "key": "date_1",
+                                "value": "bazinga",
+                                "operator": "is_relative_date_after",
+                                "type": "person",
+                            },
+                        ]
+                    }
+                ]
+            },
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        self.assertEqual(
+            self.match_flag(feature_flag2, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # now move current date to 2022-05-02
+        with freeze_time("2022-05-02T08:00:00-10:00"):
+            self.assertEqual(
+                self.match_flag(feature_flag2, "307"),
+                FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+            )
+
+        self.assertEqual(
+            self.match_flag(feature_flag3, "307"),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        # :TRICKY: String matching means invalid props can be appropriately targeted
+        self.assertEqual(
+            self.match_flag(feature_flag4_invalid_prop, "307"),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # invalid flags never return True
+        self.assertEqual(
+            self.match_flag(feature_flag5_invalid_flag, "307"),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+
+        # try matching all together, invalids don't interfere with regular flags
+        self.assertEqual(
+            FeatureFlagMatcher(
+                [feature_flag1, feature_flag2, feature_flag3, feature_flag4_invalid_prop, feature_flag5_invalid_flag],
+                "307",
+            ).get_matches(),
+            (
+                {"random1": True, "random2": True, "random3": False, "random4": True, "random5": False},
+                {
+                    "random1": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                    "random2": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                    "random3": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.NO_CONDITION_MATCH,
+                    },
+                    "random4": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.CONDITION_MATCH,
+                    },
+                    "random5": {
+                        "condition_index": 0,
+                        "reason": FeatureFlagMatchReason.NO_CONDITION_MATCH,
+                    },
+                },
+                {},
+                False,
+            ),
+        )
+
+        # confirm it works with overrides as well, which are computed locally
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", property_value_overrides={"date_1": "2021-01-04"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", property_value_overrides={"date_1": "2023-01-04"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", property_value_overrides={"date_1": "2022-04-30T08:01:00-10:00"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", property_value_overrides={"date_1": "2022-04-30T07:59:00-10:00"}),
+            FeatureFlagMatch(True, None, FeatureFlagMatchReason.CONDITION_MATCH, 0),
+        )
+
+        # test with invalid date
+        self.assertEqual(
+            self.match_flag(feature_flag1, "307", property_value_overrides={"date_1": "bazinga"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(
+                feature_flag5_invalid_flag, "307", property_value_overrides={"date_1": "2022-04-30T07:59:00-10:00"}
+            ),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag5_invalid_flag, "307", property_value_overrides={"date_1": "2022-04-30"}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+        self.assertEqual(
+            self.match_flag(feature_flag5_invalid_flag, "307", property_value_overrides={"date_1": datetime.now()}),
+            FeatureFlagMatch(False, None, FeatureFlagMatchReason.NO_CONDITION_MATCH, 0),
+        )
+
 
 class TestFeatureFlagHashKeyOverrides(BaseTest, QueryMatchingTest):
     person: Person
diff --git a/posthog/utils.py b/posthog/utils.py
index 0e9560592990dd..b510712ba5d89e 100644
--- a/posthog/utils.py
+++ b/posthog/utils.py
@@ -173,7 +173,7 @@ def relative_date_parse_with_delta_mapping(
     *,
     always_truncate: bool = False,
     now: Optional[datetime.datetime] = None,
-) -> Tuple[datetime.datetime, Optional[Dict[str, int]]]:
+) -> Tuple[datetime.datetime, Optional[Dict[str, int]], str | None]:
     """Returns the parsed datetime, along with the period mapping - if the input was a relative datetime string."""
     try:
         try:
@@ -191,14 +191,14 @@ def relative_date_parse_with_delta_mapping(
             parsed_dt = parsed_dt.replace(tzinfo=timezone_info)
         else:
             parsed_dt = parsed_dt.astimezone(timezone_info)
-        return parsed_dt, None
+        return parsed_dt, None, None
 
     regex = r"\-?(?P<number>[0-9]+)?(?P<type>[a-z])(?P<position>Start|End)?"
     match = re.search(regex, input)
     parsed_dt = (now or dt.datetime.now()).astimezone(timezone_info)
     delta_mapping: Dict[str, int] = {}
     if not match:
-        return parsed_dt, delta_mapping
+        return parsed_dt, delta_mapping, None
     if match.group("type") == "h":
         delta_mapping["hours"] = int(match.group("number"))
     elif match.group("type") == "d":
@@ -244,7 +244,7 @@ def relative_date_parse_with_delta_mapping(
             parsed_dt = parsed_dt.replace(minute=0, second=0, microsecond=0)
         else:
             parsed_dt = parsed_dt.replace(hour=0, minute=0, second=0, microsecond=0)
-    return parsed_dt, delta_mapping
+    return parsed_dt, delta_mapping, match.group("position") or None
 
 
 def relative_date_parse(
diff --git a/posthog/views.py b/posthog/views.py
index 5e12d332f7b2ea..4750cf170cc278 100644
--- a/posthog/views.py
+++ b/posthog/views.py
@@ -116,12 +116,14 @@ def preflight_check(request: HttpRequest) -> JsonResponse:
         "object_storage": is_cloud() or is_object_storage_available(),
     }
 
+    if settings.DEBUG or settings.E2E_TESTING:
+        response["is_debug"] = True
+
     if request.user.is_authenticated:
         response = {
             **response,
             "available_timezones": get_available_timezones_with_offsets(),
             "opt_out_capture": os.environ.get("OPT_OUT_CAPTURE", False),
-            "is_debug": settings.DEBUG or settings.E2E_TESTING,
             "licensed_users_available": get_licensed_users_available() if not is_cloud() else None,
             "openai_available": bool(os.environ.get("OPENAI_API_KEY")),
             "site_url": settings.SITE_URL,
diff --git a/production-unit.Dockerfile b/production-unit.Dockerfile
index fb79f50912fb07..197cdbb2292230 100644
--- a/production-unit.Dockerfile
+++ b/production-unit.Dockerfile
@@ -136,7 +136,104 @@ RUN apt-get update && \
 #
 # ---------------------------------------------------------
 #
-FROM nginx/unit:1.28.0-python3.10
+# Build a version of the unit docker image for python3.10
+# We can remove this step once we are on python3.11
+FROM unit:python3.11 as unit
+FROM python:3.10-bullseye as unit-131-python-310
+
+# copied from https://github.com/nginx/unit/blob/master/pkg/docker/Dockerfile.python3.11
+LABEL org.opencontainers.image.title="Unit (python3.10)"
+LABEL org.opencontainers.image.description="Official build of Unit for Docker."
+LABEL org.opencontainers.image.url="https://unit.nginx.org"
+LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
+LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
+LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
+LABEL org.opencontainers.image.version="1.31.1"
+
+RUN set -ex \
+    && savedAptMark="$(apt-mark showmanual)" \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
+    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
+    && mkdir -p /usr/src/unit \
+    && cd /usr/src/unit \
+    && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \
+    && cd unit \
+    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
+    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
+    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
+    && CONFIGURE_ARGS_MODULES="--prefix=/usr \
+                --statedir=/var/lib/unit \
+                --control=unix:/var/run/control.unit.sock \
+                --runstatedir=/var/run \
+                --pid=/var/run/unit.pid \
+                --logdir=/var/log \
+                --log=/var/log/unit.log \
+                --tmpdir=/var/tmp \
+                --user=unit \
+                --group=unit \
+                --openssl \
+                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
+    && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
+                --njs" \
+    && make -j $NCPU -C pkg/contrib .njs \
+    && export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
+    && make -j $NCPU unitd \
+    && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
+    && make -j $NCPU unitd \
+    && install -pm755 build/sbin/unitd /usr/sbin/unitd \
+    && make clean \
+    && /bin/true \
+    && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
+    && ./configure python --config=/usr/local/bin/python3-config \
+    && make -j $NCPU python3-install \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
+    && ./configure python --config=/usr/local/bin/python3-config \
+    && make -j $NCPU python3-install \
+    && cd \
+    && rm -rf /usr/src/unit \
+    && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
+        ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
+       done \
+    && apt-mark showmanual | xargs apt-mark auto > /dev/null \
+    && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
+    && /bin/true \
+    && mkdir -p /var/lib/unit/ \
+    && mkdir -p /docker-entrypoint.d/ \
+    && groupadd --gid 998 unit \
+    && useradd \
+         --uid 998 \
+         --gid unit \
+         --no-create-home \
+         --home /nonexistent \
+         --comment "unit user" \
+         --shell /bin/false \
+         unit \
+    && apt-get update \
+    && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
+    && apt-get purge -y --auto-remove build-essential \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -f /requirements.apt \
+    && ln -sf /dev/stdout /var/log/unit.log
+
+COPY --from=unit /usr/local/bin/docker-entrypoint.sh /usr/local/bin/
+COPY --from=unit /usr/share/unit/welcome/welcome.* /usr/share/unit/welcome/
+
+STOPSIGNAL SIGTERM
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+EXPOSE 80
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
+
+#
+# ---------------------------------------------------------
+#
+FROM unit-131-python-310
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV PYTHONUNBUFFERED 1
diff --git a/production.Dockerfile b/production.Dockerfile
index b3d27e2861e51a..d147edb7da7b23 100644
--- a/production.Dockerfile
+++ b/production.Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 COPY package.json pnpm-lock.yaml ./
-RUN corepack enable && pnpm --version && \
+RUN corepack enable && \
     mkdir /tmp/pnpm-store && \
     pnpm install --frozen-lockfile --store-dir /tmp/pnpm-store --prod && \
     rm -rf /tmp/pnpm-store
@@ -37,6 +37,22 @@ COPY babel.config.js tsconfig.json webpack.config.js ./
 RUN pnpm build
 
 
+#
+# ---------------------------------------------------------
+#
+FROM node:18.12.1-bullseye-slim AS plugin-transpiler-build
+WORKDIR /code
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+COPY plugin-transpiler/ plugin-transpiler/
+WORKDIR /code/plugin-transpiler
+RUN corepack enable && \
+    mkdir /tmp/pnpm-store && \
+    pnpm install --frozen-lockfile --store-dir /tmp/pnpm-store && \
+    pnpm build && \
+    rm -rf /tmp/pnpm-store
+
+
 #
 # ---------------------------------------------------------
 #
diff --git a/test-runner-jest-environment.js b/test-runner-jest-environment.js
new file mode 100644
index 00000000000000..19351c30f90139
--- /dev/null
+++ b/test-runner-jest-environment.js
@@ -0,0 +1,27 @@
+const { setupPage } = require('@storybook/test-runner')
+const PlaywrightEnvironment = require('jest-playwright-preset/lib/PlaywrightEnvironment').default
+
+class CustomEnvironment extends PlaywrightEnvironment {
+    async setup() {
+        await super.setup()
+        await setupPage(this.global.page, this.global.context)
+    }
+
+    async teardown() {
+        await super.teardown()
+    }
+
+    async handleTestEvent(event) {
+        if (event.name === 'test_done' && event.test.errors.length > 0) {
+            // Take screenshots on test failures - these become Actions artifacts
+            const parentName = event.test.parent.parent.name.replace(/\W/g, '-').toLowerCase()
+            const specName = event.test.parent.name.replace(/\W/g, '-').toLowerCase()
+            await this.global.page.screenshot({
+                path: `frontend/__snapshots__/__failures__/${parentName}--${specName}.png`,
+            })
+        }
+        await super.handleTestEvent(event)
+    }
+}
+
+module.exports = CustomEnvironment
diff --git a/test-runner-jest.config.js b/test-runner-jest.config.js
index e3bfc94297b2f7..fd7b7a22e0744d 100644
--- a/test-runner-jest.config.js
+++ b/test-runner-jest.config.js
@@ -1,5 +1,8 @@
 const { getJestConfig } = require('@storybook/test-runner')
 
+/**
+ * @type {import('@jest/types').Config.InitialOptions}
+ */
 module.exports = {
     // The default configuration comes from @storybook/test-runner
     ...getJestConfig(),
@@ -7,7 +10,7 @@ module.exports = {
      * @see https://jestjs.io/docs/configuration
      */
     forceExit: true,
-    // Remove obsolete snapshots in CI
-    // See https://github.com/americanexpress/jest-image-snapshot#removing-outdated-snapshots
+    // For jest-image-snapshot, see https://github.com/americanexpress/jest-image-snapshot#removing-outdated-snapshots
     reporters: ['default', 'jest-image-snapshot/src/outdated-snapshot-reporter.js'],
+    testEnvironment: './test-runner-jest-environment.js',
 }
diff --git a/unit.json b/unit.json
index 34f66bff1ba8a8..3d80936e14fb11 100644
--- a/unit.json
+++ b/unit.json
@@ -2,15 +2,52 @@
     "listeners": {
         "*:8000": {
             "pass": "applications/posthog"
+        },
+        "*:8001": {
+            "pass": "routes/metrics"
+        },
+        "*:8081": {
+            "pass": "routes/status"
         }
     },
+    "routes": {
+        "metrics": [
+            {
+                "match": {
+                    "uri": ["/metrics"]
+                },
+                "action": {
+                    "pass": "applications/metrics"
+                }
+            }
+        ],
+        "status": [
+            {
+                "match": {
+                    "uri": ["/status"]
+                },
+                "action": {
+                    "proxy": "http://unix:/var/run/control.unit.sock"
+                }
+            }
+        ]
+    },
     "applications": {
         "posthog": {
             "type": "python 3.10",
             "processes": 1,
             "working_directory": "/code",
             "path": ".",
-            "module": "posthog.wsgi"
+            "module": "posthog.wsgi",
+            "user": "nobody"
+        },
+        "metrics": {
+            "type": "python 3.10",
+            "processes": 1,
+            "working_directory": "/code/bin",
+            "path": ".",
+            "module": "unit_metrics",
+            "user": "nobody"
         }
     }
 }