diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
index 3f13a10f1e6dc..a45caaf8aef18 100644
--- a/.github/actions/run-backend-tests/action.yml
+++ b/.github/actions/run-backend-tests/action.yml
@@ -145,7 +145,6 @@ runs:
           run: echo "PYTEST_ARGS=--snapshot-update" >> $GITHUB_ENV # We can only update snapshots within the PostHog org
 
         # Tests
-
         - name: Run FOSS tests
           if: ${{ inputs.segment == 'FOSS' }}
           env:
diff --git a/.github/workflows/container-images-cd.yml b/.github/workflows/container-images-cd.yml
index cc9afbb4b4bb8..f608b36d11d7a 100644
--- a/.github/workflows/container-images-cd.yml
+++ b/.github/workflows/container-images-cd.yml
@@ -33,11 +33,6 @@ jobs:
               with:
                   fetch-depth: 2
 
-            - name: Override git.py
-              run: >
-                  echo "def get_git_commit(): return '${GITHUB_SHA}'" > posthog/git.py
-                  echo "def get_git_branch(): return '${GITHUB_REF_NAME}'" >> posthog/git.py
-
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v2
 
@@ -97,6 +92,18 @@ jobs:
                         "context": ${{ toJson(github) }}
                       }
 
+            - name: Trigger PostHog Cloud deployment from Charts
+              uses: mvasigh/dispatch-action@main
+              with:
+                  token: ${{ steps.deployer.outputs.token }}
+                  repo: charts
+                  owner: PostHog
+                  event_type: posthog_deploy
+                  message: |
+                      {
+                        "image_tag": "${{ steps.build.outputs.digest }}"
+                      }
+
             - name: Check for changes in plugins directory
               id: check_changes_plugins
               run: |
diff --git a/.run/Celery.run.xml b/.run/Celery.run.xml
index 40853a2208f03..a3d60853762bd 100644
--- a/.run/Celery.run.xml
+++ b/.run/Celery.run.xml
@@ -5,12 +5,13 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="DEBUG" value="1" />
       <env name="CLICKHOUSE_SECURE" value="False" />
-      <env name="KAFKA_HOSTS" value="localhost" />
       <env name="DATABASE_URL" value="postgres://posthog:posthog@localhost:5432/posthog" />
+      <env name="DEBUG" value="1" />
+      <env name="KAFKA_HOSTS" value="localhost" />
+      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="SKIP_SERVICE_VERSION_REQUIREMENTS" value="1" />
+      <env name="REPLAY_EMBEDDINGS_ALLOWED_TEAM" value="1,2,3" />
     </envs>
     <option name="SDK_HOME" value="$PROJECT_DIR$/env/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/env/bin" />
diff --git a/bin/celery-queues.env b/bin/celery-queues.env
index ba4376ab93ca1..191de05c0a576 100644
--- a/bin/celery-queues.env
+++ b/bin/celery-queues.env
@@ -2,4 +2,4 @@
 # Important: Add new queues to make Celery consume tasks from them.
 
 # NOTE: Keep in sync with posthog/tasks/utils.py
-CELERY_WORKER_QUEUES=celery,stats,email,insight_export,insight_refresh,analytics_queries,exports,subscription_delivery,usage_reports
\ No newline at end of file
+CELERY_WORKER_QUEUES=celery,stats,email,insight_export,insight_refresh,analytics_queries,exports,subscription_delivery,usage_reports,session_replay_embeddings
diff --git a/cypress/e2e/billingv2.cy.ts b/cypress/e2e/billingv2.cy.ts
index 7074aed771e42..a591fb35084ea 100644
--- a/cypress/e2e/billingv2.cy.ts
+++ b/cypress/e2e/billingv2.cy.ts
@@ -18,10 +18,7 @@ describe('Billing', () => {
 
         cy.get('[data-attr=more-button]').first().click()
         cy.contains('.LemonButton', 'Unsubscribe').click()
-        cy.get('.LemonModal__content h3').should(
-            'contain',
-            'Why are you unsubscribing from Product analytics + data stack?'
-        )
+        cy.get('.LemonModal h3').should('contain', 'Why are you unsubscribing from Product analytics + data stack?')
         cy.get('[data-attr=unsubscribe-reason-survey-textarea]').type('Product analytics')
         cy.contains('.LemonModal .LemonButton', 'Unsubscribe').click()
 
@@ -45,17 +42,14 @@ describe('Billing', () => {
     it('Unsubscribe survey text area maintains unique state between product types', () => {
         cy.get('[data-attr=more-button]').first().click()
         cy.contains('.LemonButton', 'Unsubscribe').click()
-        cy.get('.LemonModal__content h3').should(
-            'contain',
-            'Why are you unsubscribing from Product analytics + data stack?'
-        )
+        cy.get('.LemonModal h3').should('contain', 'Why are you unsubscribing from Product analytics + data stack?')
 
         cy.get('[data-attr=unsubscribe-reason-survey-textarea]').type('Product analytics')
         cy.contains('.LemonModal .LemonButton', 'Cancel').click()
 
         cy.get('[data-attr=more-button]').eq(1).click()
         cy.contains('.LemonButton', 'Unsubscribe').click()
-        cy.get('.LemonModal__content h3').should('contain', 'Why are you unsubscribing from Session replay?')
+        cy.get('.LemonModal h3').should('contain', 'Why are you unsubscribing from Session replay?')
         cy.get('[data-attr=unsubscribe-reason-survey-textarea]').type('Session replay')
         cy.contains('.LemonModal .LemonButton', 'Cancel').click()
 
diff --git a/cypress/productAnalytics/index.ts b/cypress/productAnalytics/index.ts
index cf66883033a53..05f4edcd708f0 100644
--- a/cypress/productAnalytics/index.ts
+++ b/cypress/productAnalytics/index.ts
@@ -17,10 +17,10 @@ export const savedInsights = {
 }
 
 export function interceptInsightLoad(insightType: string): string {
-    cy.intercept('GET', /api\/projects\/\d+\/insights\/trend\/\?.*/).as('loadNewTrendsInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/funnel\/?/).as('loadNewFunnelInsight')
-    cy.intercept('GET', /api\/projects\/\d+\/insights\/retention\/\?.*/).as('loadNewRetentionInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/path\/?/).as('loadNewPathsInsight')
+    cy.intercept('POST', /api\/projects\/\d+\/insights\/trend\//).as('loadNewTrendsInsight')
+    cy.intercept('POST', /api\/projects\/\d+\/insights\/funnel\//).as('loadNewFunnelInsight')
+    cy.intercept('POST', /api\/projects\/\d+\/insights\/retention\//).as('loadNewRetentionInsight')
+    cy.intercept('POST', /api\/projects\/\d+\/insights\/path\//).as('loadNewPathsInsight')
     cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
 
     let networkInterceptAlias: string = ''
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index b2ce0bb71285c..6f99ed422be4c 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -23,8 +23,6 @@ beforeEach(() => {
     Cypress.env('POSTHOG_PROPERTY_CURRENT_TEST_FULL_TITLE', Cypress.currentTest.titlePath.join(' > '))
     Cypress.env('POSTHOG_PROPERTY_GITHUB_ACTION_RUN_URL', process.env.GITHUB_ACTION_RUN_URL)
 
-    cy.intercept('api/prompts/my_prompts/', { sequences: [], state: {} })
-
     cy.intercept('https://app.posthog.com/decide/*', (req) =>
         req.reply(
             decideResponse({
diff --git a/ee/api/billing.py b/ee/api/billing.py
index 08e0fc08a9719..2123ac0485b7f 100644
--- a/ee/api/billing.py
+++ b/ee/api/billing.py
@@ -7,7 +7,6 @@
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from rest_framework import serializers, status, viewsets
-from rest_framework.authentication import BasicAuthentication, SessionAuthentication
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError
 from rest_framework.request import Request
@@ -16,7 +15,7 @@
 from ee.billing.billing_manager import BillingManager, build_billing_token
 from ee.models import License
 from ee.settings import BILLING_SERVICE_URL
-from posthog.auth import PersonalAPIKeyAuthentication
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.cloud_utils import get_cached_instance_license
 from posthog.models import Organization
 
@@ -34,14 +33,9 @@ class LicenseKeySerializer(serializers.Serializer):
     license = serializers.CharField()
 
 
-class BillingViewset(viewsets.GenericViewSet):
+class BillingViewset(TeamAndOrgViewSetMixin, viewsets.GenericViewSet):
     serializer_class = BillingSerializer
-
-    authentication_classes = [
-        PersonalAPIKeyAuthentication,
-        SessionAuthentication,
-        BasicAuthentication,
-    ]
+    derive_current_team_from_user_only = True
 
     def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         license = get_cached_instance_license()
diff --git a/ee/api/dashboard_collaborator.py b/ee/api/dashboard_collaborator.py
index e9b339b921b0e..73f437e9bac2d 100644
--- a/ee/api/dashboard_collaborator.py
+++ b/ee/api/dashboard_collaborator.py
@@ -2,14 +2,13 @@
 
 from django.db import IntegrityError
 from rest_framework import exceptions, mixins, serializers, viewsets
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
 
 from ee.models.dashboard_privilege import DashboardPrivilege
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.models import Dashboard, User
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.user_permissions import UserPermissions, UserPermissionsSerializerMixin
 
 
@@ -83,17 +82,13 @@ def create(self, validated_data):
 
 
 class DashboardCollaboratorViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
     viewsets.GenericViewSet,
 ):
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-        CanEditDashboardCollaborator,
-    ]
+    permission_classes = [CanEditDashboardCollaborator]
     pagination_class = None
     queryset = DashboardPrivilege.objects.select_related("dashboard").filter(user__is_active=True)
     lookup_field = "user__uuid"
diff --git a/ee/api/explicit_team_member.py b/ee/api/explicit_team_member.py
index 4f45bbb9fc418..9355e7afccb38 100644
--- a/ee/api/explicit_team_member.py
+++ b/ee/api/explicit_team_member.py
@@ -6,7 +6,7 @@
 from rest_framework.permissions import IsAuthenticated
 
 from ee.models.explicit_team_membership import ExplicitTeamMembership
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.models.organization import OrganizationMembership
 from posthog.models.team import Team
@@ -101,8 +101,7 @@ def validate(self, attrs):
         return attrs
 
 
-class ExplicitTeamMemberViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
-    permission_classes = [IsAuthenticated, TeamMemberStrictManagementPermission]
+class ExplicitTeamMemberViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     pagination_class = None
     queryset = ExplicitTeamMembership.objects.filter(parent_membership__user__is_active=True).select_related(
         "team", "parent_membership", "parent_membership__user"
@@ -112,6 +111,8 @@ class ExplicitTeamMemberViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
     serializer_class = ExplicitTeamMemberSerializer
     include_in_docs = True
 
+    permission_classes = [IsAuthenticated, TeamMemberStrictManagementPermission]
+
     def get_permissions(self):
         if (
             self.action == "destroy"
@@ -120,7 +121,7 @@ def get_permissions(self):
         ):
             # Special case: allow already authenticated users to leave projects
             return []
-        return super().get_permissions()
+        return [permission() for permission in self.permission_classes]
 
     def get_object(self) -> ExplicitTeamMembership:
         queryset = self.filter_queryset(self.get_queryset())
diff --git a/ee/api/feature_flag_role_access.py b/ee/api/feature_flag_role_access.py
index 3ce77dca89599..a2e22f2007ecf 100644
--- a/ee/api/feature_flag_role_access.py
+++ b/ee/api/feature_flag_role_access.py
@@ -1,12 +1,12 @@
 from rest_framework import exceptions, mixins, serializers, viewsets
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 from ee.api.role import RoleSerializer
 from ee.models.feature_flag_role_access import FeatureFlagRoleAccess
 from ee.models.organization_resource_access import OrganizationResourceAccess
 from ee.models.role import Role
 from posthog.api.feature_flag import FeatureFlagSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import FeatureFlag
 from posthog.models.organization import OrganizationMembership
 
@@ -66,14 +66,14 @@ def create(self, validated_data):
 
 
 class FeatureFlagRoleAccessViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
     mixins.RetrieveModelMixin,
     viewsets.GenericViewSet,
 ):
-    permission_classes = [IsAuthenticated, FeatureFlagRoleAccessPermissions]
+    permission_classes = [FeatureFlagRoleAccessPermissions]
     serializer_class = FeatureFlagRoleAccessSerializer
     queryset = FeatureFlagRoleAccess.objects.select_related("feature_flag")
     filter_rewrite_rules = {"team_id": "feature_flag__team_id"}
diff --git a/ee/api/hooks.py b/ee/api/hooks.py
index 96eba47f14378..6f4444d017ba5 100644
--- a/ee/api/hooks.py
+++ b/ee/api/hooks.py
@@ -3,15 +3,10 @@
 
 from django.conf import settings
 from rest_framework import exceptions, serializers, viewsets
-from rest_framework.permissions import IsAuthenticated
 
 from ee.models.hook import Hook
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models.user import User
-from posthog.permissions import (
-    OrganizationMemberPermissions,
-    TeamMemberAccessPermission,
-)
 
 
 class HookSerializer(serializers.ModelSerializer):
@@ -31,18 +26,13 @@ def validate_target(self, target):
         return target
 
 
-class HookViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class HookViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Retrieve, create, update or destroy REST hooks.
     """
 
     queryset = Hook.objects.all()
     ordering = "-created_at"
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        TeamMemberAccessPermission,
-    ]
     serializer_class = HookSerializer
 
     def perform_create(self, serializer):
diff --git a/ee/api/organization_resource_access.py b/ee/api/organization_resource_access.py
index 618e59475a0be..77c71f6f5de64 100644
--- a/ee/api/organization_resource_access.py
+++ b/ee/api/organization_resource_access.py
@@ -1,10 +1,8 @@
 from rest_framework import mixins, serializers, viewsets
-from rest_framework.permissions import IsAuthenticated
 
 from ee.api.role import RolePermissions
 from ee.models.organization_resource_access import OrganizationResourceAccess
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.permissions import OrganizationMemberPermissions
+from posthog.api.routing import TeamAndOrgViewSetMixin
 
 
 class OrganizationResourceAccessSerializer(serializers.ModelSerializer):
@@ -35,7 +33,7 @@ def create(self, validated_data):
 
 
 class OrganizationResourceAccessViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.RetrieveModelMixin,
     mixins.CreateModelMixin,
@@ -43,10 +41,6 @@ class OrganizationResourceAccessViewSet(
     mixins.DestroyModelMixin,
     viewsets.GenericViewSet,
 ):
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        RolePermissions,
-    ]
+    permission_classes = [RolePermissions]
     serializer_class = OrganizationResourceAccessSerializer
     queryset = OrganizationResourceAccess.objects.all()
diff --git a/ee/api/role.py b/ee/api/role.py
index 7e7c8714c537e..66f89133a8e68 100644
--- a/ee/api/role.py
+++ b/ee/api/role.py
@@ -2,17 +2,16 @@
 
 from django.db import IntegrityError
 from rest_framework import mixins, serializers, viewsets
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 from ee.models.feature_flag_role_access import FeatureFlagRoleAccess
 from ee.models.organization_resource_access import OrganizationResourceAccess
 from ee.models.role import Role, RoleMembership
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.models import OrganizationMembership
 from posthog.models.feature_flag import FeatureFlag
 from posthog.models.user import User
-from posthog.permissions import OrganizationMemberPermissions
 
 
 class RolePermissions(BasePermission):
@@ -86,7 +85,7 @@ def get_associated_flags(self, role: Role):
 
 
 class RoleViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.CreateModelMixin,
     mixins.RetrieveModelMixin,
@@ -94,11 +93,7 @@ class RoleViewSet(
     mixins.DestroyModelMixin,
     viewsets.GenericViewSet,
 ):
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        RolePermissions,
-    ]
+    permission_classes = [RolePermissions]
     serializer_class = RoleSerializer
     queryset = Role.objects.all()
 
@@ -132,16 +127,13 @@ def create(self, validated_data):
 
 
 class RoleMembershipViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
     viewsets.GenericViewSet,
 ):
-    permission_classes = [
-        IsAuthenticated,
-        RolePermissions,
-    ]
+    permission_classes = [RolePermissions]
     serializer_class = RoleMembershipSerializer
     queryset = RoleMembership.objects.select_related("role")
     filter_rewrite_rules = {"organization_id": "role__organization_id"}
diff --git a/ee/api/subscription.py b/ee/api/subscription.py
index 416371e45babe..35918914ea0e4 100644
--- a/ee/api/subscription.py
+++ b/ee/api/subscription.py
@@ -4,21 +4,15 @@
 from django.db.models import QuerySet
 from django.http import HttpRequest, JsonResponse
 from rest_framework import serializers, viewsets
-from rest_framework.authentication import BasicAuthentication, SessionAuthentication
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 
 from ee.tasks import subscriptions
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
-from posthog.auth import PersonalAPIKeyAuthentication
 from posthog.constants import AvailableFeature
 from posthog.models.subscription import Subscription, unsubscribe_using_token
-from posthog.permissions import (
-    PremiumFeaturePermission,
-    TeamMemberAccessPermission,
-)
+from posthog.permissions import PremiumFeaturePermission
 from posthog.utils import str_to_bool
 
 
@@ -95,20 +89,10 @@ def update(self, instance: Subscription, validated_data: dict, *args: Any, **kwa
         return instance
 
 
-class SubscriptionViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class SubscriptionViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     queryset = Subscription.objects.all()
     serializer_class = SubscriptionSerializer
-
-    authentication_classes = [
-        PersonalAPIKeyAuthentication,
-        SessionAuthentication,
-        BasicAuthentication,
-    ]
-    permission_classes = [
-        IsAuthenticated,
-        PremiumFeaturePermission,
-        TeamMemberAccessPermission,
-    ]
+    permission_classes = [PremiumFeaturePermission]
     premium_feature = AvailableFeature.SUBSCRIPTIONS
 
     def get_queryset(self) -> QuerySet:
diff --git a/ee/clickhouse/materialized_columns/analyze.py b/ee/clickhouse/materialized_columns/analyze.py
index e234935846843..6fc3c75036506 100644
--- a/ee/clickhouse/materialized_columns/analyze.py
+++ b/ee/clickhouse/materialized_columns/analyze.py
@@ -160,7 +160,7 @@ def _analyze(since_hours_ago: int, min_query_time: int) -> List[Suggestion]:
     and JSONExtractString(log_comment, 'kind') != 'celery'
     and JSONExtractInt(log_comment, 'team_id') != 0
     and query not like '%person_distinct_id2%' -- Old style person properties that are joined, no need to optimize those queries
-    and column not like 'argMax(%'  -- Old style person properties that are joined, no need to optimize those queries
+    and column IN ('properties', 'person_properties', 'group0_properties', 'group1_properties', 'group2_properties', 'group3_properties', 'group4_properties')
     and read_bytes > min_bytes_read
     and (exception_code IN exception_codes OR query_duration_ms > slow_query_minimum)
     and read_rows > min_read_rows
diff --git a/ee/clickhouse/materialized_columns/test/test_analyze.py b/ee/clickhouse/materialized_columns/test/test_analyze.py
index 92706a256a7b7..443cadce7555b 100644
--- a/ee/clickhouse/materialized_columns/test/test_analyze.py
+++ b/ee/clickhouse/materialized_columns/test/test_analyze.py
@@ -18,6 +18,7 @@ def test_mat_columns(self, patch_backfill, patch_materialize):
             "SELECT * FROM events WHERE JSONExtractRaw(properties, \\'materialize_me2\\')",
             "SELECT * FROM events WHERE JSONExtractRaw(`e`.properties, \\'materialize_me3\\')",
             "SELECT * FROM events WHERE JSONExtractRaw(person_properties, \\'materialize_person_prop\\')",
+            "SELECT * FROM groups WHERE JSONExtractRaw(group.group_properties, \\'materialize_person_prop\\')",  # this should not appear
         ]
 
         for query in queries_to_insert:
diff --git a/ee/clickhouse/views/experiments.py b/ee/clickhouse/views/experiments.py
index 4bf181410df1d..05a73c4874ff8 100644
--- a/ee/clickhouse/views/experiments.py
+++ b/ee/clickhouse/views/experiments.py
@@ -4,7 +4,6 @@
 from rest_framework import serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 from statshog.defaults.django import statsd
@@ -20,17 +19,14 @@
 )
 from ee.clickhouse.queries.experiments.utils import requires_flag_warning
 from posthog.api.feature_flag import FeatureFlagSerializer, MinimalFeatureFlagSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.caching.insight_cache import update_cached_state
 from posthog.clickhouse.query_tagging import tag_queries
 from posthog.constants import INSIGHT_TRENDS, AvailableFeature
 from posthog.models.experiment import Experiment
 from posthog.models.filters.filter import Filter
-from posthog.permissions import (
-    PremiumFeaturePermission,
-    TeamMemberAccessPermission,
-)
+from posthog.permissions import PremiumFeaturePermission
 from posthog.utils import generate_cache_key, get_safe_cache
 
 EXPERIMENT_RESULTS_CACHE_DEFAULT_TTL = 60 * 30  # 30 minutes
@@ -285,14 +281,10 @@ def update(self, instance: Experiment, validated_data: dict, *args: Any, **kwarg
             return super().update(instance, validated_data)
 
 
-class ClickhouseExperimentsViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ClickhouseExperimentsViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     serializer_class = ExperimentSerializer
     queryset = Experiment.objects.all()
-    permission_classes = [
-        IsAuthenticated,
-        PremiumFeaturePermission,
-        TeamMemberAccessPermission,
-    ]
+    permission_classes = [PremiumFeaturePermission]
     premium_feature = AvailableFeature.EXPERIMENTATION
     ordering = "-created_at"
 
diff --git a/ee/clickhouse/views/groups.py b/ee/clickhouse/views/groups.py
index 502ada5852f7b..2483a69d6ad41 100644
--- a/ee/clickhouse/views/groups.py
+++ b/ee/clickhouse/views/groups.py
@@ -8,20 +8,14 @@
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound, ValidationError
 from rest_framework.pagination import CursorPagination
-from rest_framework.permissions import IsAuthenticated
 
 from ee.clickhouse.queries.related_actors_query import RelatedActorsQuery
 from posthog.api.documentation import extend_schema
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.auth import SharingAccessTokenAuthentication
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.clickhouse.kafka_engine import trim_quotes_expr
 from posthog.client import sync_execute
 from posthog.models.group import Group
 from posthog.models.group_type_mapping import GroupTypeMapping
-from posthog.permissions import (
-    SharingTokenPermission,
-    TeamMemberAccessPermission,
-)
 
 
 class GroupTypeSerializer(serializers.ModelSerializer):
@@ -31,22 +25,12 @@ class Meta:
         read_only_fields = ["group_type", "group_type_index"]
 
 
-class ClickhouseGroupsTypesView(StructuredViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
+class ClickhouseGroupsTypesView(TeamAndOrgViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = GroupTypeSerializer
     queryset = GroupTypeMapping.objects.all().order_by("group_type_index")
     pagination_class = None
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
-
     sharing_enabled_actions = ["list"]
 
-    def get_permissions(self):
-        if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication):
-            return [SharingTokenPermission()]
-        return super().get_permissions()
-
-    def get_authenticators(self):
-        return [SharingAccessTokenAuthentication(), *super().get_authenticators()]
-
     @action(detail=False, methods=["PATCH"], name="Update group types metadata")
     def update_metadata(self, request: request.Request, *args, **kwargs):
         for row in cast(List[Dict], request.data):
@@ -69,11 +53,10 @@ class Meta:
         fields = ["group_type_index", "group_key", "group_properties", "created_at"]
 
 
-class ClickhouseGroupsView(StructuredViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
+class ClickhouseGroupsView(TeamAndOrgViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = GroupSerializer
     queryset = Group.objects.all()
     pagination_class = GroupCursorPagination
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
 
     def get_queryset(self):
         return (
diff --git a/ee/clickhouse/views/insights.py b/ee/clickhouse/views/insights.py
index 8a284055229f0..ff772b71aaef8 100644
--- a/ee/clickhouse/views/insights.py
+++ b/ee/clickhouse/views/insights.py
@@ -27,8 +27,7 @@ def has_object_permission(self, request: Request, view, insight: Insight) -> boo
 
 
 class ClickhouseInsightsViewSet(InsightViewSet):
-    permission_classes = [*InsightViewSet.permission_classes, CanEditInsight]
-
+    permission_classes = [CanEditInsight]
     retention_query_class = ClickhouseRetention
     stickiness_query_class = ClickhouseStickiness
     paths_query_class = ClickhousePaths
diff --git a/ee/clickhouse/views/person.py b/ee/clickhouse/views/person.py
index cbcd536126b55..d01dba65da928 100644
--- a/ee/clickhouse/views/person.py
+++ b/ee/clickhouse/views/person.py
@@ -62,4 +62,4 @@ def calculate_funnel_correlation_persons(
 
 
 class LegacyEnterprisePersonViewSet(EnterprisePersonViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
index ce4c16033902c..8fc6f83c16cdd 100644
--- a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
+++ b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
@@ -1,7 +1,7 @@
 # serializer version: 1
 # name: ClickhouseTestExperimentSecondaryResults.test_basic_secondary_metric_results
   '''
-  /* user_id:127 celery:posthog.tasks.tasks.sync_insight_caching_state */
+  /* user_id:124 celery:posthog.tasks.tasks.sync_insight_caching_state */
   SELECT team_id,
          date_diff('second', max(timestamp), now()) AS age
   FROM events
diff --git a/ee/clickhouse/views/test/test_clickhouse_groups.py b/ee/clickhouse/views/test/test_clickhouse_groups.py
index 1b3687c0fec61..10e064095c421 100644
--- a/ee/clickhouse/views/test/test_clickhouse_groups.py
+++ b/ee/clickhouse/views/test/test_clickhouse_groups.py
@@ -434,6 +434,26 @@ def test_cannot_list_group_types_of_another_org(self):
             self.permission_denied_response("You don't have access to the project."),
         )
 
+    def test_cannot_list_group_types_of_another_org_with_sharing_token(self):
+        sharing_configuration = SharingConfiguration.objects.create(team=self.team, enabled=True)
+
+        other_org = Organization.objects.create(name="other org")
+        other_team = Team.objects.create(organization=other_org, name="other project")
+
+        GroupTypeMapping.objects.create(team=other_team, group_type="organization", group_type_index=0)
+        GroupTypeMapping.objects.create(team=other_team, group_type="playlist", group_type_index=1)
+        GroupTypeMapping.objects.create(team=other_team, group_type="another", group_type_index=2)
+
+        response = self.client.get(
+            f"/api/projects/{other_team.id}/groups_types/?sharing_access_token={sharing_configuration.access_token}"
+        )
+
+        self.assertEqual(response.status_code, 403, response.json())
+        self.assertEqual(
+            response.json(),
+            self.permission_denied_response("You do not have permission to perform this action."),
+        )
+
     def test_can_list_group_types_of_another_org_with_sharing_access_token(self):
         other_org = Organization.objects.create(name="other org")
         other_team = Team.objects.create(organization=other_org, name="other project")
diff --git a/ee/session_recordings/ai/__init__.py b/ee/session_recordings/ai/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ee/session_recordings/ai/generate_embeddings.py b/ee/session_recordings/ai/generate_embeddings.py
new file mode 100644
index 0000000000000..5837b9d5f7cc3
--- /dev/null
+++ b/ee/session_recordings/ai/generate_embeddings.py
@@ -0,0 +1,192 @@
+from openai import OpenAI
+
+from typing import Dict, Any, List
+
+from prometheus_client import Histogram, Counter
+
+from posthog.models import Team
+
+from posthog.session_recordings.queries.session_replay_events import SessionReplayEvents
+from ee.session_recordings.ai.utils import (
+    SessionSummaryPromptData,
+    reduce_elements_chain,
+    simplify_window_id,
+    format_dates,
+    collapse_sequence_of_events,
+)
+from structlog import get_logger
+from posthog.clickhouse.client import sync_execute
+import datetime
+import pytz
+
+GENERATE_RECORDING_EMBEDDING_TIMING = Histogram(
+    "posthog_session_recordings_generate_recording_embedding",
+    "Time spent generating recording embeddings for a single session",
+)
+SESSION_SKIPPED_WHEN_GENERATING_EMBEDDINGS = Counter(
+    "posthog_session_recordings_skipped_when_generating_embeddings",
+    "Number of sessions skipped when generating embeddings",
+)
+SESSION_EMBEDDINGS_GENERATED = Counter(
+    "posthog_session_recordings_embeddings_generated",
+    "Number of session embeddings generated",
+)
+SESSION_EMBEDDINGS_WRITTEN_TO_CLICKHOUSE = Counter(
+    "posthog_session_recordings_embeddings_written_to_clickhouse",
+    "Number of session embeddings written to Clickhouse",
+)
+
+logger = get_logger(__name__)
+
+# TODO move these to settings
+BATCH_FLUSH_SIZE = 10
+MIN_DURATION_INCLUDE_SECONDS = 120
+
+
+def fetch_recordings_without_embeddings(team: Team | int, offset=0) -> List[str]:
+    if isinstance(team, int):
+        team = Team.objects.get(id=team)
+
+    query = """
+            WITH embedding_ids AS
+            (
+                SELECT
+                    session_id
+                from
+                    session_replay_embeddings
+                where
+                    team_id = %(team_id)s
+                    -- don't load all data for all time
+                    and generation_timestamp > now() - INTERVAL 7 DAY
+            )
+            SELECT session_id
+            FROM
+                session_replay_events
+            WHERE
+                session_id NOT IN embedding_ids
+                AND team_id = %(team_id)s
+                -- must be a completed session
+                and min_first_timestamp < now() - INTERVAL 1 DAY
+                -- let's not load all data for all time
+                -- will definitely need to do something about this length of time
+                and min_first_timestamp > now() - INTERVAL 7 DAY
+            GROUP BY session_id
+            HAVING dateDiff('second', min(min_first_timestamp), max(max_last_timestamp)) > %(min_duration_include_seconds)s
+            LIMIT %(batch_flush_size)s
+            -- when running locally the offset is used for paging
+            -- when running in celery the offset is not used
+            OFFSET %(offset)s
+        """
+
+    return [
+        x[0]
+        for x in sync_execute(
+            query,
+            {
+                "team_id": team.pk,
+                "batch_flush_size": BATCH_FLUSH_SIZE,
+                "offset": offset,
+                "min_duration_include_seconds": MIN_DURATION_INCLUDE_SECONDS,
+            },
+        )
+    ]
+
+
+def embed_batch_of_recordings(recordings: List[str], team: Team | int) -> None:
+    if isinstance(team, int):
+        team = Team.objects.get(id=team)
+
+    logger.info(f"processing {len(recordings)} recordings to embed for team {team.pk}")
+
+    while len(recordings) > 0:
+        batched_embeddings = []
+        for session_id in recordings:
+            with GENERATE_RECORDING_EMBEDDING_TIMING.time():
+                embeddings = generate_recording_embeddings(session_id=session_id, team=team)
+
+            if embeddings:
+                SESSION_EMBEDDINGS_GENERATED.inc()
+                batched_embeddings.append(
+                    {
+                        "session_id": session_id,
+                        "team_id": team.pk,
+                        "embeddings": embeddings,
+                    }
+                )
+
+        if len(batched_embeddings) > 0:
+            flush_embeddings_to_clickhouse(embeddings=batched_embeddings)
+
+
+def flush_embeddings_to_clickhouse(embeddings: List[Dict[str, Any]]) -> None:
+    sync_execute("INSERT INTO session_replay_embeddings (session_id, team_id, embeddings) VALUES", embeddings)
+    SESSION_EMBEDDINGS_WRITTEN_TO_CLICKHOUSE.inc(len(embeddings))
+
+
+def generate_recording_embeddings(session_id: str, team: Team | int) -> List[float] | None:
+    if isinstance(team, int):
+        team = Team.objects.get(id=team)
+
+    client = OpenAI()
+
+    session_metadata = SessionReplayEvents().get_metadata(session_id=str(session_id), team=team)
+    if not session_metadata:
+        logger.error(f"no session metadata found for session_id {session_id}")
+        SESSION_SKIPPED_WHEN_GENERATING_EMBEDDINGS.inc()
+        return None
+
+    session_events = SessionReplayEvents().get_events(
+        session_id=str(session_id),
+        team=team,
+        metadata=session_metadata,
+        events_to_ignore=[
+            "$feature_flag_called",
+        ],
+    )
+
+    if not session_events or not session_events[0] or not session_events[1]:
+        logger.error(f"no events found for session_id {session_id}")
+        SESSION_SKIPPED_WHEN_GENERATING_EMBEDDINGS.inc()
+        return None
+
+    processed_sessions = collapse_sequence_of_events(
+        format_dates(
+            reduce_elements_chain(
+                simplify_window_id(SessionSummaryPromptData(columns=session_events[0], results=session_events[1]))
+            ),
+            start=datetime.datetime(1970, 1, 1, tzinfo=pytz.UTC),  # epoch timestamp
+        )
+    )
+
+    processed_sessions_index = processed_sessions.column_index("event")
+    current_url_index = processed_sessions.column_index("$current_url")
+    elements_chain_index = processed_sessions.column_index("elements_chain")
+
+    input = (
+        str(session_metadata)
+        + "\n"
+        + "\n".join(
+            compact_result(
+                event_name=result[processed_sessions_index] if processed_sessions_index is not None else "",
+                current_url=result[current_url_index] if current_url_index is not None else "",
+                elements_chain=result[elements_chain_index] if elements_chain_index is not None else "",
+            )
+            for result in processed_sessions.results
+        )
+    )
+
+    embeddings = (
+        client.embeddings.create(
+            input=input,
+            model="text-embedding-3-small",
+        )
+        .data[0]
+        .embedding
+    )
+
+    return embeddings
+
+
+def compact_result(event_name: str, current_url: int, elements_chain: Dict[str, str] | str) -> str:
+    elements_string = elements_chain if isinstance(elements_chain, str) else ", ".join(str(e) for e in elements_chain)
+    return f"{event_name} {current_url} {elements_string}"
diff --git a/posthog/session_recordings/session_summary/summarize_session.py b/ee/session_recordings/ai/utils.py
similarity index 60%
rename from posthog/session_recordings/session_summary/summarize_session.py
rename to ee/session_recordings/ai/utils.py
index 85e0891ccde52..cbdab8eeb97f7 100644
--- a/posthog/session_recordings/session_summary/summarize_session.py
+++ b/ee/session_recordings/ai/utils.py
@@ -3,46 +3,7 @@
 
 from typing import List, Dict, Any
 
-import openai
-
-from prometheus_client import Histogram
-
-from posthog.api.activity_log import ServerTimingsGathered
-from posthog.models import User, Team
 from posthog.models.element import chain_to_elements
-from posthog.session_recordings.models.session_recording import SessionRecording
-
-from posthog.session_recordings.queries.session_replay_events import SessionReplayEvents
-
-from posthog.utils import get_instance_region
-
-TOKENS_IN_PROMPT_HISTOGRAM = Histogram(
-    "posthog_session_summary_tokens_in_prompt_histogram",
-    "histogram of the number of tokens in the prompt used to generate a session summary",
-    buckets=[
-        0,
-        10,
-        50,
-        100,
-        500,
-        1000,
-        2000,
-        3000,
-        4000,
-        5000,
-        6000,
-        7000,
-        8000,
-        10000,
-        20000,
-        30000,
-        40000,
-        50000,
-        100000,
-        128000,
-        float("inf"),
-    ],
-)
 
 
 @dataclasses.dataclass
@@ -243,102 +204,3 @@ def collapse_sequence_of_events(session_events: SessionSummaryPromptData) -> Ses
             collapsed_results.append(result)
 
     return dataclasses.replace(session_events, results=collapsed_results)
-
-
-def summarize_recording(recording: SessionRecording, user: User, team: Team):
-    timer = ServerTimingsGathered()
-
-    with timer("get_metadata"):
-        session_metadata = SessionReplayEvents().get_metadata(session_id=str(recording.session_id), team=team)
-        if not session_metadata:
-            raise ValueError(f"no session metadata found for session_id {recording.session_id}")
-
-    with timer("get_events"):
-        session_events = SessionReplayEvents().get_events(
-            session_id=str(recording.session_id),
-            team=team,
-            metadata=session_metadata,
-            events_to_ignore=[
-                "$feature_flag_called",
-            ],
-        )
-        if not session_events or not session_events[0] or not session_events[1]:
-            raise ValueError(f"no events found for session_id {recording.session_id}")
-
-    # convert session_metadata to a Dict from a TypedDict
-    # so that we can amend its values freely
-    session_metadata_dict = dict(session_metadata)
-
-    del session_metadata_dict["distinct_id"]
-    start_time = session_metadata["start_time"]
-    session_metadata_dict["start_time"] = start_time.isoformat()
-    session_metadata_dict["end_time"] = session_metadata["end_time"].isoformat()
-
-    with timer("generate_prompt"):
-        prompt_data = deduplicate_urls(
-            collapse_sequence_of_events(
-                format_dates(
-                    reduce_elements_chain(
-                        simplify_window_id(
-                            SessionSummaryPromptData(columns=session_events[0], results=session_events[1])
-                        )
-                    ),
-                    start=start_time,
-                )
-            )
-        )
-
-    instance_region = get_instance_region() or "HOBBY"
-
-    with timer("openai_completion"):
-        result = openai.chat.completions.create(
-            # model="gpt-4-1106-preview",  # allows 128k tokens
-            model="gpt-4",  # allows 8k tokens
-            temperature=0.7,
-            messages=[
-                {
-                    "role": "system",
-                    "content": """
-            Session Replay is PostHog's tool to record visits to web sites and apps.
-            We also gather events that occur like mouse clicks and key presses.
-            You write two or three sentence concise and simple summaries of those sessions based on a prompt.
-            You are more likely to mention errors or things that look like business success such as checkout events.
-            You don't help with other knowledge.""",
-                },
-                {
-                    "role": "user",
-                    "content": f"""the session metadata I have is {session_metadata_dict}.
-            it gives an overview of activity and duration""",
-                },
-                {
-                    "role": "user",
-                    "content": f"""
-            URLs associated with the events can be found in this mapping {prompt_data.url_mapping}.
-            """,
-                },
-                {
-                    "role": "user",
-                    "content": f"""the session events I have are {prompt_data.results}.
-            with columns {prompt_data.columns}.
-            they give an idea of what happened and when,
-            if present the elements_chain extracted from the html can aid in understanding
-            but should not be directly used in your response""",
-                },
-                {
-                    "role": "user",
-                    "content": """
-            generate a two or three sentence summary of the session.
-            use as concise and simple language as is possible.
-            assume a reading age of around 12 years old.
-            generate no text other than the summary.""",
-                },
-            ],
-            user=f"{instance_region}/{user.pk}",  # allows 8k tokens
-        )
-
-        usage = result.usage.prompt_tokens if result.usage else None
-        if usage:
-            TOKENS_IN_PROMPT_HISTOGRAM.observe(usage)
-
-    content: str = result.choices[0].message.content or ""
-    return {"content": content, "timings": timer.get_all_timings()}
diff --git a/ee/session_recordings/session_recording_playlist.py b/ee/session_recordings/session_recording_playlist.py
index 5b179c66dd178..5a7b2838cfff1 100644
--- a/ee/session_recordings/session_recording_playlist.py
+++ b/ee/session_recordings/session_recording_playlist.py
@@ -8,10 +8,9 @@
 from rest_framework import request, response, serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.permissions import IsAuthenticated
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.constants import SESSION_RECORDINGS_FILTER_IDS, AvailableFeature
 from posthog.models import (
@@ -30,9 +29,6 @@
 from posthog.models.filters.session_recordings_filter import SessionRecordingsFilter
 from posthog.models.team.team import check_is_feature_available_for_team
 from posthog.models.utils import UUIDT
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from posthog.rate_limit import (
     ClickHouseBurstRateThrottle,
     ClickHouseSustainedRateThrottle,
@@ -166,10 +162,9 @@ def _check_can_create_playlist(self, team: Team) -> bool:
         return True
 
 
-class SessionRecordingPlaylistViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class SessionRecordingPlaylistViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     queryset = SessionRecordingPlaylist.objects.all()
     serializer_class = SessionRecordingPlaylistSerializer
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     throttle_classes = [ClickHouseBurstRateThrottle, ClickHouseSustainedRateThrottle]
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ["short_id", "created_by"]
diff --git a/ee/session_recordings/session_summary/__init__.py b/ee/session_recordings/session_summary/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ee/session_recordings/session_summary/summarize_session.py b/ee/session_recordings/session_summary/summarize_session.py
new file mode 100644
index 0000000000000..26541f0a4fd09
--- /dev/null
+++ b/ee/session_recordings/session_summary/summarize_session.py
@@ -0,0 +1,147 @@
+import openai
+
+from prometheus_client import Histogram
+
+from posthog.api.activity_log import ServerTimingsGathered
+from posthog.models import User, Team
+from posthog.session_recordings.models.session_recording import SessionRecording
+
+from posthog.session_recordings.queries.session_replay_events import SessionReplayEvents
+
+from posthog.utils import get_instance_region
+
+from ee.session_recordings.ai.utils import (
+    SessionSummaryPromptData,
+    reduce_elements_chain,
+    simplify_window_id,
+    deduplicate_urls,
+    format_dates,
+    collapse_sequence_of_events,
+)
+
+TOKENS_IN_PROMPT_HISTOGRAM = Histogram(
+    "posthog_session_summary_tokens_in_prompt_histogram",
+    "histogram of the number of tokens in the prompt used to generate a session summary",
+    buckets=[
+        0,
+        10,
+        50,
+        100,
+        500,
+        1000,
+        2000,
+        3000,
+        4000,
+        5000,
+        6000,
+        7000,
+        8000,
+        10000,
+        20000,
+        30000,
+        40000,
+        50000,
+        100000,
+        128000,
+        float("inf"),
+    ],
+)
+
+
+def summarize_recording(recording: SessionRecording, user: User, team: Team):
+    timer = ServerTimingsGathered()
+
+    with timer("get_metadata"):
+        session_metadata = SessionReplayEvents().get_metadata(session_id=str(recording.session_id), team=team)
+        if not session_metadata:
+            raise ValueError(f"no session metadata found for session_id {recording.session_id}")
+
+    with timer("get_events"):
+        session_events = SessionReplayEvents().get_events(
+            session_id=str(recording.session_id),
+            team=team,
+            metadata=session_metadata,
+            events_to_ignore=[
+                "$feature_flag_called",
+            ],
+        )
+        if not session_events or not session_events[0] or not session_events[1]:
+            raise ValueError(f"no events found for session_id {recording.session_id}")
+
+    # convert session_metadata to a Dict from a TypedDict
+    # so that we can amend its values freely
+    session_metadata_dict = dict(session_metadata)
+
+    del session_metadata_dict["distinct_id"]
+    start_time = session_metadata["start_time"]
+    session_metadata_dict["start_time"] = start_time.isoformat()
+    session_metadata_dict["end_time"] = session_metadata["end_time"].isoformat()
+
+    with timer("generate_prompt"):
+        prompt_data = deduplicate_urls(
+            collapse_sequence_of_events(
+                format_dates(
+                    reduce_elements_chain(
+                        simplify_window_id(
+                            SessionSummaryPromptData(columns=session_events[0], results=session_events[1])
+                        )
+                    ),
+                    start=start_time,
+                )
+            )
+        )
+
+    instance_region = get_instance_region() or "HOBBY"
+
+    with timer("openai_completion"):
+        result = openai.chat.completions.create(
+            # model="gpt-4-1106-preview",  # allows 128k tokens
+            model="gpt-4",  # allows 8k tokens
+            temperature=0.7,
+            messages=[
+                {
+                    "role": "system",
+                    "content": """
+            Session Replay is PostHog's tool to record visits to web sites and apps.
+            We also gather events that occur like mouse clicks and key presses.
+            You write two or three sentence concise and simple summaries of those sessions based on a prompt.
+            You are more likely to mention errors or things that look like business success such as checkout events.
+            You don't help with other knowledge.""",
+                },
+                {
+                    "role": "user",
+                    "content": f"""the session metadata I have is {session_metadata_dict}.
+            it gives an overview of activity and duration""",
+                },
+                {
+                    "role": "user",
+                    "content": f"""
+            URLs associated with the events can be found in this mapping {prompt_data.url_mapping}.
+            """,
+                },
+                {
+                    "role": "user",
+                    "content": f"""the session events I have are {prompt_data.results}.
+            with columns {prompt_data.columns}.
+            they give an idea of what happened and when,
+            if present the elements_chain extracted from the html can aid in understanding
+            but should not be directly used in your response""",
+                },
+                {
+                    "role": "user",
+                    "content": """
+            generate a two or three sentence summary of the session.
+            use as concise and simple language as is possible.
+            assume a reading age of around 12 years old.
+            generate no text other than the summary.""",
+                },
+            ],
+            user=f"{instance_region}/{user.pk}",  # allows 8k tokens
+        )
+
+        usage = result.usage.prompt_tokens if result.usage else None
+        if usage:
+            TOKENS_IN_PROMPT_HISTOGRAM.observe(usage)
+
+    content: str = result.choices[0].message.content or ""
+    return {"content": content, "timings": timer.get_all_timings()}
diff --git a/ee/session_recordings/session_summary/test/__init__.py b/ee/session_recordings/session_summary/test/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/posthog/session_recordings/session_summary/test/test_summarize_session.py b/ee/session_recordings/session_summary/test/test_summarize_session.py
similarity index 98%
rename from posthog/session_recordings/session_summary/test/test_summarize_session.py
rename to ee/session_recordings/session_summary/test/test_summarize_session.py
index 266e19ef19c19..69412608dd3b9 100644
--- a/posthog/session_recordings/session_summary/test/test_summarize_session.py
+++ b/ee/session_recordings/session_summary/test/test_summarize_session.py
@@ -2,7 +2,7 @@
 
 from dateutil.parser import isoparse
 
-from posthog.session_recordings.session_summary.summarize_session import (
+from ee.session_recordings.session_summary.summarize_session import (
     format_dates,
     simplify_window_id,
     deduplicate_urls,
diff --git a/ee/settings.py b/ee/settings.py
index 334709c6414d0..903ddf6c3c7ad 100644
--- a/ee/settings.py
+++ b/ee/settings.py
@@ -61,7 +61,7 @@
 # How big of a timeframe to backfill when materializing event properties. 0 for no backfilling
 MATERIALIZE_COLUMNS_BACKFILL_PERIOD_DAYS = get_from_env("MATERIALIZE_COLUMNS_BACKFILL_PERIOD_DAYS", 90, type_cast=int)
 # Maximum number of columns to materialize at once. Avoids running into resource bottlenecks (storage + ingest + backfilling).
-MATERIALIZE_COLUMNS_MAX_AT_ONCE = get_from_env("MATERIALIZE_COLUMNS_MAX_AT_ONCE", 10, type_cast=int)
+MATERIALIZE_COLUMNS_MAX_AT_ONCE = get_from_env("MATERIALIZE_COLUMNS_MAX_AT_ONCE", 100, type_cast=int)
 
 BILLING_SERVICE_URL = get_from_env("BILLING_SERVICE_URL", "https://billing.posthog.com")
 
diff --git a/ee/tasks/__init__.py b/ee/tasks/__init__.py
index 4bc793399424b..3eb410b6c8e67 100644
--- a/ee/tasks/__init__.py
+++ b/ee/tasks/__init__.py
@@ -7,6 +7,7 @@
     handle_subscription_value_change,
     schedule_all_subscriptions,
 )
+from .replay import embed_batch_of_recordings_task, generate_recordings_embeddings_batch
 
 # As our EE tasks are not included at startup for Celery, we need to ensure they are declared here so that they are imported by posthog/settings/celery.py
 
@@ -16,4 +17,6 @@
     "schedule_all_subscriptions",
     "deliver_subscription_report",
     "handle_subscription_value_change",
+    "embed_batch_of_recordings_task",
+    "generate_recordings_embeddings_batch",
 ]
diff --git a/ee/tasks/replay.py b/ee/tasks/replay.py
new file mode 100644
index 0000000000000..4554850d01801
--- /dev/null
+++ b/ee/tasks/replay.py
@@ -0,0 +1,48 @@
+from typing import Any, List
+
+import structlog
+from celery import shared_task
+
+from ee.session_recordings.ai.generate_embeddings import (
+    fetch_recordings_without_embeddings,
+    embed_batch_of_recordings,
+)
+from posthog import settings
+from posthog.models import Team
+from posthog.tasks.utils import CeleryQueue
+
+logger = structlog.get_logger(__name__)
+
+
+@shared_task(ignore_result=False, queue=CeleryQueue.SESSION_REPLAY_EMBEDDINGS.value)
+def embed_batch_of_recordings_task(recordings: List[Any], team_id: int) -> None:
+    embed_batch_of_recordings(recordings, team_id)
+
+
+@shared_task(ignore_result=True)
+def generate_recordings_embeddings_batch() -> None:
+    # see https://docs.celeryq.dev/en/stable/userguide/canvas.html
+    # we have three jobs to do here
+    # 1. get a batch of recordings
+    # 2. for each recording - ideally in parallel - generate an embedding
+    # 3. update CH with the embeddings in one update operation
+    # in Celery that's a chain of tasks
+    # with step 2 being a group of tasks
+    # chord(
+    #             embed_single_recording.si(recording.session_id, recording.team_id)
+    #             for recording in fetch_recordings_without_embeddings(int(team))
+    #         )(generate_recordings_embeddings_batch_on_complete.si())
+    # but even the docs call out performance impact of synchronising tasks
+    #
+    # so, for now, we'll do that naively
+
+    for team in settings.REPLAY_EMBEDDINGS_ALLOWED_TEAMS:
+        try:
+            recordings = fetch_recordings_without_embeddings(int(team))
+            embed_batch_of_recordings_task.si(recordings, int(team)).apply_async()
+        except Team.DoesNotExist:
+            logger.info(f"[generate_recordings_embeddings_batch] Team {team} does not exist. Skipping.")
+            pass
+        except Exception as e:
+            logger.error(f"[generate_recordings_embeddings_batch] Error: {e}.", exc_info=True, error=e)
+            pass
diff --git a/frontend/__snapshots__/components-command-bar--actions--dark.png b/frontend/__snapshots__/components-command-bar--actions--dark.png
index 55ff12cdf7a64..e15ffa5164b1b 100644
Binary files a/frontend/__snapshots__/components-command-bar--actions--dark.png and b/frontend/__snapshots__/components-command-bar--actions--dark.png differ
diff --git a/frontend/__snapshots__/components-command-bar--actions--light.png b/frontend/__snapshots__/components-command-bar--actions--light.png
index 3b8e1b2efd516..a886435fba6b1 100644
Binary files a/frontend/__snapshots__/components-command-bar--actions--light.png and b/frontend/__snapshots__/components-command-bar--actions--light.png differ
diff --git a/frontend/__snapshots__/components-command-bar--search--dark.png b/frontend/__snapshots__/components-command-bar--search--dark.png
index c5d76efb38fcd..4546e3221a8b2 100644
Binary files a/frontend/__snapshots__/components-command-bar--search--dark.png and b/frontend/__snapshots__/components-command-bar--search--dark.png differ
diff --git a/frontend/__snapshots__/components-command-bar--search--light.png b/frontend/__snapshots__/components-command-bar--search--light.png
index b8791bfc9ce45..fbcf9433f8f5f 100644
Binary files a/frontend/__snapshots__/components-command-bar--search--light.png and b/frontend/__snapshots__/components-command-bar--search--light.png differ
diff --git a/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--dark.png b/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--dark.png
new file mode 100644
index 0000000000000..a1aada324a692
Binary files /dev/null and b/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--dark.png differ
diff --git a/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--light.png b/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--light.png
new file mode 100644
index 0000000000000..409ddc95e93d1
Binary files /dev/null and b/frontend/__snapshots__/components-itemperformanceevent--initial-body-display--light.png differ
diff --git a/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--dark.png b/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--dark.png
new file mode 100644
index 0000000000000..c6e46bbfdedf9
Binary files /dev/null and b/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--dark.png differ
diff --git a/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--light.png b/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--light.png
new file mode 100644
index 0000000000000..bc602073b3194
Binary files /dev/null and b/frontend/__snapshots__/components-itemperformanceevent--initial-headers-display--light.png differ
diff --git a/frontend/__snapshots__/components-not-found--not-found--dark.png b/frontend/__snapshots__/components-not-found--not-found--dark.png
index 0490729ac8368..30c06028ae035 100644
Binary files a/frontend/__snapshots__/components-not-found--not-found--dark.png and b/frontend/__snapshots__/components-not-found--not-found--dark.png differ
diff --git a/frontend/__snapshots__/components-not-found--not-found--light.png b/frontend/__snapshots__/components-not-found--not-found--light.png
index 5886f7561c08d..2824a06203bbd 100644
Binary files a/frontend/__snapshots__/components-not-found--not-found--light.png and b/frontend/__snapshots__/components-not-found--not-found--light.png differ
diff --git a/frontend/__snapshots__/components-prompts--modal-prompt--dark.png b/frontend/__snapshots__/components-prompts--modal-prompt--dark.png
index fabc3d8a3dc90..5935dcd788f07 100644
Binary files a/frontend/__snapshots__/components-prompts--modal-prompt--dark.png and b/frontend/__snapshots__/components-prompts--modal-prompt--dark.png differ
diff --git a/frontend/__snapshots__/components-prompts--modal-prompt--light.png b/frontend/__snapshots__/components-prompts--modal-prompt--light.png
index 530f53cff7e25..09f7d28982ded 100644
Binary files a/frontend/__snapshots__/components-prompts--modal-prompt--light.png and b/frontend/__snapshots__/components-prompts--modal-prompt--light.png differ
diff --git a/frontend/__snapshots__/components-properties-table--properties-table--dark.png b/frontend/__snapshots__/components-properties-table--basic--dark.png
similarity index 100%
rename from frontend/__snapshots__/components-properties-table--properties-table--dark.png
rename to frontend/__snapshots__/components-properties-table--basic--dark.png
diff --git a/frontend/__snapshots__/components-properties-table--properties-table--light.png b/frontend/__snapshots__/components-properties-table--basic--light.png
similarity index 100%
rename from frontend/__snapshots__/components-properties-table--properties-table--light.png
rename to frontend/__snapshots__/components-properties-table--basic--light.png
diff --git a/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--dark.png b/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--dark.png
new file mode 100644
index 0000000000000..7d66d6f54952b
Binary files /dev/null and b/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--dark.png differ
diff --git a/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--light.png b/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--light.png
new file mode 100644
index 0000000000000..dd0ee5931db75
Binary files /dev/null and b/frontend/__snapshots__/components-properties-table--dollar-properties-on-event--light.png differ
diff --git a/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--dark.png b/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--dark.png
new file mode 100644
index 0000000000000..610a20dc3a6af
Binary files /dev/null and b/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--dark.png differ
diff --git a/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--light.png b/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--light.png
new file mode 100644
index 0000000000000..8257003f48567
Binary files /dev/null and b/frontend/__snapshots__/components-properties-table--dollar-properties-on-person--light.png differ
diff --git a/frontend/__snapshots__/components-sharing--dashboard-sharing--dark.png b/frontend/__snapshots__/components-sharing--dashboard-sharing--dark.png
index 17e58aab5f02a..3d96d5621ea4a 100644
Binary files a/frontend/__snapshots__/components-sharing--dashboard-sharing--dark.png and b/frontend/__snapshots__/components-sharing--dashboard-sharing--dark.png differ
diff --git a/frontend/__snapshots__/components-sharing--dashboard-sharing--light.png b/frontend/__snapshots__/components-sharing--dashboard-sharing--light.png
index 2b20d80bdd3e8..3bc2f91ed9385 100644
Binary files a/frontend/__snapshots__/components-sharing--dashboard-sharing--light.png and b/frontend/__snapshots__/components-sharing--dashboard-sharing--light.png differ
diff --git a/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--dark.png b/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--dark.png
index 1de1eb08f81dd..79c0c97c94f12 100644
Binary files a/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--dark.png and b/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--dark.png differ
diff --git a/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--light.png b/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--light.png
index 721d35606de1f..5a7edacfdad3f 100644
Binary files a/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--light.png and b/frontend/__snapshots__/components-sharing--dashboard-sharing-licensed--light.png differ
diff --git a/frontend/__snapshots__/components-sharing--insight-sharing--dark.png b/frontend/__snapshots__/components-sharing--insight-sharing--dark.png
index 752cc0ad13d3e..4d792ec3ee641 100644
Binary files a/frontend/__snapshots__/components-sharing--insight-sharing--dark.png and b/frontend/__snapshots__/components-sharing--insight-sharing--dark.png differ
diff --git a/frontend/__snapshots__/components-sharing--insight-sharing--light.png b/frontend/__snapshots__/components-sharing--insight-sharing--light.png
index daca5a1aa5e77..2071cfe074598 100644
Binary files a/frontend/__snapshots__/components-sharing--insight-sharing--light.png and b/frontend/__snapshots__/components-sharing--insight-sharing--light.png differ
diff --git a/frontend/__snapshots__/components-sharing--insight-sharing-licensed--dark.png b/frontend/__snapshots__/components-sharing--insight-sharing-licensed--dark.png
index fcf7d2bc0ee31..e3e0628600d2e 100644
Binary files a/frontend/__snapshots__/components-sharing--insight-sharing-licensed--dark.png and b/frontend/__snapshots__/components-sharing--insight-sharing-licensed--dark.png differ
diff --git a/frontend/__snapshots__/components-sharing--insight-sharing-licensed--light.png b/frontend/__snapshots__/components-sharing--insight-sharing-licensed--light.png
index 818c4a2134bc9..7768d64f19d3c 100644
Binary files a/frontend/__snapshots__/components-sharing--insight-sharing-licensed--light.png and b/frontend/__snapshots__/components-sharing--insight-sharing-licensed--light.png differ
diff --git a/frontend/__snapshots__/components-sharing--recording-sharing-licensed--dark.png b/frontend/__snapshots__/components-sharing--recording-sharing-licensed--dark.png
index 0124aebefc9eb..48a63fbc367ff 100644
Binary files a/frontend/__snapshots__/components-sharing--recording-sharing-licensed--dark.png and b/frontend/__snapshots__/components-sharing--recording-sharing-licensed--dark.png differ
diff --git a/frontend/__snapshots__/components-sharing--recording-sharing-licensed--light.png b/frontend/__snapshots__/components-sharing--recording-sharing-licensed--light.png
index 8d478e409a28b..2dafc35849389 100644
Binary files a/frontend/__snapshots__/components-sharing--recording-sharing-licensed--light.png and b/frontend/__snapshots__/components-sharing--recording-sharing-licensed--light.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--dark.png b/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--dark.png
index c051463a0a317..582d1c92b972f 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--dark.png and b/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--dark.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--light.png b/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--light.png
index c063ff7e38d73..501349ba84faf 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--light.png and b/frontend/__snapshots__/components-subscriptions--subscription-no-integrations--light.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions--dark.png b/frontend/__snapshots__/components-subscriptions--subscriptions--dark.png
index d8943197367dc..a906116f7bde4 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions--dark.png and b/frontend/__snapshots__/components-subscriptions--subscriptions--dark.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions--light.png b/frontend/__snapshots__/components-subscriptions--subscriptions--light.png
index 933363c14e0ab..b6060eaa050c2 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions--light.png and b/frontend/__snapshots__/components-subscriptions--subscriptions--light.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-edit--dark.png b/frontend/__snapshots__/components-subscriptions--subscriptions-edit--dark.png
index ee6374a5feac0..54c0fc2272e90 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-edit--dark.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-edit--dark.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-edit--light.png b/frontend/__snapshots__/components-subscriptions--subscriptions-edit--light.png
index b235fe67ac43b..d90c6a6065923 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-edit--light.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-edit--light.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-empty--dark.png b/frontend/__snapshots__/components-subscriptions--subscriptions-empty--dark.png
index ef525c254ca58..15497b84a10e4 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-empty--dark.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-empty--dark.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-empty--light.png b/frontend/__snapshots__/components-subscriptions--subscriptions-empty--light.png
index 21c7b56dcaa58..6c73320b1dbc6 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-empty--light.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-empty--light.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-new--dark.png b/frontend/__snapshots__/components-subscriptions--subscriptions-new--dark.png
index b2467b71d6e74..15e596b77adab 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-new--dark.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-new--dark.png differ
diff --git a/frontend/__snapshots__/components-subscriptions--subscriptions-new--light.png b/frontend/__snapshots__/components-subscriptions--subscriptions-new--light.png
index 042ebeea6af32..36c57443276f7 100644
Binary files a/frontend/__snapshots__/components-subscriptions--subscriptions-new--light.png and b/frontend/__snapshots__/components-subscriptions--subscriptions-new--light.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--basic--dark.png b/frontend/__snapshots__/layout-feature-previews--basic--dark.png
new file mode 100644
index 0000000000000..75ea7a1bd5aec
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--basic--dark.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--basic--light.png b/frontend/__snapshots__/layout-feature-previews--basic--light.png
new file mode 100644
index 0000000000000..a535a38508717
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--basic--light.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--empty--dark.png b/frontend/__snapshots__/layout-feature-previews--empty--dark.png
new file mode 100644
index 0000000000000..1b73a2eee7403
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--empty--dark.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--empty--light.png b/frontend/__snapshots__/layout-feature-previews--empty--light.png
new file mode 100644
index 0000000000000..7d21c3c7deefb
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--empty--light.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--dark.png b/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--dark.png
new file mode 100644
index 0000000000000..7abb672985a20
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--dark.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--light.png b/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--light.png
new file mode 100644
index 0000000000000..866fbf244450a
Binary files /dev/null and b/frontend/__snapshots__/layout-feature-previews--with-constrained-feature--light.png differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--basic--dark.png b/frontend/__snapshots__/layout-feature-previews-modal--basic--dark.png
deleted file mode 100644
index 918b57e1659a4..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--basic--dark.png and /dev/null differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--basic--light.png b/frontend/__snapshots__/layout-feature-previews-modal--basic--light.png
deleted file mode 100644
index 369c837b3fba1..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--basic--light.png and /dev/null differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--empty--dark.png b/frontend/__snapshots__/layout-feature-previews-modal--empty--dark.png
deleted file mode 100644
index 0f1128d9b7fc7..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--empty--dark.png and /dev/null differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--empty--light.png b/frontend/__snapshots__/layout-feature-previews-modal--empty--light.png
deleted file mode 100644
index 013c15b129942..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--empty--light.png and /dev/null differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--dark.png b/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--dark.png
deleted file mode 100644
index 8ddf9218da94e..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--dark.png and /dev/null differ
diff --git a/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--light.png b/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--light.png
deleted file mode 100644
index 44e1abb566ea6..0000000000000
Binary files a/frontend/__snapshots__/layout-feature-previews-modal--with-constrained-feature--light.png and /dev/null differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled--light.png b/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled--light.png
index 4d1e6546cad32..b953663cb43ea 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled--light.png and b/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled-with-reason--light.png b/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled-with-reason--light.png
index 4d1e6546cad32..b953663cb43ea 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled-with-reason--light.png and b/frontend/__snapshots__/lemon-ui-lemon-checkbox--disabled-with-reason--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--dark.png b/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--dark.png
index 6672835b2b74f..d56bb3b8b5951 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--light.png b/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--light.png
index cff1760f7f6d3..e4ff4460dcf2e 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--light.png and b/frontend/__snapshots__/lemon-ui-lemon-checkbox--no-label--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--dark.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--dark.png
index bfd4c9e49d734..f173555451438 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--light.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--light.png
index ab1ab855c98d0..6013ce8c61a67 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--light.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--customised--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--dark.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--dark.png
index c659b1d4d1946..4ef5c8994c680 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--light.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--light.png
index 9e015231c4762..a687e6bc0a7a4 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--light.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--minimal--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--template--dark.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--template--dark.png
index c3a143bf2e4f6..0faffdda5fdd6 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--template--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--template--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-dialog--template--light.png b/frontend/__snapshots__/lemon-ui-lemon-dialog--template--light.png
index 7e78761f62e04..29c1006b58a0d 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-dialog--template--light.png and b/frontend/__snapshots__/lemon-ui-lemon-dialog--template--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-forms-and-fields--fields-with-kea-form--dark.png b/frontend/__snapshots__/lemon-ui-lemon-field--fields-with-kea-form--dark.png
similarity index 100%
rename from frontend/__snapshots__/lemon-ui-forms-and-fields--fields-with-kea-form--dark.png
rename to frontend/__snapshots__/lemon-ui-lemon-field--fields-with-kea-form--dark.png
diff --git a/frontend/__snapshots__/lemon-ui-forms-and-fields--fields-with-kea-form--light.png b/frontend/__snapshots__/lemon-ui-lemon-field--fields-with-kea-form--light.png
similarity index 100%
rename from frontend/__snapshots__/lemon-ui-forms-and-fields--fields-with-kea-form--light.png
rename to frontend/__snapshots__/lemon-ui-lemon-field--fields-with-kea-form--light.png
diff --git a/frontend/__snapshots__/lemon-ui-forms-and-fields--pure-fields--dark.png b/frontend/__snapshots__/lemon-ui-lemon-field--pure-fields--dark.png
similarity index 100%
rename from frontend/__snapshots__/lemon-ui-forms-and-fields--pure-fields--dark.png
rename to frontend/__snapshots__/lemon-ui-lemon-field--pure-fields--dark.png
diff --git a/frontend/__snapshots__/lemon-ui-forms-and-fields--pure-fields--light.png b/frontend/__snapshots__/lemon-ui-lemon-field--pure-fields--light.png
similarity index 100%
rename from frontend/__snapshots__/lemon-ui-forms-and-fields--pure-fields--light.png
rename to frontend/__snapshots__/lemon-ui-lemon-field--pure-fields--light.png
diff --git a/frontend/__snapshots__/lemon-ui-lemon-modal--inline--dark.png b/frontend/__snapshots__/lemon-ui-lemon-modal--inline--dark.png
index f1984e160c4ae..42760aa117289 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-modal--inline--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-modal--inline--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-modal--inline--light.png b/frontend/__snapshots__/lemon-ui-lemon-modal--inline--light.png
index a581b66e7dff9..cb597d705d982 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-modal--inline--light.png and b/frontend/__snapshots__/lemon-ui-lemon-modal--inline--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--dark.png b/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--dark.png
index 09c4eaa93888f..4328a4aa9b0c3 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--light.png b/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--light.png
index a3887444dd052..5e93106f1fa7f 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--light.png and b/frontend/__snapshots__/lemon-ui-lemon-modal--with-custom-content--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--dark.png b/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--dark.png
index be0f293e55e00..29b9e77415856 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--dark.png and b/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--light.png b/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--light.png
index aa5074e189fe7..e2fbda759a0f2 100644
Binary files a/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--light.png and b/frontend/__snapshots__/lemon-ui-lemon-skeleton--presets--light.png differ
diff --git a/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--dark.png b/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--dark.png
new file mode 100644
index 0000000000000..97d2d928fd924
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--dark.png differ
diff --git a/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--light.png b/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--light.png
new file mode 100644
index 0000000000000..51da062694432
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-spinner--as-overlay-waiting--light.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--dark.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--dark.png
index 2fd0df3d4599f..51aa83028b123 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--dark.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--dark.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--light.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--light.png
index 8739e1ab2a5c7..f7c8596b4677d 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--light.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000--light.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base--dark.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base--dark.png
index 5a9dfe1d78600..5ab6b69cf8edc 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base--dark.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base--dark.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base--light.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base--light.png
index bb09cee59704d..8252b5fdf1bb7 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base--light.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base--light.png differ
diff --git a/frontend/__snapshots__/replay-player-failure--recent-recordings-404--dark.png b/frontend/__snapshots__/replay-player-failure--recent-recordings-404--dark.png
index 176e35273415b..62eccad63930c 100644
Binary files a/frontend/__snapshots__/replay-player-failure--recent-recordings-404--dark.png and b/frontend/__snapshots__/replay-player-failure--recent-recordings-404--dark.png differ
diff --git a/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png b/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png
index 82b82d8fc6329..afefe8eb9e546 100644
Binary files a/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png and b/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--create-template--dark.png b/frontend/__snapshots__/scenes-app-dashboards--create-template--dark.png
index c477b360f73f9..ed2947ef9fdf3 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--create-template--dark.png and b/frontend/__snapshots__/scenes-app-dashboards--create-template--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--create-template--light.png b/frontend/__snapshots__/scenes-app-dashboards--create-template--light.png
index 744768732f58f..a5a0da9c3da38 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--create-template--light.png and b/frontend/__snapshots__/scenes-app-dashboards--create-template--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--edit-template--dark.png b/frontend/__snapshots__/scenes-app-dashboards--edit-template--dark.png
index aa379aec90169..0ff80daf82147 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--edit-template--dark.png and b/frontend/__snapshots__/scenes-app-dashboards--edit-template--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--edit-template--light.png b/frontend/__snapshots__/scenes-app-dashboards--edit-template--light.png
index f0464fbf342ee..751793b869631 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--edit-template--light.png and b/frontend/__snapshots__/scenes-app-dashboards--edit-template--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new--dark.png b/frontend/__snapshots__/scenes-app-dashboards--new--dark.png
index 7248234a801b1..55f0e1fbf59bb 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new--dark.png and b/frontend/__snapshots__/scenes-app-dashboards--new--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new--light.png b/frontend/__snapshots__/scenes-app-dashboards--new--light.png
index 9bf080734d628..f3b6a2a26d326 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new--light.png and b/frontend/__snapshots__/scenes-app-dashboards--new--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--dark.png b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--dark.png
index 08a6710208ba4..61c133fd51f2b 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--dark.png and b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--light.png b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--light.png
index de4372f7c9749..f1a471957290e 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--light.png and b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-events--event-explorer--dark.png b/frontend/__snapshots__/scenes-app-events--event-explorer--dark.png
index 4b3b23d5b8ffa..0d730287db648 100644
Binary files a/frontend/__snapshots__/scenes-app-events--event-explorer--dark.png and b/frontend/__snapshots__/scenes-app-events--event-explorer--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-events--event-explorer--light.png b/frontend/__snapshots__/scenes-app-events--event-explorer--light.png
index 7f2fbaf603031..021340ebcb266 100644
Binary files a/frontend/__snapshots__/scenes-app-events--event-explorer--light.png and b/frontend/__snapshots__/scenes-app-events--event-explorer--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--dark.png b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--dark.png
index 5e7de45b99fe9..8492cc3e6e6b8 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--dark.png and b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--light.png b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--light.png
index a22ddbb2215c5..f71bab38378ed 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--light.png and b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--dark.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--dark.png
index a898fec7fd1aa..b4993bddf4163 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--dark.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--light.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--light.png
index 3ab2a31a26205..f48ee685ab294 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--light.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--dark.png b/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--dark.png
index 87a76f1653c40..5ba95095f4a18 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--dark.png and b/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--light.png b/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--light.png
index ea13f3250e585..43981441292e7 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--light.png and b/frontend/__snapshots__/scenes-app-feature-flags--new-feature-flag--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--dark.png b/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--dark.png
index 327edbf898ff0..8725f1bae561c 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--dark.png and b/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--light.png b/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--light.png
index fbb4778f9f036..a066c372757c0 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--light.png and b/frontend/__snapshots__/scenes-app-feature-flags-code-examples--code-instructionsi-os-with-multivariate-flag--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--not-found-early-access--dark.png b/frontend/__snapshots__/scenes-app-features--not-found-early-access--dark.png
index cd9f9b82f551f..398b149c24685 100644
Binary files a/frontend/__snapshots__/scenes-app-features--not-found-early-access--dark.png and b/frontend/__snapshots__/scenes-app-features--not-found-early-access--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--not-found-early-access--light.png b/frontend/__snapshots__/scenes-app-features--not-found-early-access--light.png
index 3327b43d90d26..f69936ed7ad9b 100644
Binary files a/frontend/__snapshots__/scenes-app-features--not-found-early-access--light.png and b/frontend/__snapshots__/scenes-app-features--not-found-early-access--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line--light--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-line--light--webkit.png
index d2643fc390633..d60cbfa5e7556 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-line--light--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-line--light--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights-error-empty-states--estimated-query-execution-time-too-long--light.png b/frontend/__snapshots__/scenes-app-insights-error-empty-states--estimated-query-execution-time-too-long--light.png
index 0bcb59a7ddb09..002df84329f4d 100644
Binary files a/frontend/__snapshots__/scenes-app-insights-error-empty-states--estimated-query-execution-time-too-long--light.png and b/frontend/__snapshots__/scenes-app-insights-error-empty-states--estimated-query-execution-time-too-long--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--dark.png b/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--dark.png
index 56b00c6763784..ee80e0f02bd85 100644
Binary files a/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--dark.png and b/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--light.png b/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--light.png
index 70824505eb38a..73c1cbab618b6 100644
Binary files a/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--light.png and b/frontend/__snapshots__/scenes-app-insights-error-empty-states--long-loading--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights-error-empty-states--validation-error--light.png b/frontend/__snapshots__/scenes-app-insights-error-empty-states--validation-error--light.png
index 27f1e4acbf2b7..4504fbe6699ac 100644
Binary files a/frontend/__snapshots__/scenes-app-insights-error-empty-states--validation-error--light.png and b/frontend/__snapshots__/scenes-app-insights-error-empty-states--validation-error--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--dark.png b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--dark.png
index a3f6c4961ab2e..97ed4ba13cded 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--dark.png and b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--light.png b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--light.png
index 50c5bdf99404f..d25c27a388daa 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--light.png and b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--empty--dark.png b/frontend/__snapshots__/scenes-app-persons-modal--empty--dark.png
index edd3a65f4f202..d7a73ee4813ea 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--empty--dark.png and b/frontend/__snapshots__/scenes-app-persons-modal--empty--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--empty--light.png b/frontend/__snapshots__/scenes-app-persons-modal--empty--light.png
index 2f329f828f1c1..20746a57a1890 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--empty--light.png and b/frontend/__snapshots__/scenes-app-persons-modal--empty--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--server-error--dark.png b/frontend/__snapshots__/scenes-app-persons-modal--server-error--dark.png
index 60a11a6d4f885..dc9f6893e07b2 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--server-error--dark.png and b/frontend/__snapshots__/scenes-app-persons-modal--server-error--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--server-error--light.png b/frontend/__snapshots__/scenes-app-persons-modal--server-error--light.png
index 770da0c6f91a1..c0f09ec7fd803 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--server-error--light.png and b/frontend/__snapshots__/scenes-app-persons-modal--server-error--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--dark.png b/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--dark.png
index adbe9f939b80a..16192a8369b82 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--dark.png and b/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--light.png b/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--light.png
index a4e24095469b9..898400251f78e 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--light.png and b/frontend/__snapshots__/scenes-app-persons-modal--timeout-error--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--with-results--dark.png b/frontend/__snapshots__/scenes-app-persons-modal--with-results--dark.png
index bd163322bfb32..4f943098d2682 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--with-results--dark.png and b/frontend/__snapshots__/scenes-app-persons-modal--with-results--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-persons-modal--with-results--light.png b/frontend/__snapshots__/scenes-app-persons-modal--with-results--light.png
index fa3d9884217f1..ed6be22268ec7 100644
Binary files a/frontend/__snapshots__/scenes-app-persons-modal--with-results--light.png and b/frontend/__snapshots__/scenes-app-persons-modal--with-results--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--dark.png
index 36a0466e6c1f7..76d4b7bc85b67 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--light.png
index 897331d9aaf6f..f173b278ad65f 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-destinations-page--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--dark.png
index d636ef141dcfb..b8ea18548b8a5 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--light.png
index 90025aff9294f..33892e82d03b8 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration-404--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--dark.png
index d636ef141dcfb..b8ea18548b8a5 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--light.png
index 90025aff9294f..33892e82d03b8 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-logs-batch-export--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--dark.png
index f42136f673198..b1c416084c8c0 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--light.png
index 70869476de2fa..7b8bb71adbb52 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics-error-modal--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--dark.png
index cfa99376fa2e2..9afb43cee1fdb 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--light.png
index 31cb858d40508..b21fdc8a2fe88 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--dark.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--dark.png
index cfa99376fa2e2..9afb43cee1fdb 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--dark.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--light.png
index 78bf1462dc8b8..e6dd3b53ae662 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--light.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page-empty--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--dark.png b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--dark.png
index db71c88a90c8d..20d3d24f40540 100644
Binary files a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--dark.png and b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--light.png b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--light.png
index 43a53cbdae5c2..f34a763be6c2d 100644
Binary files a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--light.png and b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--dark.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--dark.png
index 10651d17b803f..1313a6caabdbf 100644
Binary files a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--dark.png and b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--light.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--light.png
index 4cde8e1c187aa..2e10dc60123a6 100644
Binary files a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--light.png and b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-activation--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-not-found--dark.png b/frontend/__snapshots__/scenes-app-surveys--survey-not-found--dark.png
index 0d7aa6975e8db..36361aaa2ed0c 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-not-found--dark.png and b/frontend/__snapshots__/scenes-app-surveys--survey-not-found--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-not-found--light.png b/frontend/__snapshots__/scenes-app-surveys--survey-not-found--light.png
index 149f444c28a92..c11e131e006e3 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-not-found--light.png and b/frontend/__snapshots__/scenes-app-surveys--survey-not-found--light.png differ
diff --git a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--dark.png b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--dark.png
index ddad4b1286215..3dc108d920b68 100644
Binary files a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--dark.png and b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--dark.png differ
diff --git a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--light.png b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--light.png
index 2a5ce16204a7b..b4321e1ab6bd8 100644
Binary files a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--light.png and b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal--light.png differ
diff --git a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--dark.png b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--dark.png
index d4d05c1f5c994..441e34109f7a1 100644
Binary files a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--dark.png and b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--dark.png differ
diff --git a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--light.png b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--light.png
index 280bae26b3f05..709cceb9886a7 100644
Binary files a/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--light.png and b/frontend/__snapshots__/scenes-other-billing-v2--billing-unsubscribe-modal-data-pipelines--light.png differ
diff --git a/frontend/src/exporter/Exporter.scss b/frontend/src/exporter/Exporter.scss
index df0d456df55d7..76f92199f5689 100644
--- a/frontend/src/exporter/Exporter.scss
+++ b/frontend/src/exporter/Exporter.scss
@@ -1,9 +1,7 @@
 @import '../styles/mixins';
 
 body.ExporterBody {
-    &.posthog-3000 {
-        overflow: initial;
-    }
+    overflow: initial;
 }
 
 .Exporter {
diff --git a/frontend/src/initKea.ts b/frontend/src/initKea.ts
index 936fb12e7d84a..d500b27bf441c 100644
--- a/frontend/src/initKea.ts
+++ b/frontend/src/initKea.ts
@@ -114,7 +114,8 @@ export function initKea({ routerHistory, routerLocation, beforePlugins }: InitKe
         waitForPlugin,
     ]
 
-    if (window.JS_KEA_VERBOSE_LOGGING) {
+    // To enable logging, run localStorage.setItem("debug", true) in the console
+    if (window.JS_KEA_VERBOSE_LOGGING || ('localStorage' in window && window.localStorage.getItem('debug'))) {
         plugins.push(loggerPlugin)
     }
 
diff --git a/frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.stories.tsx b/frontend/src/layout/FeaturePreviews/FeaturePreviews.stories.tsx
similarity index 92%
rename from frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.stories.tsx
rename to frontend/src/layout/FeaturePreviews/FeaturePreviews.stories.tsx
index 8853e4812c90a..9946888196d9c 100644
--- a/frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.stories.tsx
+++ b/frontend/src/layout/FeaturePreviews/FeaturePreviews.stories.tsx
@@ -4,8 +4,8 @@ import { EarlyAccessFeature } from 'posthog-js'
 
 import { setFeatureFlags, useStorybookMocks } from '~/mocks/browser'
 
+import { FeaturePreviews } from './FeaturePreviews'
 import { CONSTRAINED_PREVIEWS } from './featurePreviewsLogic'
-import { FeaturePreviewsModal as FeaturePreviewsModalComponent } from './FeaturePreviewsModal'
 
 interface StoryProps {
     earlyAccessFeatures: EarlyAccessFeature[]
@@ -14,7 +14,7 @@ interface StoryProps {
 
 type Story = StoryObj<(props: StoryProps) => JSX.Element>
 const meta: Meta<(props: StoryProps) => JSX.Element> = {
-    title: 'Layout/Feature Previews Modal',
+    title: 'Layout/Feature Previews',
     parameters: {
         layout: 'fullscreen',
         viewMode: 'story',
@@ -33,8 +33,8 @@ const Template: StoryFn<StoryProps> = ({ earlyAccessFeatures, enabledFeatureFlag
     setFeatureFlags(enabledFeatureFlags)
 
     return (
-        <div className="bg-default p-2">
-            <FeaturePreviewsModalComponent inline />
+        <div className="w-160 p-4 border rounded mx-auto my-2">
+            <FeaturePreviews />
         </div>
     )
 }
diff --git a/frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.tsx b/frontend/src/layout/FeaturePreviews/FeaturePreviews.tsx
similarity index 82%
rename from frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.tsx
rename to frontend/src/layout/FeaturePreviews/FeaturePreviews.tsx
index 0a2667b2fd14a..00984bf0cd627 100644
--- a/frontend/src/layout/FeaturePreviews/FeaturePreviewsModal.tsx
+++ b/frontend/src/layout/FeaturePreviews/FeaturePreviews.tsx
@@ -1,42 +1,11 @@
-import { LemonButton, LemonDivider, LemonModal, LemonSwitch, LemonTextArea, Link } from '@posthog/lemon-ui'
+import { LemonButton, LemonDivider, LemonSwitch, LemonTextArea, Link } from '@posthog/lemon-ui'
 import clsx from 'clsx'
 import { useActions, useAsyncActions, useValues } from 'kea'
 import { SpinnerOverlay } from 'lib/lemon-ui/Spinner'
 import { useLayoutEffect, useState } from 'react'
 
-import { sidePanelStateLogic } from '../navigation-3000/sidepanel/sidePanelStateLogic'
 import { EnrichedEarlyAccessFeature, featurePreviewsLogic } from './featurePreviewsLogic'
 
-export function FeaturePreviewsModal({
-    inline,
-}: {
-    /** @deprecated This is only for Storybook. */
-    inline?: boolean
-}): JSX.Element | null {
-    const { featurePreviewsModalVisible } = useValues(featurePreviewsLogic)
-    const { hideFeaturePreviewsModal, loadEarlyAccessFeatures } = useActions(featurePreviewsLogic)
-    const { sidePanelAvailable } = useValues(sidePanelStateLogic)
-
-    useLayoutEffect(() => loadEarlyAccessFeatures(), [])
-
-    if (sidePanelAvailable) {
-        return null
-    }
-
-    return (
-        <LemonModal
-            isOpen={inline || featurePreviewsModalVisible}
-            onClose={hideFeaturePreviewsModal}
-            title="Feature previews"
-            description="Get early access to these upcoming features. Let us know what you think!"
-            width={528}
-            inline={inline}
-        >
-            <FeaturePreviews />
-        </LemonModal>
-    )
-}
-
 export function FeaturePreviews(): JSX.Element {
     const { earlyAccessFeatures, rawEarlyAccessFeaturesLoading } = useValues(featurePreviewsLogic)
     const { loadEarlyAccessFeatures } = useActions(featurePreviewsLogic)
diff --git a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
index 602bdf72eafc3..60e3e3a931918 100644
--- a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
+++ b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
@@ -1,6 +1,5 @@
 import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
-import { actionToUrl, router, urlToAction } from 'kea-router'
 import { supportLogic } from 'lib/components/Support/supportLogic'
 import { FeatureFlagKey } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -24,8 +23,6 @@ export const featurePreviewsLogic = kea<featurePreviewsLogicType>([
         actions: [supportLogic, ['submitZendeskTicket']],
     }),
     actions({
-        showFeaturePreviewsModal: true,
-        hideFeaturePreviewsModal: true,
         updateEarlyAccessFeatureEnrollment: (flagKey: string, enabled: boolean) => ({ flagKey, enabled }),
         beginEarlyAccessFeatureFeedback: (flagKey: string) => ({ flagKey }),
         cancelEarlyAccessFeatureFeedback: true,
@@ -67,17 +64,9 @@ export const featurePreviewsLogic = kea<featurePreviewsLogicType>([
         ],
     })),
     reducers({
-        featurePreviewsModalVisible: [
-            false,
-            {
-                showFeaturePreviewsModal: () => true,
-                hideFeaturePreviewsModal: () => false,
-            },
-        ],
         activeFeedbackFlagKey: {
             beginEarlyAccessFeatureFeedback: (_, { flagKey }) => flagKey,
             cancelEarlyAccessFeatureFeedback: () => null,
-            hideFeaturePreviewsModal: () => null,
         },
     }),
     listeners(() => ({
@@ -111,25 +100,4 @@ export const featurePreviewsLogic = kea<featurePreviewsLogicType>([
                     }),
         ],
     }),
-    urlToAction(({ actions }) => ({
-        '*': (_, _search, hashParams) => {
-            if (hashParams['panel'] === 'feature-previews') {
-                actions.showFeaturePreviewsModal()
-            }
-        },
-    })),
-    actionToUrl(() => {
-        return {
-            showFeaturePreviewsModal: () => {
-                const hashParams = router.values.hashParams
-                hashParams['panel'] = 'feature-previews'
-                return [router.values.location.pathname, router.values.searchParams, hashParams]
-            },
-            hideFeaturePreviewsModal: () => {
-                const hashParams = router.values.hashParams
-                delete hashParams['panel']
-                return [router.values.location.pathname, router.values.searchParams, hashParams]
-            },
-        }
-    }),
 ])
diff --git a/frontend/src/layout/FeaturePreviews/index.ts b/frontend/src/layout/FeaturePreviews/index.ts
deleted file mode 100644
index 6101040e9e9f2..0000000000000
--- a/frontend/src/layout/FeaturePreviews/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { featurePreviewsLogic } from './featurePreviewsLogic'
-export { FeaturePreviewsModal } from './FeaturePreviewsModal'
diff --git a/frontend/src/layout/GlobalModals.tsx b/frontend/src/layout/GlobalModals.tsx
index d58ad3ee84d33..11f87bb3a3a69 100644
--- a/frontend/src/layout/GlobalModals.tsx
+++ b/frontend/src/layout/GlobalModals.tsx
@@ -12,7 +12,6 @@ import { InviteModal } from 'scenes/settings/organization/InviteModal'
 import { UpgradeModal } from 'scenes/UpgradeModal'
 import { userLogic } from 'scenes/userLogic'
 
-import { FeaturePreviewsModal } from './FeaturePreviews'
 import type { globalModalsLogicType } from './GlobalModalsType'
 
 export const globalModalsLogic = kea<globalModalsLogicType>([
@@ -53,7 +52,6 @@ export function GlobalModals(): JSX.Element {
             <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 && (
diff --git a/frontend/src/layout/navigation-3000/Navigation.scss b/frontend/src/layout/navigation-3000/Navigation.scss
index 0c7d5d22691c5..2f9079e661976 100644
--- a/frontend/src/layout/navigation-3000/Navigation.scss
+++ b/frontend/src/layout/navigation-3000/Navigation.scss
@@ -4,6 +4,7 @@
     --breadcrumbs-height-full: 3.75rem;
     --breadcrumbs-height-compact: 2.75rem; // Sync with BREADCRUMBS_HEIGHT_COMPACT
     --scene-padding: 1rem;
+    --scene-padding-bottom: var(--scene-padding);
 
     display: flex;
     width: 100%;
@@ -23,6 +24,12 @@
         background: none;
     }
 
+    @media screen and (max-width: $sm) {
+        // handle notched devices and mobile safari's bottom nav bar
+        // provide a fallback of 80px as Safari's approach to safe-area-inset-bottom is not consistent across versions
+        --scene-padding-bottom: calc(var(--scene-padding) + max(env(safe-area-inset-bottom), 80px));
+    }
+
     @media screen and (max-width: $lg) {
         --scene-padding: 0.5rem;
     }
@@ -31,8 +38,9 @@
 .Navigation3000__scene {
     // `relative` is for positioning of the scene-level spinner
     position: relative;
-    min-height: calc(100vh - var(--breadcrumbs-height-full) - var(--scene-padding) * 2);
+    min-height: calc(100vh - var(--breadcrumbs-height-full) - var(--scene-padding) - var(--scene-padding-bottom));
     margin: var(--scene-padding);
+    margin-bottom: var(--scene-padding-bottom);
 
     &.Navigation3000__scene--raw {
         --scene-padding: 0px;
diff --git a/frontend/src/layout/navigation-3000/Navigation.tsx b/frontend/src/layout/navigation-3000/Navigation.tsx
index 110c8f068fdf6..6e4392eb18d84 100644
--- a/frontend/src/layout/navigation-3000/Navigation.tsx
+++ b/frontend/src/layout/navigation-3000/Navigation.tsx
@@ -62,7 +62,7 @@ export function Navigation({
                     {children}
                 </div>
             </main>
-            {!mobileLayout && <SidePanel />}
+            <SidePanel />
             <CommandBar />
         </div>
     )
diff --git a/frontend/src/layout/navigation-3000/components/KeyboardShortcut.scss b/frontend/src/layout/navigation-3000/components/KeyboardShortcut.scss
index f2796b41f109e..74965e73091cc 100644
--- a/frontend/src/layout/navigation-3000/components/KeyboardShortcut.scss
+++ b/frontend/src/layout/navigation-3000/components/KeyboardShortcut.scss
@@ -8,21 +8,17 @@
     justify-content: center;
     min-width: 1.25rem;
     height: 1.25rem;
-    padding: 0 0.1875rem;
+    padding: 0.125rem 0.25rem;
+    font-size: 0.75rem;
     color: var(--default);
     text-transform: capitalize;
     user-select: none;
     background: var(--accent-3000);
+    border-color: var(--secondary-3000-button-border-hover);
     border-width: 1px;
+    border-bottom-width: 2px;
     border-radius: 0.25rem;
 
-    .posthog-3000 & {
-        padding: 0.125rem 0.25rem;
-        font-size: 0.75rem;
-        border-color: var(--secondary-3000-button-border-hover);
-        border-bottom-width: 2px;
-    }
-
     .KeyboardShortcut--muted > & {
         color: var(--muted);
         background: none;
diff --git a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
index 9a46da2424e8f..26cc640b24474 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
@@ -1,7 +1,7 @@
 import './SidePanel.scss'
 
 import { IconEllipsis, IconFeatures, IconGear, IconInfo, IconNotebook, IconSupport } from '@posthog/icons'
-import { LemonButton, LemonMenu, LemonMenuItems } from '@posthog/lemon-ui'
+import { LemonButton, LemonMenu, LemonMenuItems, LemonModal } from '@posthog/lemon-ui'
 import clsx from 'clsx'
 import { useActions, useValues } from 'kea'
 import { Resizer } from 'lib/components/Resizer/Resizer'
@@ -11,9 +11,9 @@ import { NotebookPanel } from 'scenes/notebooks/NotebookPanel/NotebookPanel'
 
 import { SidePanelTab } from '~/types'
 
+import { SidePanelActivation, SidePanelActivationIcon } from './panels/activation/SidePanelActivation'
 import { SidePanelActivity, SidePanelActivityIcon } from './panels/activity/SidePanelActivity'
 import { SidePanelDiscussion, SidePanelDiscussionIcon } from './panels/discussion/SidePanelDiscussion'
-import { SidePanelActivation, SidePanelActivationIcon } from './panels/SidePanelActivation'
 import { SidePanelDocs } from './panels/SidePanelDocs'
 import { SidePanelFeaturePreviews } from './panels/SidePanelFeaturePreviews'
 import { SidePanelSettings } from './panels/SidePanelSettings'
@@ -22,11 +22,15 @@ import { SidePanelSupport } from './panels/SidePanelSupport'
 import { sidePanelLogic } from './sidePanelLogic'
 import { sidePanelStateLogic } from './sidePanelStateLogic'
 
-export const SIDE_PANEL_TABS: Record<SidePanelTab, { label: string; Icon: any; Content: any }> = {
+export const SIDE_PANEL_TABS: Record<
+    SidePanelTab,
+    { label: string; Icon: any; Content: any; noModalSupport?: boolean }
+> = {
     [SidePanelTab.Notebooks]: {
         label: 'Notebooks',
         Icon: IconNotebook,
         Content: NotebookPanel,
+        noModalSupport: true,
     },
     [SidePanelTab.Support]: {
         label: 'Support',
@@ -37,6 +41,7 @@ export const SIDE_PANEL_TABS: Record<SidePanelTab, { label: string; Icon: any; C
         label: 'Docs',
         Icon: IconInfo,
         Content: SidePanelDocs,
+        noModalSupport: true,
     },
 
     [SidePanelTab.Activation]: {
@@ -70,6 +75,7 @@ export const SIDE_PANEL_TABS: Record<SidePanelTab, { label: string; Icon: any; C
         label: 'System status',
         Icon: SidePanelStatusIcon,
         Content: SidePanelStatus,
+        noModalSupport: true,
     },
 }
 
@@ -77,7 +83,7 @@ const DEFAULT_WIDTH = 512
 
 export function SidePanel(): JSX.Element | null {
     const { visibleTabs, extraTabs } = useValues(sidePanelLogic)
-    const { selectedTab, sidePanelOpen } = useValues(sidePanelStateLogic)
+    const { selectedTab, sidePanelOpen, modalMode } = useValues(sidePanelStateLogic)
     const { openSidePanel, closeSidePanel, setSidePanelAvailable } = useActions(sidePanelStateLogic)
 
     const activeTab = sidePanelOpen && selectedTab
@@ -129,6 +135,21 @@ export function SidePanel(): JSX.Element | null {
           ]
         : undefined
 
+    if (modalMode) {
+        const supportsModal = activeTab ? !SIDE_PANEL_TABS[activeTab]?.noModalSupport : true
+        return (
+            <LemonModal
+                simple
+                isOpen={!!PanelConent && supportsModal}
+                onClose={closeSidePanel}
+                hideCloseButton
+                width="40rem"
+            >
+                {PanelConent ? <PanelConent /> : null}
+            </LemonModal>
+        )
+    }
+
     return (
         <div
             className={clsx(
@@ -156,6 +177,7 @@ export function SidePanel(): JSX.Element | null {
                                         activeTab === tab ? closeSidePanel() : openSidePanel(tab as SidePanelTab)
                                     }
                                     data-attr={`sidepanel-tab-${tab}`}
+                                    data-ph-capture-attribute-state-before-click={activeTab === tab ? 'open' : 'closed'}
                                     active={activeTab === tab}
                                     type="secondary"
                                     status="alt"
diff --git a/frontend/src/layout/navigation-3000/sidepanel/components/SidePanelPaneHeader.tsx b/frontend/src/layout/navigation-3000/sidepanel/components/SidePanelPaneHeader.tsx
index effad4a601e8b..e0b1ffb80df5a 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/components/SidePanelPaneHeader.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/components/SidePanelPaneHeader.tsx
@@ -1,5 +1,6 @@
 import { LemonButton, Tooltip } from '@posthog/lemon-ui'
-import { useActions } from 'kea'
+import clsx from 'clsx'
+import { useActions, useValues } from 'kea'
 import { IconClose } from 'lib/lemon-ui/icons'
 
 import { sidePanelStateLogic } from '../sidePanelStateLogic'
@@ -10,15 +11,30 @@ export type SidePanelPaneHeaderProps = {
 }
 
 export function SidePanelPaneHeader({ children, title }: SidePanelPaneHeaderProps): JSX.Element {
+    const { modalMode } = useValues(sidePanelStateLogic)
     const { closeSidePanel } = useActions(sidePanelStateLogic)
 
     return (
-        <header className="border-b shrink-0 p-1 flex items-center justify-end gap-1 h-10">
+        <header
+            className={clsx('border-b shrink-0 flex items-center justify-end gap-1', {
+                'p-1 h-10': !modalMode,
+                'pb-2 mt-2 mx-3': modalMode,
+            })}
+        >
             {title ? (
-                <h4 className="flex-1 flex items-center gap-1 font-semibold px-2 mb-0 truncate">{title}</h4>
+                <h3
+                    className={clsx('flex-1 flex items-center gap-1 font-semibold mb-0 truncate', {
+                        'text-base px-2': !modalMode,
+                    })}
+                >
+                    {title}
+                </h3>
             ) : null}
             {children}
-            <Tooltip placement="bottomRight" title="Close this side panel">
+            <Tooltip
+                placement={modalMode ? 'top' : 'bottomRight'}
+                title={modalMode ? 'Close' : 'Close this side panel'}
+            >
                 <LemonButton size="small" sideIcon={<IconClose />} onClick={() => closeSidePanel()} />
             </Tooltip>
         </header>
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx
deleted file mode 100644
index f67c4ef6274ca..0000000000000
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelActivation.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useValues } from 'kea'
-import { activationLogic, ActivationTaskType } from 'lib/components/ActivationSidebar/activationLogic'
-import { ActivationTask } from 'lib/components/ActivationSidebar/ActivationSidebar'
-import { ProfessorHog } from 'lib/components/hedgehogs'
-import { LemonIconProps } from 'lib/lemon-ui/icons'
-import { LemonProgressCircle } from 'lib/lemon-ui/LemonProgressCircle'
-
-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} strokePercentage={0.15} size={20} className={className}>
-            <span className="text-xs font-semibold">{activeTasks.length}</span>
-        </LemonProgressCircle>
-    )
-}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelFeaturePreviews.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelFeaturePreviews.tsx
index a0be65ed4ceb7..cf5c67c209ed5 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelFeaturePreviews.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelFeaturePreviews.tsx
@@ -1,6 +1,6 @@
 import { LemonBanner } from '@posthog/lemon-ui'
 
-import { FeaturePreviews } from '~/layout/FeaturePreviews/FeaturePreviewsModal'
+import { FeaturePreviews } from '~/layout/FeaturePreviews/FeaturePreviews'
 
 import { SidePanelPaneHeader } from '../components/SidePanelPaneHeader'
 
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
index 43c40e2d2ef3b..381cd59181267 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
@@ -19,29 +19,34 @@ export const SidePanelSupport = (): JSX.Element => {
         <>
             <SidePanelPaneHeader title={title} />
 
-            <div className="p-3 max-w-160 w-full mx-auto">
-                <SupportForm />
-                <LemonButton
-                    form="support-modal-form"
-                    htmlType="submit"
-                    type="primary"
-                    data-attr="submit"
-                    fullWidth
-                    center
-                    className="mt-4"
-                >
-                    Submit
-                </LemonButton>
-                <LemonButton
-                    form="support-modal-form"
-                    type="secondary"
-                    onClick={closeSupportForm}
-                    fullWidth
-                    center
-                    className="mt-2"
-                >
-                    Cancel
-                </LemonButton>
+            <div className="overflow-y-auto" data-attr="side-panel-support-container">
+                <div className="p-3 max-w-160 w-full mx-auto">
+                    <SupportForm />
+
+                    <footer>
+                        <LemonButton
+                            form="support-modal-form"
+                            htmlType="submit"
+                            type="primary"
+                            data-attr="submit"
+                            fullWidth
+                            center
+                            className="mt-4"
+                        >
+                            Submit
+                        </LemonButton>
+                        <LemonButton
+                            form="support-modal-form"
+                            type="secondary"
+                            onClick={closeSupportForm}
+                            fullWidth
+                            center
+                            className="mt-2"
+                        >
+                            Cancel
+                        </LemonButton>
+                    </footer>
+                </div>
             </div>
         </>
     )
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activation/SidePanelActivation.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/SidePanelActivation.tsx
new file mode 100644
index 0000000000000..98a26ec2bfb91
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/SidePanelActivation.tsx
@@ -0,0 +1,123 @@
+import { LemonButton, LemonButtonWithSideActionProps } from '@posthog/lemon-ui'
+import { useActions, useValues } from 'kea'
+import { ProfessorHog } from 'lib/components/hedgehogs'
+import { IconCheckmark, IconClose, LemonIconProps } from 'lib/lemon-ui/icons'
+import { LemonProgressCircle } from 'lib/lemon-ui/LemonProgressCircle'
+import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
+
+import {
+    activationLogic,
+    ActivationTaskType,
+} from '~/layout/navigation-3000/sidepanel/panels/activation/activationLogic'
+
+import { SidePanelPaneHeader } from '../../components/SidePanelPaneHeader'
+
+export const SidePanelActivation = (): JSX.Element => {
+    const { activeTasks, completionPercent, completedTasks } = useValues(activationLogic)
+
+    return (
+        <>
+            <SidePanelPaneHeader title="Quick start" />
+            <div className="p-4 space-y-2 overflow-y-auto">
+                <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} strokePercentage={0.15} size={20} className={className}>
+            <span className="text-xs font-semibold">{activeTasks.length}</span>
+        </LemonProgressCircle>
+    )
+}
+
+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)
+
+    const content = (
+        <div className="my-4 mx-2">
+            <p className="m-0">{name}</p>
+            {!completed && !skipped && <p className="font-normal text-xs mt-2 mb-0 mx-0">{description}</p>}
+        </div>
+    )
+
+    const params: Partial<LemonButtonWithSideActionProps> = {
+        id,
+        fullWidth: true,
+        type: 'secondary',
+        icon: completed ? <IconCheckmark /> : skipped ? <IconClose /> : null,
+        tooltip: name,
+    }
+    if (url) {
+        params.to = url
+        params.targetBlank = true
+    } else {
+        params.onClick = () => {
+            runTask(id)
+            reportActivationSideBarTaskClicked(id)
+        }
+    }
+    return (
+        <li>
+            {displaySideAction ? (
+                <LemonButton
+                    {...params}
+                    sideAction={{
+                        icon: <IconClose />,
+                        tooltip: 'Skip task',
+                        onClick: () => skipTask(id),
+                    }}
+                >
+                    {content}
+                </LemonButton>
+            ) : (
+                <LemonButton {...params}>{content}</LemonButton>
+            )}
+        </li>
+    )
+}
diff --git a/frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.test.ts
similarity index 100%
rename from frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts
rename to frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.test.ts
diff --git a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
similarity index 97%
rename from frontend/src/lib/components/ActivationSidebar/activationLogic.ts
rename to frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
index 5fe22dc5541be..2162dd5045550 100644
--- a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
@@ -1,6 +1,6 @@
 import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
-import { router, urlToAction } from 'kea-router'
+import { router } from 'kea-router'
 import api from 'lib/api'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
@@ -13,7 +13,7 @@ import { urls } from 'scenes/urls'
 
 import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 import { dashboardsModel } from '~/models/dashboardsModel'
-import { EventDefinitionType, ProductKey, SidePanelTab, TeamBasicType } from '~/types'
+import { EventDefinitionType, ProductKey, TeamBasicType } from '~/types'
 
 import type { activationLogicType } from './activationLogicType'
 
@@ -362,12 +362,5 @@ export const activationLogic = kea<activationLogicType>([
             actions.loadInsights()
         },
     })),
-    urlToAction(({ actions, values }) => ({
-        '*': (_, params) => {
-            if (params?.onboarding_completed && !values.hasCompletedAllTasks) {
-                actions.openSidePanel(SidePanelTab.Activation)
-            }
-        },
-    })),
     permanentlyMount(),
 ])
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
index e889d5783cf0d..0ccfca7c05f47 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
@@ -1,9 +1,9 @@
 import { connect, kea, path, selectors } from 'kea'
-import { activationLogic } from 'lib/components/ActivationSidebar/activationLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
+import { activationLogic } from '~/layout/navigation-3000/sidepanel/panels/activation/activationLogic'
 import { SidePanelTab } from '~/types'
 
 import { sidePanelActivityLogic } from './panels/activity/sidePanelActivityLogic'
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
index 4d65e0770d69c..6d1360cdf90ac 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
@@ -1,5 +1,6 @@
 import { actions, kea, listeners, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
+import { windowValues } from 'kea-window-values'
 
 import { SidePanelTab } from '~/types'
 
@@ -48,6 +49,9 @@ export const sidePanelStateLogic = kea<sidePanelStateLogicType>([
             },
         ],
     })),
+    windowValues(() => ({
+        modalMode: (window: Window) => window.innerWidth < 992, // Sync width threshold with Sass variable $lg!
+    })),
     listeners(({ actions, values }) => ({
         // NOTE: We explicitly reference the actions instead of connecting so that people don't accidentally
         // use this logic instead of sidePanelStateLogic
diff --git a/frontend/src/layout/navigation/TopBar/AccountPopover.tsx b/frontend/src/layout/navigation/TopBar/AccountPopover.tsx
index b668beb05b42d..9e44414bf1c05 100644
--- a/frontend/src/layout/navigation/TopBar/AccountPopover.tsx
+++ b/frontend/src/layout/navigation/TopBar/AccountPopover.tsx
@@ -21,7 +21,6 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
 import { ThemeSwitcher } from 'scenes/settings/user/ThemeSwitcher'
 
-import { featurePreviewsLogic } from '~/layout/FeaturePreviews/featurePreviewsLogic'
 import {
     AccessLevelIndicator,
     NewOrganizationButton,
@@ -161,13 +160,13 @@ function InstanceSettings(): JSX.Element | null {
 
 function FeaturePreviewsButton(): JSX.Element {
     const { closeAccountPopover } = useActions(navigationLogic)
-    const { showFeaturePreviewsModal } = useActions(featurePreviewsLogic)
+    const { openSidePanel } = useActions(sidePanelStateLogic)
 
     return (
         <LemonButton
             onClick={() => {
                 closeAccountPopover()
-                showFeaturePreviewsModal()
+                openSidePanel(SidePanelTab.FeaturePreviews)
             }}
             icon={<IconFeatures />}
             fullWidth
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 658073a086557..16f62fdc9ca8c 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -927,6 +927,9 @@ const api = {
                         ? new ApiRequest().notebook(`${activityLogProps.id}`).withAction('activity')
                         : new ApiRequest().notebooks().withAction('activity')
                 },
+                [ActivityScope.TEAM]: () => {
+                    return new ApiRequest().projectsDetail().withAction('activity')
+                },
             }
 
             const pagingParameters = { page: page || 1, limit: ACTIVITY_PAGE_SIZE }
diff --git a/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx b/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx
deleted file mode 100644
index a0bce14a81e69..0000000000000
--- a/frontend/src/lib/components/ActivationSidebar/ActivationSidebar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { LemonButton, LemonButtonWithSideActionProps } from '@posthog/lemon-ui'
-import { useActions } from 'kea'
-import { IconCheckmark, IconClose } from 'lib/lemon-ui/icons'
-import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-
-import { activationLogic, ActivationTaskType } from './activationLogic'
-
-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)
-
-    const content = (
-        <div className="my-4 mx-2">
-            <p className="m-0">{name}</p>
-            {!completed && !skipped && <p className="font-normal text-xs mt-2 mb-0 mx-0">{description}</p>}
-        </div>
-    )
-
-    const params: Partial<LemonButtonWithSideActionProps> = {
-        id,
-        fullWidth: true,
-        type: 'secondary',
-        icon: completed ? <IconCheckmark /> : skipped ? <IconClose /> : null,
-        tooltip: name,
-    }
-    if (url) {
-        params.to = url
-        params.targetBlank = true
-    } else {
-        params.onClick = () => {
-            runTask(id)
-            reportActivationSideBarTaskClicked(id)
-        }
-    }
-    return (
-        <li>
-            {displaySideAction ? (
-                <LemonButton
-                    {...params}
-                    sideAction={{
-                        icon: <IconClose />,
-                        tooltip: 'Skip task',
-                        onClick: () => skipTask(id),
-                    }}
-                >
-                    {content}
-                </LemonButton>
-            ) : (
-                <LemonButton {...params}>{content}</LemonButton>
-            )}
-        </li>
-    )
-}
diff --git a/frontend/src/lib/components/ActivityLog/ActivityLog.stories.tsx b/frontend/src/lib/components/ActivityLog/ActivityLog.stories.tsx
index c048adb88355e..72a1551eb43be 100644
--- a/frontend/src/lib/components/ActivityLog/ActivityLog.stories.tsx
+++ b/frontend/src/lib/components/ActivityLog/ActivityLog.stories.tsx
@@ -3,6 +3,7 @@ import {
     featureFlagsActivityResponseJson,
     insightsActivityResponseJson,
     personActivityResponseJson,
+    teamActivityResponseJson,
 } from 'lib/components/ActivityLog/__mocks__/activityLogMocks'
 import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
 
@@ -37,6 +38,10 @@ const meta: Meta<typeof ActivityLog> = {
                     ctx.status(200),
                     ctx.json({ results: personActivityResponseJson }),
                 ],
+                '/api/projects/:id/activity': (_, __, ctx) => [
+                    ctx.status(200),
+                    ctx.json({ results: teamActivityResponseJson }),
+                ],
             },
         }),
     ],
@@ -59,6 +64,10 @@ export function PersonsActivity(): JSX.Element {
     return <ActivityLog scope={ActivityScope.PERSON} id={12} />
 }
 
+export function TeamActivity(): JSX.Element {
+    return <ActivityLog scope={ActivityScope.TEAM} id={12} />
+}
+
 export function WithCaption(): JSX.Element {
     return (
         <ActivityLog
diff --git a/frontend/src/lib/components/ActivityLog/__mocks__/activityLogMocks.ts b/frontend/src/lib/components/ActivityLog/__mocks__/activityLogMocks.ts
index 360828f98bb67..1727f0ed6bb8c 100644
--- a/frontend/src/lib/components/ActivityLog/__mocks__/activityLogMocks.ts
+++ b/frontend/src/lib/components/ActivityLog/__mocks__/activityLogMocks.ts
@@ -2,6 +2,131 @@ import { ActivityLogItem } from 'lib/components/ActivityLog/humanizeActivity'
 
 import { ActivityScope, InsightShortId } from '~/types'
 
+export const teamActivityResponseJson: ActivityLogItem[] = [
+    {
+        user: {
+            first_name: 'sdavasdadadsadas',
+            last_name: '',
+            email: 'paul@posthog.com',
+        },
+        unread: false,
+        is_staff: false,
+        is_system: false,
+        activity: 'updated',
+        item_id: '1',
+        scope: ActivityScope.TEAM,
+        detail: {
+            name: 'Default Project',
+            type: undefined,
+            merge: null,
+            changes: [
+                {
+                    type: ActivityScope.TEAM,
+                    after: 2000,
+                    field: 'session_recording_minimum_duration_milliseconds',
+                    action: 'created',
+                    before: null,
+                },
+            ],
+            trigger: null,
+            short_id: null,
+        },
+        created_at: '2024-02-08T19:23:53.530402Z',
+    },
+    {
+        user: {
+            first_name: 'sdavasdadadsadas',
+            last_name: '',
+            email: 'paul@posthog.com',
+        },
+        unread: false,
+        is_staff: false,
+        is_system: false,
+        activity: 'updated',
+        item_id: '1',
+        scope: ActivityScope.TEAM,
+        detail: {
+            name: 'Default Project',
+            type: undefined,
+            merge: null,
+            changes: [
+                {
+                    type: ActivityScope.TEAM,
+                    after: {
+                        record_canvas: true,
+                    },
+                    field: 'session_replay_config',
+                    action: 'created',
+                    before: null,
+                },
+            ],
+            trigger: null,
+            short_id: null,
+        },
+        created_at: '2024-02-08T19:23:48.099540Z',
+    },
+    {
+        user: {
+            first_name: 'sdavasdadadsadas',
+            last_name: '',
+            email: 'paul@posthog.com',
+        },
+        unread: false,
+        is_staff: false,
+        is_system: false,
+        activity: 'updated',
+        item_id: '1',
+        scope: ActivityScope.TEAM,
+        detail: {
+            name: 'Default Project',
+            type: undefined,
+            merge: null,
+            changes: [
+                {
+                    type: ActivityScope.TEAM,
+                    after: true,
+                    field: 'capture_console_log_opt_in',
+                    action: 'changed',
+                    before: false,
+                },
+            ],
+            trigger: null,
+            short_id: null,
+        },
+        created_at: '2024-02-08T19:23:46.325979Z',
+    },
+    {
+        user: {
+            first_name: 'sdavasdadadsadas',
+            last_name: '',
+            email: 'paul@posthog.com',
+        },
+        unread: false,
+        is_staff: false,
+        is_system: false,
+        activity: 'updated',
+        item_id: '1',
+        scope: ActivityScope.TEAM,
+        detail: {
+            name: 'Default Project',
+            type: undefined,
+            merge: null,
+            changes: [
+                {
+                    type: ActivityScope.TEAM,
+                    after: false,
+                    field: 'capture_console_log_opt_in',
+                    action: 'changed',
+                    before: true,
+                },
+            ],
+            trigger: null,
+            short_id: null,
+        },
+        created_at: '2024-02-08T19:23:44.851511Z',
+    },
+]
+
 export const featureFlagsActivityResponseJson: ActivityLogItem[] = [
     {
         user: {
diff --git a/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx b/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
index aa4bdd1cdaaf8..4ba47decd2902 100644
--- a/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
+++ b/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
@@ -17,6 +17,7 @@ import { notebookActivityDescriber } from 'scenes/notebooks/Notebook/notebookAct
 import { personActivityDescriber } from 'scenes/persons/activityDescriptions'
 import { pluginActivityDescriber } from 'scenes/plugins/pluginActivityDescriptions'
 import { insightActivityDescriber } from 'scenes/saved-insights/activityDescriptions'
+import { teamActivityDescriber } from 'scenes/teamActivityDescriber'
 import { urls } from 'scenes/urls'
 
 import { ActivityScope } from '~/types'
@@ -44,6 +45,8 @@ export const describerFor = (logItem?: ActivityLogItem): Describer | undefined =
             return dataManagementActivityDescriber
         case ActivityScope.NOTEBOOK:
             return notebookActivityDescriber
+        case ActivityScope.TEAM:
+            return teamActivityDescriber
         default:
             return (logActivity, asNotification) => defaultDescriber(logActivity, asNotification)
     }
diff --git a/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx b/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
index d6c50cc8edea6..1ebe6bb27a29e 100644
--- a/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
+++ b/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
@@ -1,10 +1,10 @@
 import clsx from 'clsx'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { IconDelete, IconEdit, IconOpenInApp, IconPlus } from 'lib/lemon-ui/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
@@ -56,13 +56,13 @@ function AuthorizedUrlForm({ actionId, type }: AuthorizedUrlListProps): JSX.Elem
             enableFormOnSubmit
             className="w-full space-y-2"
         >
-            <Field name="url">
+            <LemonField name="url">
                 <LemonInput
                     autoFocus
                     placeholder="Enter a URL or wildcard subdomain (e.g. https://*.posthog.com)"
                     data-attr="url-input"
                 />
-            </Field>
+            </LemonField>
             <div className="flex justify-end gap-2">
                 <LemonButton type="secondary" onClick={cancelProposingUrl}>
                     Cancel
diff --git a/frontend/src/lib/components/BridgePage/BridgePage.scss b/frontend/src/lib/components/BridgePage/BridgePage.scss
index a4f2196df895a..a95676cd869fd 100644
--- a/frontend/src/lib/components/BridgePage/BridgePage.scss
+++ b/frontend/src/lib/components/BridgePage/BridgePage.scss
@@ -5,9 +5,8 @@
     display: flex;
     flex: 1;
     flex-direction: column;
-    height: 100%;
-    min-height: 100vh;
-    overflow: hidden;
+    height: 100vh;
+    overflow: scroll;
     background-color: var(--bg-bridge);
     -ms-overflow-style: none;
 
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss b/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
index 684a6d758d5d8..0a83c8efc683b 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightCard.scss
@@ -112,7 +112,7 @@
 
 .InsightDetails__footer {
     display: grid;
-    grid-template-columns: repeat(2, 1fr);
+    grid-template-columns: repeat(3, 1fr);
 
     .profile-package {
         vertical-align: middle;
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
index 35edef0444cba..f243636e08196 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
@@ -128,6 +128,8 @@ export interface InsightCardProps extends Resizeable, React.HTMLAttributes<HTMLD
     insight: InsightModel
     /** id of the dashboard the card is on (when the card is being displayed on a dashboard) **/
     dashboardId?: DashboardType['id']
+    /** Whether the insight has been called to load. */
+    loadingQueued?: boolean
     /** Whether the insight is loading. */
     loading?: boolean
     /** Whether an error occurred on the server. */
@@ -162,7 +164,7 @@ function VizComponentFallback(): JSX.Element {
 }
 
 export interface FilterBasedCardContentProps
-    extends Pick<InsightCardProps, 'insight' | 'loading' | 'apiErrored' | 'timedOut' | 'style'> {
+    extends Pick<InsightCardProps, 'insight' | 'loadingQueued' | 'loading' | 'apiErrored' | 'timedOut' | 'style'> {
     insightProps: InsightLogicProps
     tooFewFunnelSteps?: boolean
     validationError?: string | null
@@ -175,6 +177,7 @@ export interface FilterBasedCardContentProps
 export function FilterBasedCardContent({
     insight,
     insightProps,
+    loadingQueued,
     loading,
     setAreDetailsShown,
     apiErrored,
@@ -206,6 +209,7 @@ export function FilterBasedCardContent({
                 }
             >
                 {loading && <SpinnerOverlay />}
+                {loadingQueued && !loading && <SpinnerOverlay mode="waiting" />}
                 {tooFewFunnelSteps ? (
                     <FunnelSingleStepState actionable={false} />
                 ) : validationError ? (
@@ -229,6 +233,7 @@ function InsightCardInternal(
         insight,
         dashboardId,
         ribbonColor,
+        loadingQueued,
         loading,
         apiErrored,
         timedOut,
@@ -326,6 +331,7 @@ function InsightCardInternal(
                     <FilterBasedCardContent
                         insight={insight}
                         insightProps={insightLogicProps}
+                        loadingQueued={loadingQueued}
                         loading={loading}
                         apiErrored={apiErrored}
                         timedOut={timedOut}
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
index 66751fc6e2ffb..ffc72eae269cc 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
@@ -353,6 +353,14 @@ function InsightDetailsInternal({ insight }: { insight: InsightModel }, ref: Rea
                         <TZLabel time={insight.last_modified_at} />
                     </section>
                 </div>
+                {insight.last_refresh && (
+                    <div>
+                        <h5>Last computed</h5>
+                        <section>
+                            <TZLabel time={insight.last_refresh} />
+                        </section>
+                    </div>
+                )}
             </div>
         </div>
     )
diff --git a/frontend/src/lib/components/CodeEditor.scss b/frontend/src/lib/components/CodeEditor.scss
new file mode 100644
index 0000000000000..8a41a62c5d9ca
--- /dev/null
+++ b/frontend/src/lib/components/CodeEditor.scss
@@ -0,0 +1,8 @@
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents {
+    display: block !important;
+}
+
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left > .signature-label {
+    width: 100%;
+    text-align: right;
+}
diff --git a/frontend/src/lib/components/CodeEditors.tsx b/frontend/src/lib/components/CodeEditors.tsx
index 102b2da3d3c67..094d8d84340ef 100644
--- a/frontend/src/lib/components/CodeEditors.tsx
+++ b/frontend/src/lib/components/CodeEditors.tsx
@@ -1,3 +1,5 @@
+import './CodeEditor.scss'
+
 import MonacoEditor, { type EditorProps } from '@monaco-editor/react'
 import { useValues } from 'kea'
 import { Spinner } from 'lib/lemon-ui/Spinner'
diff --git a/frontend/src/lib/components/CommandBar/index.scss b/frontend/src/lib/components/CommandBar/index.scss
index c42b01543f804..85e6f6422f177 100644
--- a/frontend/src/lib/components/CommandBar/index.scss
+++ b/frontend/src/lib/components/CommandBar/index.scss
@@ -1,4 +1,4 @@
-.CommandBar__input {
+.LemonInput.CommandBar__input {
     height: 2.75rem;
     padding-right: 0.375rem;
     padding-left: 0.75rem;
diff --git a/frontend/src/lib/components/CommandPalette/DebugCHQueries.tsx b/frontend/src/lib/components/CommandPalette/DebugCHQueries.tsx
index 71cac99c617fc..6a56553aae0d1 100644
--- a/frontend/src/lib/components/CommandPalette/DebugCHQueries.tsx
+++ b/frontend/src/lib/components/CommandPalette/DebugCHQueries.tsx
@@ -157,7 +157,6 @@ function DebugCHQueries(): JSX.Element {
                 dataSource={filteredQueries}
                 loading={queriesLoading}
                 loadingSkeletonRows={5}
-                size="small"
                 pagination={undefined}
             />
         </>
diff --git a/frontend/src/lib/components/DateFilter/RollingDateRangeFilter.scss b/frontend/src/lib/components/DateFilter/RollingDateRangeFilter.scss
index 244d3ccc5c711..6ccb132efdc5f 100644
--- a/frontend/src/lib/components/DateFilter/RollingDateRangeFilter.scss
+++ b/frontend/src/lib/components/DateFilter/RollingDateRangeFilter.scss
@@ -1,7 +1,7 @@
 .RollingDateRangeFilter {
     display: flex;
     align-items: center;
-    height: 2rem;
+    height: 1.6875rem;
     min-height: 2rem;
     padding: 1.25rem 0.5rem;
     font-size: 0.875rem;
@@ -11,10 +11,6 @@
     cursor: pointer;
     transition: background 0.3s ease;
 
-    .posthog-3000 & {
-        height: 1.6875rem;
-    }
-
     &:hover {
         background-color: var(--mid);
     }
@@ -40,69 +36,47 @@
     box-sizing: border-box;
     display: flex;
     align-items: center;
-    height: 2rem;
+    height: 1.6875rem;
     margin: 0;
     margin-right: 0.25rem;
     margin-left: 0.25rem;
-    line-height: 1.25rem;
+    line-height: 1.5rem;
     background-color: var(--bg-light);
     border: 1px solid var(--border);
     border-radius: var(--radius);
 
-    .posthog-3000 & {
-        height: 1.6875rem;
-        line-height: 1.5rem;
-    }
-
     .LemonInput {
         width: 3rem;
+        height: unset;
         min-height: 0;
         padding: 0;
         border: none;
 
-        .posthog-3000 & {
-            height: unset;
-        }
-
         input {
             text-align: center;
         }
     }
 
     .RollingDateRangeFilter__counter__step {
-        padding: 0.25rem;
-        margin: 0 0.25rem;
-        border-radius: var(--radius);
+        width: 1.25rem;
+        height: 100%;
+        padding: 0;
+        margin: 0;
+        text-align: center;
+        border-radius: calc(var(--radius) - 1px);
 
         &:first-child {
-            .posthog-3000 & {
-                border-top-right-radius: 0;
-                border-bottom-right-radius: 0;
-            }
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
         }
 
         &:last-child {
-            .posthog-3000 & {
-                border-top-left-radius: 0;
-                border-bottom-left-radius: 0;
-            }
-        }
-
-        .posthog-3000 & {
-            width: 1.25rem;
-            height: 100%;
-            padding: 0;
-            margin: 0;
-            text-align: center;
-            border-radius: calc(var(--radius) - 1px);
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
         }
 
         &:hover {
-            background-color: var(--primary-highlight);
-
-            .posthog-3000 & {
-                background-color: var(--accent-3000);
-            }
+            background-color: var(--accent-3000);
         }
     }
 }
diff --git a/frontend/src/lib/components/DatePicker.scss b/frontend/src/lib/components/DatePicker.scss
index 083127c9dff86..43ecd38624633 100644
--- a/frontend/src/lib/components/DatePicker.scss
+++ b/frontend/src/lib/components/DatePicker.scss
@@ -1,130 +1,101 @@
 .ant-picker {
+    color: var(--default);
+    background: var(--lemon-button-bg-color);
+    border-color: var(--secondary-3000-button-border);
     box-shadow: none !important;
-}
 
-.posthog-3000 {
-    .ant-picker {
+    .ant-picker-suffix {
         color: var(--default);
-        background: var(--lemon-button-bg-color);
-        border-color: var(--secondary-3000-button-border);
-
-        .ant-picker-suffix {
-            color: var(--default);
-        }
     }
 
-    .ant-picker:hover {
+    &:hover {
         border-color: var(--secondary-3000-button-border-hover);
     }
+}
 
-    .ant-picker-panel-container {
-        color: var(--default);
-        background: var(--bg-3000);
-        border: 1px solid var(--border);
+.ant-picker-panel-container {
+    color: var(--default);
+    background: var(--bg-3000);
+    border: 1px solid var(--border);
 
-        * {
-            border-color: var(--border);
-        }
+    * {
+        border-color: var(--border);
     }
+}
 
-    .ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
-        background: var(--primary-highlight);
-    }
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
+    background: var(--primary-highlight);
 
-    .ant-picker-time-panel .ant-picker-time-panel-column:nth-child(3)::after {
-        // :HACKY: fix to keep the whole am/pm section in view
-        display: none;
+    [theme='dark'] & {
+        background: rgba(#f7a503, 0.4);
     }
+}
 
-    .ant-picker-cell .ant-picker-cell-inner {
-        border-radius: var(--radius);
-    }
+.ant-picker-time-panel .ant-picker-time-panel-column:nth-child(3)::after {
+    // :HACKY: fix to keep the whole am/pm section in view
+    display: none;
+}
 
-    .ant-picker-cell.ant-picker-cell-selected .ant-picker-cell-inner {
-        color: var(--default);
-        background: var(--primary-highlight);
-    }
+.ant-picker-cell .ant-picker-cell-inner {
+    border-radius: var(--radius);
+}
 
-    .ant-picker-cell.ant-picker-cell-today .ant-picker-cell-inner::before {
-        background: none;
-        border-color: var(--text-secondary-3000);
-    }
+.ant-picker-cell.ant-picker-cell-selected .ant-picker-cell-inner {
+    color: var(--default);
+    background: var(--primary-highlight);
 
-    .ant-picker-cell:hover:not(
-            .ant-picker-cell-selected,
-            .ant-picker-cell-range-start,
-            .ant-picker-cell-range-end,
-            .ant-picker-cell-range-hover-start,
-            .ant-picker-cell-range-hover-end
-        )
-        .ant-picker-cell-inner {
-        background: var(--secondary-3000);
+    [theme='dark'] & {
+        color: var(--default);
+        background: rgba(#f7a503, 0.4);
     }
+}
 
-    .ant-picker-cell:hover:not(.ant-picker-cell-in-view) .ant-picker-cell-inner,
-    .ant-picker-cell:hover:not(
-            .ant-picker-cell-today,
-            .ant-picker-cell-selected,
-            .ant-picker-cell-range-start,
-            .ant-picker-cell-range-end,
-            .ant-picker-cell-range-hover-start,
-            .ant-picker-cell-range-hover-end
-        )
-        .ant-picker-cell-inner,
-    .ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover {
-        background: var(--secondary-3000);
-    }
+.ant-picker-cell.ant-picker-cell-today .ant-picker-cell-inner::before {
+    background: none;
+    border-color: var(--text-secondary-3000);
 
-    .ant-picker-footer .ant-btn-primary {
-        color: var(--primary);
-        text-shadow: none;
+    [theme='dark'] & {
         background: none;
-        border-color: var(--primary);
-        border-radius: 0.25rem;
-        box-shadow: none;
-    }
-
-    .ant-picker-footer .ant-btn-primary:not(:disabled):hover {
-        color: #fff;
-        background: var(--primary);
-    }
-
-    .ant-picker-footer .ant-picker-now-btn:hover {
-        color: var(--primary);
-    }
-
-    .ant-picker-ok .ant-btn-primary span {
-        text-transform: uppercase;
+        border-color: var(--text-secondary-3000);
     }
 }
 
-.posthog-3000[theme='dark'] {
-    .ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
-        background: rgba(#f7a503, 0.4);
-    }
-
-    .ant-picker-cell:hover:not(
-            .ant-picker-cell-selected,
-            .ant-picker-cell-range-start,
-            .ant-picker-cell-range-end,
-            .ant-picker-cell-range-hover-start,
-            .ant-picker-cell-range-hover-end
-        )
-        .ant-picker-cell-inner {
+.ant-picker-cell:hover:not(.ant-picker-cell-in-view) .ant-picker-cell-inner,
+.ant-picker-cell:hover:not(
+        .ant-picker-cell-today,
+        .ant-picker-cell-selected,
+        .ant-picker-cell-range-start,
+        .ant-picker-cell-range-end,
+        .ant-picker-cell-range-hover-start,
+        .ant-picker-cell-range-hover-end
+    )
+    .ant-picker-cell-inner,
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover {
+    background: var(--secondary-3000);
+
+    [theme='dark'] & {
         background: var(--muted-3000-dark);
     }
+}
 
-    .ant-picker-cell.ant-picker-cell-selected .ant-picker-cell-inner {
-        color: var(--default);
-        background: rgba(#f7a503, 0.4);
-    }
+.ant-picker-footer .ant-btn-primary {
+    color: var(--primary);
+    text-shadow: none;
+    background: none;
+    border-color: var(--primary);
+    border-radius: 0.25rem;
+    box-shadow: none;
+}
 
-    .ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover {
-        background: var(--muted-3000-dark);
-    }
+.ant-picker-footer .ant-btn-primary:not(:disabled):hover {
+    color: #fff;
+    background: var(--primary);
+}
 
-    .ant-picker-cell.ant-picker-cell-today .ant-picker-cell-inner::before {
-        background: none;
-        border-color: var(--text-secondary-3000);
-    }
+.ant-picker-footer .ant-picker-now-btn:hover {
+    color: var(--primary);
+}
+
+.ant-picker-ok .ant-btn-primary span {
+    text-transform: uppercase;
 }
diff --git a/frontend/src/lib/components/HelpButton/HelpButton.tsx b/frontend/src/lib/components/HelpButton/HelpButton.tsx
index 15cb15f1407d4..e5c56a1bc7884 100644
--- a/frontend/src/lib/components/HelpButton/HelpButton.tsx
+++ b/frontend/src/lib/components/HelpButton/HelpButton.tsx
@@ -9,12 +9,10 @@ import {
     IconBugReport,
     IconFeedback,
     IconHelpOutline,
-    IconMessages,
     IconQuestionAnswer,
     IconSupport,
 } from 'lib/lemon-ui/icons'
 import { LemonMenu } from 'lib/lemon-ui/LemonMenu'
-import { DefaultAction, inAppPromptLogic } from 'lib/logic/inAppPrompt/inAppPromptLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
@@ -83,9 +81,6 @@ export function HelpButton({
     const { reportHelpButtonUsed } = useActions(eventUsageLogic)
     const { isHelpVisible } = useValues(helpButtonLogic({ key: customKey }))
     const { toggleHelp, hideHelp } = useActions(helpButtonLogic({ key: customKey }))
-    const { validProductTourSequences } = useValues(inAppPromptLogic)
-    const { runFirstValidSequence, promptAction } = useActions(inAppPromptLogic)
-    const { isPromptVisible } = useValues(inAppPromptLogic)
     const { openSupportForm } = useActions(supportLogic)
     const { isCloudOrDev } = useValues(preflightLogic)
 
@@ -152,18 +147,6 @@ export function HelpButton({
                                 to: `https://posthog.com/docs${HELP_UTM_TAGS}`,
                                 targetBlank: true,
                             },
-                            validProductTourSequences.length > 0 && {
-                                label: isPromptVisible ? 'Stop tutorial' : 'Explain this page',
-                                icon: <IconMessages />,
-                                onClick: () => {
-                                    if (isPromptVisible) {
-                                        promptAction(DefaultAction.SKIP)
-                                    } else {
-                                        runFirstValidSequence({ runDismissedOrCompleted: true })
-                                    }
-                                    hideHelp()
-                                },
-                            },
                         ],
                     },
                 ]}
diff --git a/frontend/src/lib/components/NotFound/index.tsx b/frontend/src/lib/components/NotFound/index.tsx
index f1360ca38c88d..f1bc3cc9a3c2c 100644
--- a/frontend/src/lib/components/NotFound/index.tsx
+++ b/frontend/src/lib/components/NotFound/index.tsx
@@ -21,20 +21,16 @@ export function NotFound({ object, caption }: NotFoundProps): JSX.Element {
     const nodeLogic = useNotebookNode()
 
     return (
-        <div className="NotFoundComponent space-y-2">
+        <div className="NotFoundComponent">
             {!nodeLogic ? <div className="NotFoundComponent__graphic" /> : null}
-            <h1>{capitalizeFirstLetter(object)} not found</h1>
-            {!nodeLogic ? (
-                <p>
-                    <b>It seems this {object} may have been lost in space.</b>
-                </p>
-            ) : null}
-
-            <p>
+            <h1 className="text-3xl font-bold mt-4 mb-0">{capitalizeFirstLetter(object)} not found</h1>
+            {!nodeLogic ? <p className="text-sm font-semibold italic mt-3 mb-0">It might be lost in space.</p> : null}
+            <p className="text-sm mt-3 mb-0">
                 {caption || (
                     <>
-                        It's possible this {object} may have been deleted or its sharing settings changed. Please check
-                        with the person who sent you here
+                        It's possible this {object} has been deleted or its sharing settings have changed.
+                        <br />
+                        Please check with the person who sent you here
                         {preflight?.cloud ? (
                             <>
                                 , or <Link onClick={() => openSupportForm({ kind: 'support' })}>contact support</Link>{' '}
@@ -45,13 +41,13 @@ export function NotFound({ object, caption }: NotFoundProps): JSX.Element {
                     </>
                 )}
             </p>
-            <div className="flex justify-center">
-                {nodeLogic && (
+            {nodeLogic && (
+                <div className="flex justify-center mt-4">
                     <LemonButton type="secondary" status="danger" onClick={nodeLogic.actions.deleteNode}>
                         Remove from Notebook
                     </LemonButton>
-                )}
-            </div>
+                </div>
+            )}
         </div>
     )
 }
diff --git a/frontend/src/lib/components/PropertiesTable/PropertiesTable.scss b/frontend/src/lib/components/PropertiesTable/PropertiesTable.scss
index d219c76b01c8f..d1f0ae7c48181 100644
--- a/frontend/src/lib/components/PropertiesTable/PropertiesTable.scss
+++ b/frontend/src/lib/components/PropertiesTable/PropertiesTable.scss
@@ -22,21 +22,15 @@
     }
 
     .editable {
-        text-decoration: underline dotted;
-        text-decoration-color: var(--primary-3000);
+        padding: 0.125rem 0.25rem;
+        margin-left: -0.25rem;
         cursor: pointer;
+        border: 1px solid transparent;
+        border-radius: calc(var(--radius) * 0.75);
 
-        .posthog-3000 & {
-            padding: 0.125rem 0.25rem;
-            margin-left: -0.25rem;
-            text-decoration: none;
-            border: 1px solid transparent;
-            border-radius: calc(var(--radius) * 0.75);
-
-            &:hover {
-                background: var(--bg-light);
-                border: 1px solid var(--border-light);
-            }
+        &:hover {
+            background: var(--bg-light);
+            border: 1px solid var(--border-light);
         }
     }
 }
diff --git a/frontend/src/lib/components/PropertiesTable/PropertiesTable.stories.tsx b/frontend/src/lib/components/PropertiesTable/PropertiesTable.stories.tsx
index 732ff6542b17b..440000f5200b5 100644
--- a/frontend/src/lib/components/PropertiesTable/PropertiesTable.stories.tsx
+++ b/frontend/src/lib/components/PropertiesTable/PropertiesTable.stories.tsx
@@ -10,7 +10,7 @@ const meta: Meta<typeof PropertiesTableComponent> = {
 }
 export default meta
 
-export const PropertiesTable: StoryFn = () => {
+export const Basic: StoryFn = () => {
     const properties = {
         name: 'John Doe',
         age: 30,
@@ -25,3 +25,36 @@ export const PropertiesTable: StoryFn = () => {
     }
     return <PropertiesTableComponent type={PropertyDefinitionType.Event} properties={properties} />
 }
+
+export const DollarPropertiesOnEvent: StoryFn = () => {
+    const properties = {
+        pineapple_enjoyment_score: 3,
+        $browser: 'Chrome',
+        utm_campaign: 'summer_sale',
+        $geoip_country_code: 'US',
+        $set: {
+            $browser: 'Chrome',
+            utm_campaign: 'summer_sale',
+            $geoip_country_code: 'US',
+        },
+        $set_once: {
+            $initial_browser: 'Chrome',
+            $initial_utm_campaign: 'summer_sale',
+            $initial_geoip_country_code: 'US',
+        },
+    }
+    return <PropertiesTableComponent type={PropertyDefinitionType.Event} properties={properties} />
+}
+
+export const DollarPropertiesOnPerson: StoryFn = () => {
+    const properties = {
+        pineapple_enjoyment_score: 3,
+        $browser: 'Chrome',
+        utm_campaign: 'summer_sale',
+        $geoip_country_code: 'US',
+        $initial_browser: 'Chrome',
+        $initial_utm_campaign: 'summer_sale',
+        $initial_geoip_country_code: 'US',
+    }
+    return <PropertiesTableComponent type={PropertyDefinitionType.Person} properties={properties} />
+}
diff --git a/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx b/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx
index c867e11eae87e..563ab6b8f370a 100644
--- a/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx
+++ b/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx
@@ -22,6 +22,7 @@ import { PropertyDefinitionType, PropertyType } from '~/types'
 import { CopyToClipboardInline } from '../CopyToClipboard'
 import { PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE } from '../PropertyFilters/utils'
 import { PropertyKeyInfo } from '../PropertyKeyInfo'
+import { TaxonomicFilterGroupType } from '../TaxonomicFilter/types'
 
 type HandledType = 'string' | 'number' | 'bigint' | 'boolean' | 'undefined' | 'null'
 type Type = HandledType | 'symbol' | 'object' | 'function'
@@ -293,7 +294,11 @@ export function PropertiesTable({
                         <div className="properties-table-key">
                             <PropertyKeyInfo
                                 value={item[0]}
-                                type={PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE[type]}
+                                type={
+                                    rootKey && type === 'event' && ['$set', '$set_once'].includes(rootKey)
+                                        ? TaxonomicFilterGroupType.PersonProperties
+                                        : PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE[type]
+                                }
                             />
                         </div>
                     )
@@ -397,7 +402,6 @@ export function PropertiesTable({
                 <LemonTable
                     columns={columns}
                     showHeader={!embedded}
-                    size="small"
                     rowKey="0"
                     embedded={embedded}
                     dataSource={objectProperties}
diff --git a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
index b78e0aeedb8ac..c89f39145e278 100644
--- a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
+++ b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.scss
@@ -16,7 +16,7 @@
 
     &:hover,
     &:focus {
-        border-color: var(--border);
+        border-color: var(--border-bold);
     }
 
     &:not(.PropertyFilterButton--clickable) {
@@ -53,16 +53,3 @@
         padding: 0 4px !important;
     }
 }
-
-.posthog-3000 {
-    .PropertyFilterButton {
-        &:hover,
-        &:focus {
-            border-color: var(--border-bold);
-        }
-
-        &:not(.PropertyFilterButton--clickable) {
-            border-color: transparent;
-        }
-    }
-}
diff --git a/frontend/src/lib/components/Sharing/SharingModal.tsx b/frontend/src/lib/components/Sharing/SharingModal.tsx
index 248b983ac0812..961a8c5adba11 100644
--- a/frontend/src/lib/components/Sharing/SharingModal.tsx
+++ b/frontend/src/lib/components/Sharing/SharingModal.tsx
@@ -6,9 +6,9 @@ import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
 import { TitleWithIcon } from 'lib/components/TitleWithIcon'
-import { Field } from 'lib/forms/Field'
 import { IconGlobeLock, IconInfo, IconLink, IconLock, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
@@ -138,7 +138,7 @@ export function SharingModalContent({
                             </div>
 
                             <Form logic={sharingLogic} props={logicProps} formKey="embedConfig" className="space-y-2">
-                                <Field name="whitelabel">
+                                <LemonField name="whitelabel">
                                     {({ value, onChange }) => (
                                         <LemonSwitch
                                             fullWidth
@@ -158,9 +158,9 @@ export function SharingModalContent({
                                             disabled={!whitelabelAvailable}
                                         />
                                     )}
-                                </Field>
+                                </LemonField>
                                 {insight && (
-                                    <Field name="noHeader">
+                                    <LemonField name="noHeader">
                                         {({ value, onChange }) => (
                                             <LemonSwitch
                                                 fullWidth
@@ -170,10 +170,10 @@ export function SharingModalContent({
                                                 checked={!value}
                                             />
                                         )}
-                                    </Field>
+                                    </LemonField>
                                 )}
                                 {showLegendCheckbox && (
-                                    <Field name="legend">
+                                    <LemonField name="legend">
                                         {({ value, onChange }) => (
                                             <LemonSwitch
                                                 fullWidth
@@ -183,10 +183,10 @@ export function SharingModalContent({
                                                 checked={value}
                                             />
                                         )}
-                                    </Field>
+                                    </LemonField>
                                 )}
                                 {recordingId && (
-                                    <Field name="showInspector">
+                                    <LemonField name="showInspector">
                                         {({ value, onChange }) => (
                                             <LemonSwitch
                                                 fullWidth
@@ -196,7 +196,7 @@ export function SharingModalContent({
                                                 checked={value}
                                             />
                                         )}
-                                    </Field>
+                                    </LemonField>
                                 )}
 
                                 {previewIframe && (
diff --git a/frontend/src/lib/components/SignupReferralSource.tsx b/frontend/src/lib/components/SignupReferralSource.tsx
index c56ff9931b7ff..053bbaeec04f1 100644
--- a/frontend/src/lib/components/SignupReferralSource.tsx
+++ b/frontend/src/lib/components/SignupReferralSource.tsx
@@ -1,15 +1,15 @@
 import { LemonInput } from '@posthog/lemon-ui'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 export default function SignupReferralSource({ disabled }: { disabled: boolean }): JSX.Element {
     return (
-        <Field name="referral_source" label="Where did you hear about us?" showOptional>
+        <LemonField name="referral_source" label="Where did you hear about us?" showOptional>
             <LemonInput
                 className="ph-ignore-input"
                 data-attr="signup-referral-source"
                 placeholder=""
                 disabled={disabled}
             />
-        </Field>
+        </LemonField>
     )
 }
diff --git a/frontend/src/lib/components/SignupRoleSelect.tsx b/frontend/src/lib/components/SignupRoleSelect.tsx
index 4cf324f001d00..555c74181d9db 100644
--- a/frontend/src/lib/components/SignupRoleSelect.tsx
+++ b/frontend/src/lib/components/SignupRoleSelect.tsx
@@ -1,9 +1,9 @@
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
 
 export default function SignupRoleSelect({ className }: { className?: string }): JSX.Element {
     return (
-        <Field name="role_at_organization" label="What is your role?" className={className} showOptional>
+        <LemonField name="role_at_organization" label="What is your role?" className={className} showOptional>
             <LemonSelect
                 fullWidth
                 data-attr="signup-role-at-organization"
@@ -38,6 +38,6 @@ export default function SignupRoleSelect({ className }: { className?: string }):
                     },
                 ]}
             />
-        </Field>
+        </LemonField>
     )
 }
diff --git a/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx b/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
index 73fa88690a689..2002aa16d6318 100644
--- a/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
+++ b/frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx
@@ -1,13 +1,13 @@
-import { LemonDivider, LemonInput, LemonTextArea, Link } from '@posthog/lemon-ui'
+import { LemonInput, LemonTextArea, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { UserActivityIndicator } from 'lib/components/UserActivityIndicator/UserActivityIndicator'
 import { usersLemonSelectOptions } from 'lib/components/UserSelectItem'
 import { dayjs } from 'lib/dayjs'
-import { Field } from 'lib/forms/Field'
 import { IconChevronLeft } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
@@ -105,12 +105,8 @@ export function EditSubscription({
             className="LemonModal__layout"
         >
             <LemonModal.Header>
-                <div className="flex items-center">
-                    <LemonButton onClick={onCancel} size="small">
-                        <IconChevronLeft fontSize="1rem" />
-                        Back
-                    </LemonButton>
-                    <LemonDivider vertical />
+                <div className="flex items-center gap-2">
+                    <LemonButton icon={<IconChevronLeft />} onClick={onCancel} size="xsmall" />
 
                     <h3>{id === 'new' ? 'New' : 'Edit '} Subscription</h3>
                 </div>
@@ -170,13 +166,13 @@ export function EditSubscription({
                             </LemonBanner>
                         )}
 
-                        <Field name="title" label="Name">
+                        <LemonField name="title" label="Name">
                             <LemonInput placeholder="e.g. Weekly team report" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="target_type" label="Destination">
+                        <LemonField name="target_type" label="Destination">
                             <LemonSelect options={targetTypeOptions} />
-                        </Field>
+                        </LemonField>
 
                         {subscription.target_type === 'email' ? (
                             <>
@@ -197,7 +193,7 @@ export function EditSubscription({
                                     </LemonBanner>
                                 )}
 
-                                <Field
+                                <LemonField
                                     name="target_value"
                                     label="Who do you want to subscribe"
                                     help="Enter the email addresses of the users you want to share with"
@@ -214,11 +210,11 @@ export function EditSubscription({
                                             placeholder="Enter an email address"
                                         />
                                     )}
-                                </Field>
+                                </LemonField>
 
-                                <Field name="invite_message" label="Message" showOptional>
+                                <LemonField name="invite_message" label="Message" showOptional>
                                     <LemonTextArea placeholder="Your message to new subscribers (optional)" />
-                                </Field>
+                                </LemonField>
                             </>
                         ) : null}
 
@@ -266,7 +262,7 @@ export function EditSubscription({
                                     </>
                                 ) : (
                                     <>
-                                        <Field
+                                        <LemonField
                                             name="target_value"
                                             label="Which Slack channel to send reports to"
                                             help={
@@ -293,10 +289,10 @@ export function EditSubscription({
                                                     loading={slackChannelsLoading}
                                                 />
                                             )}
-                                        </Field>
+                                        </LemonField>
 
                                         {showSlackMembershipWarning ? (
-                                            <Field name="memberOfSlackChannel">
+                                            <LemonField name="memberOfSlackChannel">
                                                 <LemonBanner type="info">
                                                     <div className="flex gap-2 items-center">
                                                         <span>
@@ -319,7 +315,7 @@ export function EditSubscription({
                                                         </LemonButton>
                                                     </div>
                                                 </LemonBanner>
-                                            </Field>
+                                            </LemonField>
                                         ) : null}
                                     </>
                                 )}
@@ -328,9 +324,9 @@ export function EditSubscription({
 
                         {subscription.target_type === 'webhook' ? (
                             <>
-                                <Field name="target_value" label="Webhook URL">
+                                <LemonField name="target_value" label="Webhook URL">
                                     <LemonInput placeholder="https://example.com/webhooks/1234" />
-                                </Field>
+                                </LemonField>
                                 <div className="text-xs text-muted mt-2">
                                     Webhooks will be called with a HTTP POST request. The webhook endpoint should
                                     respond with a healthy HTTP code (2xx).
@@ -342,10 +338,10 @@ export function EditSubscription({
                             <LemonLabel className="mb-2">Recurrence</LemonLabel>
                             <div className="flex gap-2 items-center rounded border p-2 flex-wrap">
                                 <span>Send every</span>
-                                <Field name="interval">
+                                <LemonField name="interval">
                                     <LemonSelect options={intervalOptions} />
-                                </Field>
-                                <Field name="frequency">
+                                </LemonField>
+                                <LemonField name="frequency">
                                     <LemonSelect
                                         options={
                                             subscription.interval === 1
@@ -353,12 +349,12 @@ export function EditSubscription({
                                                 : frequencyOptionsPlural
                                         }
                                     />
-                                </Field>
+                                </LemonField>
 
                                 {subscription.frequency === 'weekly' && (
                                     <>
                                         <span>on</span>
-                                        <Field name="byweekday">
+                                        <LemonField name="byweekday">
                                             {({ value, onChange }) => (
                                                 <LemonSelect
                                                     options={weekdayOptions}
@@ -366,14 +362,14 @@ export function EditSubscription({
                                                     onChange={(val) => onChange([val])}
                                                 />
                                             )}
-                                        </Field>
+                                        </LemonField>
                                     </>
                                 )}
 
                                 {subscription.frequency === 'monthly' && (
                                     <>
                                         <span>on the</span>
-                                        <Field name="bysetpos">
+                                        <LemonField name="bysetpos">
                                             {({ value, onChange }) => (
                                                 <LemonSelect
                                                     options={bysetposOptions}
@@ -383,8 +379,8 @@ export function EditSubscription({
                                                     }}
                                                 />
                                             )}
-                                        </Field>
-                                        <Field name="byweekday">
+                                        </LemonField>
+                                        <LemonField name="byweekday">
                                             {({ value, onChange }) => (
                                                 <LemonSelect
                                                     dropdownMatchSelectWidth={false}
@@ -400,11 +396,11 @@ export function EditSubscription({
                                                     }
                                                 />
                                             )}
-                                        </Field>
+                                        </LemonField>
                                     </>
                                 )}
                                 <span>by</span>
-                                <Field name="start_date">
+                                <LemonField name="start_date">
                                     {({ value, onChange }) => (
                                         <LemonSelect
                                             options={timeOptions}
@@ -420,7 +416,7 @@ export function EditSubscription({
                                             }}
                                         />
                                     )}
-                                </Field>
+                                </LemonField>
                             </div>
                         </div>
                     </>
diff --git a/frontend/src/lib/components/Support/SupportForm.tsx b/frontend/src/lib/components/Support/SupportForm.tsx
index b33bab9974cf0..585d4a07b0cdc 100644
--- a/frontend/src/lib/components/Support/SupportForm.tsx
+++ b/frontend/src/lib/components/Support/SupportForm.tsx
@@ -1,12 +1,20 @@
-import { LemonInput, LemonSegmentedButton, LemonSegmentedButtonOption, lemonToast, Link } from '@posthog/lemon-ui'
+import {
+    LemonBanner,
+    LemonInput,
+    LemonSegmentedButton,
+    LemonSegmentedButtonOption,
+    lemonToast,
+    Link,
+} from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { useUploadFiles } from 'lib/hooks/useUploadFiles'
 import { IconBugReport, IconFeedback, IconHelpOutline } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonFileInput } from 'lib/lemon-ui/LemonFileInput/LemonFileInput'
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect/LemonSelect'
 import { LemonTextArea } from 'lib/lemon-ui/LemonTextArea/LemonTextArea'
+import posthog from 'posthog-js'
 import { useEffect, useRef } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { userLogic } from 'scenes/userLogic'
@@ -73,27 +81,62 @@ export function SupportForm(): JSX.Element | null {
         >
             {!user && (
                 <>
-                    <Field name="name" label="Name">
+                    <LemonField name="name" label="Name">
                         <LemonInput data-attr="name" placeholder="Jane" />
-                    </Field>
-                    <Field name="email" label="Email">
+                    </LemonField>
+                    <LemonField name="email" label="Email">
                         <LemonInput data-attr="email" placeholder="your@email.com" />
-                    </Field>
+                    </LemonField>
                 </>
             )}
-            <Field name="kind" label="What type of message is this?">
+            <LemonField name="kind" label="What type of message is this?">
                 <LemonSegmentedButton fullWidth options={SUPPORT_TICKET_OPTIONS} />
-            </Field>
-            <Field name="target_area" label="What area does this best relate to?">
+            </LemonField>
+            <LemonField name="target_area" label="What area does this best relate to?">
                 <LemonSelect
                     fullWidth
                     options={Object.entries(TARGET_AREA_TO_NAME).map(([key, value]) => ({
                         label: value,
                         value: key,
+                        'data-attr': `support-form-target-area-${key}`,
                     }))}
                 />
-            </Field>
-            <Field name="severity_level" label="What is the severity of this issue?">
+            </LemonField>
+            {posthog.getFeatureFlag('show-troubleshooting-docs-in-support-form') === 'test-replay-banner' &&
+                sendSupportRequest.target_area === 'session_replay' && (
+                    <LemonBanner type="info">
+                        <>
+                            We're pretty proud of our docs. Check out these helpful links:
+                            <ul>
+                                <li>
+                                    <Link target="_blank" to="https://posthog.com/docs/session-replay/troubleshooting">
+                                        Session replay troubleshooting
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link
+                                        target="_blank"
+                                        to="https://posthog.com/docs/session-replay/how-to-control-which-sessions-you-record"
+                                    >
+                                        How to control which sessions you record
+                                    </Link>
+                                </li>
+                            </ul>
+                        </>
+                    </LemonBanner>
+                )}
+            {posthog.getFeatureFlag('show-troubleshooting-docs-in-support-form') === 'test-replay-banner' &&
+                sendSupportRequest.target_area === 'toolbar' && (
+                    <LemonBanner type="info">
+                        <>
+                            We're pretty proud of our docs.{' '}
+                            <Link target="_blank" to="https://posthog.com/docs/toolbar#troubleshooting-and-faq">
+                                Check out this troubleshooting guide
+                            </Link>
+                        </>
+                    </LemonBanner>
+                )}
+            <LemonField name="severity_level" label="What is the severity of this issue?">
                 <LemonSelect
                     fullWidth
                     options={Object.entries(SEVERITY_LEVEL_TO_NAME).map(([key, value]) => ({
@@ -101,7 +144,7 @@ export function SupportForm(): JSX.Element | null {
                         value: key,
                     }))}
                 />
-            </Field>
+            </LemonField>
             <span className="text-muted">
                 Check out the{' '}
                 <Link target="_blank" to="https://posthog.com/docs/support-options#severity-levels">
@@ -109,7 +152,7 @@ export function SupportForm(): JSX.Element | null {
                 </Link>
                 .
             </span>
-            <Field
+            <LemonField
                 name="message"
                 label={sendSupportRequest.kind ? SUPPORT_TICKET_KIND_TO_PROMPT[sendSupportRequest.kind] : 'Content'}
             >
@@ -132,7 +175,7 @@ export function SupportForm(): JSX.Element | null {
                         )}
                     </div>
                 )}
-            </Field>
+            </LemonField>
         </Form>
     )
 }
diff --git a/frontend/src/lib/components/TaxonomicFilter/InfiniteList.scss b/frontend/src/lib/components/TaxonomicFilter/InfiniteList.scss
index 5c4d5c0d5fedc..727a7761b4fdd 100644
--- a/frontend/src/lib/components/TaxonomicFilter/InfiniteList.scss
+++ b/frontend/src/lib/components/TaxonomicFilter/InfiniteList.scss
@@ -66,12 +66,8 @@
         }
 
         &.hover {
-            background-color: var(--primary-bg-hover);
+            background-color: var(--bg-3000);
             border-radius: var(--radius);
-
-            .posthog-3000 & {
-                background-color: var(--bg-3000);
-            }
         }
 
         &.selected {
diff --git a/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx b/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
index e3e4226744377..c8a5f2f5ac094 100644
--- a/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
+++ b/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
@@ -1,6 +1,6 @@
 import { HandleUnitChange } from 'lib/components/UnitPicker/UnitPicker'
-import { PureField } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { capitalizeFirstLetter } from 'lib/utils'
@@ -72,7 +72,7 @@ export function CustomUnitModal({
                 </>
             }
         >
-            <PureField
+            <LemonField.Pure
                 label={`${capitalizeFirstLetter(formativeElement)}:`}
                 help={
                     <>
@@ -87,7 +87,7 @@ export function CustomUnitModal({
                 }
             >
                 <LemonInput value={localFormativeElementValue} onChange={setLocalFormativeElementValue} autoFocus />
-            </PureField>
+            </LemonField.Pure>
         </LemonModal>
     )
 }
diff --git a/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts b/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
index 4c6a518575cdf..cc26d0eff45fc 100644
--- a/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
+++ b/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
@@ -76,7 +76,8 @@ export const versionCheckerLogic = kea<versionCheckerLogicType>([
         ],
         versionWarning: [
             null as SDKVersionWarning | null,
-            { persist: true },
+            // bumping cache key due to an incorrect tag being cached on 2024-02-12
+            { persist: true, prefix: '2024-02-12' },
             {
                 setVersionWarning: (_, { versionWarning }) => versionWarning,
             },
diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index cdafc82f8a9c5..b0201f08e2f86 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -147,7 +147,6 @@ export const FEATURE_FLAGS = {
     QUERY_TIMINGS: 'query-timings', // owner: @mariusandra
     QUERY_ASYNC: 'query-async', // owner: @webjunkie
     POSTHOG_3000_NAV: 'posthog-3000-nav', // owner: @Twixes
-    POSTHOG_3000_WELCOME_ANNOUNCEMENT: 'posthog-3000-welcome-announcement', // owner: #posthog-3000
     ENABLE_PROMPTS: 'enable-prompts', // owner: @lharries
     HEDGEHOG_MODE: 'hedgehog-mode', // owner: @benjackwhite
     HEDGEHOG_MODE_DEBUG: 'hedgehog-mode-debug', // owner: @benjackwhite
diff --git a/frontend/src/lib/forms/Errors.tsx b/frontend/src/lib/forms/Errors.tsx
deleted file mode 100644
index 5dcbb4c786e4a..0000000000000
--- a/frontend/src/lib/forms/Errors.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-export interface FormErrorsProps {
-    errors: Record<string, any>
-}
-export function FormErrors({ errors }: FormErrorsProps): JSX.Element {
-    return (
-        <>
-            {Object.entries(errors)
-                .filter(([, error]) => !!error)
-                .map(([key, error]) => (
-                    <div key={key}>
-                        <strong>{key}: </strong>
-                        <span>{typeof error === 'object' ? <FormErrors errors={error} /> : String(error)}</span>
-                    </div>
-                ))}
-        </>
-    )
-}
diff --git a/frontend/src/lib/lemon-ui/LemonCalendar/LemonCalendar.scss b/frontend/src/lib/lemon-ui/LemonCalendar/LemonCalendar.scss
index 6613a79bde94f..ed6baaf7e8955 100644
--- a/frontend/src/lib/lemon-ui/LemonCalendar/LemonCalendar.scss
+++ b/frontend/src/lib/lemon-ui/LemonCalendar/LemonCalendar.scss
@@ -47,9 +47,7 @@
         }
     }
 
-    .posthog-3000 & {
-        .LemonCalendar__range--boundary {
-            background-color: var(--glass-border-3000);
-        }
+    .LemonCalendar__range--boundary {
+        background-color: var(--glass-border-3000);
     }
 }
diff --git a/frontend/src/lib/lemon-ui/LemonCheckbox/LemonCheckbox.scss b/frontend/src/lib/lemon-ui/LemonCheckbox/LemonCheckbox.scss
index 6b64da3a4091f..d83d4f5e898c1 100644
--- a/frontend/src/lib/lemon-ui/LemonCheckbox/LemonCheckbox.scss
+++ b/frontend/src/lib/lemon-ui/LemonCheckbox/LemonCheckbox.scss
@@ -13,7 +13,7 @@
 
     label {
         --tick-length: 12.73; // Approximation of tick length, which is (3 + 6) * sqrt(2)
-        --box-color: var(--primary);
+        --box-color: var(--primary-3000);
 
         display: flex;
         gap: 0.5rem;
@@ -21,23 +21,15 @@
         min-height: 1.5rem;
         cursor: pointer;
 
-        .posthog-3000 & {
-            --box-color: var(--primary-3000);
-        }
-
         > .LemonCheckbox__box {
             flex-shrink: 0;
             width: 1rem;
             height: 1rem;
             background: var(--bg-light);
             border: 1.5px solid var(--border-bold);
-            border-radius: 0.1875rem; // Intentionally a bit smaller than --radius
+            border-radius: 0.25rem; // Intentionally a bit smaller than --radius
             transition: border 200ms ease, background 200ms ease;
 
-            &.posthog-3000 {
-                border-radius: 0.25rem; // Intentionally a bit smaller than --radius
-            }
-
             path {
                 stroke: var(--bg-light);
                 stroke-dasharray: var(--tick-length);
diff --git a/frontend/src/lib/lemon-ui/LemonCollapse/LemonCollapse.scss b/frontend/src/lib/lemon-ui/LemonCollapse/LemonCollapse.scss
index 72c00bb67513a..f5b6972d48465 100644
--- a/frontend/src/lib/lemon-ui/LemonCollapse/LemonCollapse.scss
+++ b/frontend/src/lib/lemon-ui/LemonCollapse/LemonCollapse.scss
@@ -24,7 +24,7 @@
     font-weight: 500 !important; // Override status="stealth"'s font-weight
     border-radius: 0 !important;
 
-    .posthog-3000 &.LemonButton:active {
+    &.LemonButton:active {
         transform: inherit;
     }
 }
@@ -33,12 +33,9 @@
     box-sizing: content-box;
     height: 0;
     overflow: hidden;
+    background: var(--bg-light);
     border-top-width: 1px;
     transition: height 200ms ease;
-
-    .posthog-3000 & {
-        background: var(--bg-light);
-    }
 }
 
 .LemonCollapsePanel__content {
diff --git a/frontend/src/lib/forms/Field.stories.tsx b/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
similarity index 84%
rename from frontend/src/lib/forms/Field.stories.tsx
rename to frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
index 4f13055dccb13..34a25ffa50243 100644
--- a/frontend/src/lib/forms/Field.stories.tsx
+++ b/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
@@ -3,12 +3,12 @@ import { Meta } from '@storybook/react'
 import { kea, path, useAllValues } from 'kea'
 import { Form, forms } from 'kea-forms'
 
-import { Field, PureField } from './Field'
-import type { formLogicType } from './Field.storiesType'
+import { LemonField } from './LemonField'
+import type { formLogicType } from './LemonField.storiesType'
 
-const meta: Meta<typeof PureField> = {
-    title: 'Lemon UI/Forms and Fields',
-    component: PureField,
+const meta: Meta<typeof LemonField> = {
+    title: 'Lemon UI/Lemon Field',
+    component: LemonField,
     parameters: {
         docs: {
             description: {
@@ -30,7 +30,7 @@ export default meta
 export const _PureFields = (): JSX.Element => {
     return (
         <div className="space-y-4">
-            <PureField
+            <LemonField.Pure
                 label="Text input label"
                 showOptional
                 help={
@@ -41,18 +41,18 @@ export const _PureFields = (): JSX.Element => {
                 }
             >
                 <LemonInput placeholder="Optional descriptive placeholder text" />
-            </PureField>
+            </LemonField.Pure>
 
-            <PureField label="Select label" info={<>With info!</>}>
+            <LemonField.Pure label="Select label" info={<>With info!</>}>
                 <LemonSelect options={[{ value: 'foo', label: 'bar' }]} fullWidth />
-            </PureField>
+            </LemonField.Pure>
 
-            <PureField label="Textarea label" error="This field has an error">
+            <LemonField.Pure label="Textarea label" error="This field has an error">
                 <LemonTextArea />
-            </PureField>
-            <PureField>
+            </LemonField.Pure>
+            <LemonField.Pure>
                 <LemonCheckbox bordered label="Checkbox labels are set differently" fullWidth />
-            </PureField>
+            </LemonField.Pure>
 
             <div className="flex justify-end gap-2 border-t mt-4 pt-4">
                 <LemonButton type="secondary">Cancel</LemonButton>
@@ -112,7 +112,7 @@ export const _FieldsWithKeaForm = (): JSX.Element => {
     return (
         <Form logic={formLogic} formKey={formKey} enableFormOnSubmit>
             <div className="space-y-4">
-                <Field
+                <LemonField
                     name="name"
                     label={
                         <>
@@ -127,18 +127,18 @@ export const _FieldsWithKeaForm = (): JSX.Element => {
                     }
                 >
                     <LemonInput placeholder="Jon Snow" />
-                </Field>
+                </LemonField>
 
-                <Field name="select" label="Select label" info={<>With info!</>}>
+                <LemonField name="select" label="Select label" info={<>With info!</>}>
                     <LemonSelect options={[{ value: 'foo', label: 'bar' }]} fullWidth />
-                </Field>
+                </LemonField>
 
-                <Field name="email" label="Email address">
+                <LemonField name="email" label="Email address">
                     <LemonInput type="email" />
-                </Field>
-                <Field name="pineappleOnPizza">
+                </LemonField>
+                <LemonField name="pineappleOnPizza">
                     <LemonCheckbox bordered label="Pineapple on your pizza?" fullWidth />
-                </Field>
+                </LemonField>
 
                 <div className="flex justify-end gap-2 border-t mt-4 pt-4">
                     <LemonButton type="secondary">Cancel</LemonButton>
diff --git a/frontend/src/lib/forms/Field.tsx b/frontend/src/lib/lemon-ui/LemonField/LemonField.tsx
similarity index 83%
rename from frontend/src/lib/forms/Field.tsx
rename to frontend/src/lib/lemon-ui/LemonField/LemonField.tsx
index b0924ae43ae5b..dcde1c3e4e95a 100644
--- a/frontend/src/lib/forms/Field.tsx
+++ b/frontend/src/lib/lemon-ui/LemonField/LemonField.tsx
@@ -3,7 +3,7 @@ import { Field as KeaField, FieldProps as KeaFieldProps } from 'kea-forms/lib/co
 import { IconErrorOutline } from 'lib/lemon-ui/icons'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 
-export type PureFieldProps = {
+export type LemonPureFieldProps = {
     /** The label name to be displayed */
     label?: React.ReactNode
     /** Will show a muted (optional) next to the label */
@@ -25,8 +25,7 @@ export type PureFieldProps = {
     htmlFor?: string
 }
 
-/** A "Pure" field - used when you want the Field styles without the Kea form functionality */
-export const PureField = ({
+const LemonPureField = ({
     label,
     info,
     error,
@@ -38,7 +37,7 @@ export const PureField = ({
     children,
     inline,
     onClick,
-}: PureFieldProps): JSX.Element => {
+}: LemonPureFieldProps): JSX.Element => {
     return (
         <div
             onClick={onClick}
@@ -68,9 +67,10 @@ export const PureField = ({
     )
 }
 
-export type FieldProps = Omit<PureFieldProps, 'children' | 'error'> & Pick<KeaFieldProps, 'children' | 'name'>
+export type LemonFieldProps = Omit<LemonPureFieldProps, 'children' | 'error'> & Pick<KeaFieldProps, 'children' | 'name'>
 
-export const Field = ({
+/** A field for use within a Kea form. Outside a form use `LemonField.Pure`. */
+export const LemonField = ({
     name,
     help,
     className,
@@ -78,11 +78,10 @@ export const Field = ({
     inline,
     info,
     ...keaFieldProps
-}: FieldProps): JSX.Element => {
-    /** Drop-in replacement antd template for kea forms */
+}: LemonFieldProps): JSX.Element => {
     const template: KeaFieldProps['template'] = ({ label, kids, error }) => {
         return (
-            <PureField
+            <LemonPureField
                 label={label}
                 error={error}
                 help={help}
@@ -92,8 +91,11 @@ export const Field = ({
                 info={info}
             >
                 {kids}
-            </PureField>
+            </LemonPureField>
         )
     }
     return <KeaField {...keaFieldProps} name={name} template={template} noStyle />
 }
+
+/** A field without Kea form functionality. Within a form use `LemonField`. */
+LemonField.Pure = LemonPureField
diff --git a/frontend/src/lib/lemon-ui/LemonField/index.ts b/frontend/src/lib/lemon-ui/LemonField/index.ts
new file mode 100644
index 0000000000000..2776e83c43e46
--- /dev/null
+++ b/frontend/src/lib/lemon-ui/LemonField/index.ts
@@ -0,0 +1 @@
+export { LemonField, type LemonFieldProps, type LemonPureFieldProps } from './LemonField'
diff --git a/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss b/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
index 6018b10f41bb7..28a84357dadeb 100644
--- a/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
+++ b/frontend/src/lib/lemon-ui/LemonInput/LemonInput.scss
@@ -3,7 +3,7 @@
     gap: 0.25rem;
     align-items: center;
     justify-content: center;
-    height: 2.5rem;
+    height: calc(2.125rem + 3px); // Medium size button height + button shadow height
     padding: 0.25rem 0.5rem;
     font-size: 0.875rem;
     line-height: 1.25rem;
@@ -15,24 +15,12 @@
     border: 1px solid var(--border);
     border-radius: var(--radius);
 
-    .posthog-3000 & {
-        height: calc(2.125rem + 3px); // Medium size button height + button shadow height
-    }
-
     &:hover:not([aria-disabled='true']) {
-        border-color: var(--primary-3000-hover);
-
-        .posthog-3000 & {
-            border-color: var(--border-bold);
-        }
+        border-color: var(--border-bold);
     }
 
     &.LemonInput--focused:not([aria-disabled='true']) {
-        border-color: var(--primary-3000);
-
-        .posthog-3000 & {
-            border-color: var(--border-active);
-        }
+        border-color: var(--border-active);
     }
 
     &.LemonInput--transparent-background {
diff --git a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.scss b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.scss
index 3fa477a4f7958..a10cc87433af0 100644
--- a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.scss
+++ b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.scss
@@ -33,9 +33,9 @@
     max-height: 90%;
     margin: 1rem auto;
     background-color: var(--bg-light);
-    border: 1px solid var(--border-3000);
+    border: 1px solid var(--secondary-3000-button-border);
     border-radius: var(--radius);
-    box-shadow: var(--shadow-elevation);
+    box-shadow: var(--modal-shadow-elevation);
     opacity: 0;
     transition: opacity var(--modal-transition-time) ease-out, transform var(--modal-transition-time) ease-out;
     transform: scale(0.85);
@@ -60,8 +60,8 @@
 
     .LemonModal__close {
         position: absolute;
-        top: 1.25rem;
-        right: 1.25rem;
+        top: 0.75rem;
+        right: 1rem;
         z-index: 1;
 
         &.LemonModal__close--highlighted {
@@ -78,7 +78,7 @@
     }
 
     .LemonModal__content {
-        padding: 1rem 1.5rem;
+        padding: 1rem;
         overflow-y: auto;
 
         &.LemonModal__content--embedded {
@@ -91,15 +91,11 @@
         height: 100%;
         overflow: hidden;
     }
-
-    .posthog-3000 & {
-        border-color: var(--secondary-3000-button-border);
-    }
 }
 
 .LemonModal__header {
-    padding-bottom: 1.25rem;
-    margin: 1.5rem;
+    padding-bottom: 1rem;
+    margin: 1rem;
     margin-bottom: 0;
     border-bottom: 1px solid var(--border);
 
@@ -122,8 +118,8 @@
     gap: 0.5rem;
     align-items: center;
     justify-content: flex-end;
-    padding-top: 1.5rem;
-    margin: 1.5rem;
+    padding-top: 1rem;
+    margin: 1rem;
     margin-top: 0;
     white-space: nowrap;
     border-top: 1px solid var(--border);
diff --git a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
index 022785fa7e56b..e464561b76fbb 100644
--- a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
+++ b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
@@ -33,6 +33,7 @@ export interface LemonModalProps {
     /** When enabled, the modal content will only include children allowing greater customisation */
     simple?: boolean
     closable?: boolean
+    hideCloseButton?: boolean
     /** If there is unsaved input that's not persisted, the modal can't be closed closed on overlay click. */
     hasUnsavedInput?: boolean
     /** Expands the modal to fill the entire screen */
@@ -78,6 +79,7 @@ export function LemonModal({
     forceAbovePopovers = false,
     contentRef,
     overlayRef,
+    hideCloseButton = false,
 }: LemonModalProps): JSX.Element {
     const nodeRef = useRef(null)
     const [ignoredOverlayClickCount, setIgnoredOverlayClickCount] = useState(0)
@@ -86,7 +88,7 @@ export function LemonModal({
 
     const modalContent = (
         <div ref={nodeRef} className="LemonModal__container">
-            {closable && (
+            {closable && !hideCloseButton && (
                 // The key causes the div to be re-rendered, which restarts the animation,
                 // providing immediate visual feedback on click
                 <div
@@ -159,6 +161,7 @@ export function LemonModal({
             {modalContent}
         </div>
     ) : (
+        // eslint-disable-next-line posthog/warn-elements
         <Modal
             isOpen={isOpen}
             onRequestClose={(e) => {
diff --git a/frontend/src/lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple.scss b/frontend/src/lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple.scss
index 087aa0f39c5d8..67200ac17bdf3 100644
--- a/frontend/src/lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple.scss
+++ b/frontend/src/lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple.scss
@@ -4,7 +4,7 @@
 
         .ant-select-selector,
         &.ant-select-single .ant-select-selector {
-            min-height: 2.5rem;
+            min-height: 2.125rem;
             padding: 0.25rem;
             font-size: 0.875rem;
             line-height: 1.25rem;
@@ -13,10 +13,6 @@
             border: 1px solid var(--border);
             border-radius: var(--radius);
 
-            .posthog-3000 & {
-                min-height: 2.125rem;
-            }
-
             .ant-select-selection-overflow {
                 gap: 0.25rem;
             }
@@ -71,13 +67,9 @@
     padding: 0.5rem;
     margin: -4px 0; // Counteract antd wrapper
     background: var(--bg-light);
-    border: 1px solid var(--primary);
+    border: 1px solid var(--primary-3000);
     border-radius: var(--radius);
 
-    .posthog-3000 & {
-        border: 1px solid var(--primary-3000);
-    }
-
     .ant-select-item {
         padding: 0;
         padding-bottom: 0.2rem;
diff --git a/frontend/src/lib/lemon-ui/LemonSwitch/LemonSwitch.scss b/frontend/src/lib/lemon-ui/LemonSwitch/LemonSwitch.scss
index eccd270e72e1f..a63c3e5fdc63c 100644
--- a/frontend/src/lib/lemon-ui/LemonSwitch/LemonSwitch.scss
+++ b/frontend/src/lib/lemon-ui/LemonSwitch/LemonSwitch.scss
@@ -1,6 +1,6 @@
 .LemonSwitch {
-    --lemon-switch-height: 1.25rem;
-    --lemon-switch-width: 2.25rem;
+    --lemon-switch-height: 1.125rem;
+    --lemon-switch-width: calc(11 / 6 * var(--lemon-switch-height)); // Same proportion as in IconToggle
 
     display: flex;
     gap: 0.5rem;
@@ -23,17 +23,13 @@
     }
 
     &.LemonSwitch--bordered {
-        min-height: 2.5rem;
+        min-height: calc(2.125rem + 3px); // Medium size button height + button shadow height
         padding: 0 0.75rem;
         line-height: 1.4;
         background: var(--bg-light);
         border: 1px solid var(--border);
         border-radius: var(--radius);
 
-        .posthog-3000 & {
-            min-height: calc(2.125rem + 3px); // Medium size button height + button shadow height
-        }
-
         &.LemonSwitch--small {
             gap: 0.5rem;
             min-height: 2rem;
@@ -54,11 +50,6 @@
             cursor: not-allowed; // A label with for=* also toggles the switch, so it shouldn't have the text select cursor
         }
     }
-
-    .posthog-3000 & {
-        --lemon-switch-height: 1.125rem;
-        --lemon-switch-width: calc(11 / 6 * var(--lemon-switch-height)); // Same proportion as in IconToggle
-    }
 }
 
 .LemonSwitch__button {
@@ -79,91 +70,57 @@
 
 .LemonSwitch__slider {
     position: absolute;
-    top: 5px;
+    top: 0;
     left: 0;
     display: inline-block;
-    width: 2.25rem;
-    height: 0.625rem;
-    background-color: var(--border);
-    border-radius: 0.625rem;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
+    background-color: var(--border-bold);
+    border-radius: var(--lemon-switch-height);
     transition: background-color 100ms ease;
 
-    .posthog-3000 & {
-        top: 0;
-        width: 100%;
-        height: 100%;
-        pointer-events: none;
-        background-color: var(--border-bold);
-        border-radius: var(--lemon-switch-height);
-    }
-
     .LemonSwitch--checked & {
-        background-color: var(--primary-highlight);
-
-        .posthog-3000 & {
-            background-color: var(--primary-3000);
-        }
+        background-color: var(--primary-3000);
     }
 }
 
 .LemonSwitch__handle {
+    --lemon-switch-handle-ratio: calc(3 / 4); // Same proportion as in IconToggle
+    --lemon-switch-handle-gutter: calc(var(--lemon-switch-height) * calc(1 - var(--lemon-switch-handle-ratio)) / 2);
+    --lemon-switch-handle-width: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio));
+    --lemon-switch-active-translate: translateX(
+        calc(var(--lemon-switch-width) - var(--lemon-switch-handle-width) - var(--lemon-switch-handle-gutter) * 2)
+    );
+
     position: absolute;
-    top: 0;
-    left: 0;
+    top: var(--lemon-switch-handle-gutter);
+    left: var(--lemon-switch-handle-gutter);
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 1.25rem;
-    height: 1.25rem;
+    width: var(--lemon-switch-handle-width);
+    height: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio));
+    pointer-events: none;
     cursor: inherit;
     background-color: #fff;
-    border: 2px solid var(--border);
+    border: none;
     border-radius: 0.625rem;
     transition: background-color 100ms ease, transform 100ms ease, width 100ms ease, border-color 100ms ease;
 
-    .posthog-3000 & {
-        --lemon-switch-handle-ratio: calc(3 / 4); // Same proportion as in IconToggle
-        --lemon-switch-handle-gutter: calc(var(--lemon-switch-height) * calc(1 - var(--lemon-switch-handle-ratio)) / 2);
-        --lemon-switch-handle-width: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio));
-        --lemon-switch-active-translate: translateX(
-            calc(var(--lemon-switch-width) - var(--lemon-switch-handle-width) - var(--lemon-switch-handle-gutter) * 2)
-        );
-
-        top: var(--lemon-switch-handle-gutter);
-        left: var(--lemon-switch-handle-gutter);
-        width: var(--lemon-switch-handle-width);
-        height: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio));
-        pointer-events: none;
-        background-color: #fff;
-        border: none;
-    }
-
     .LemonSwitch--checked & {
-        background-color: var(--primary-3000);
+        background-color: #fff;
         border-color: var(--primary-3000);
-        transform: translateX(1rem);
-
-        .posthog-3000 & {
-            background-color: #fff;
-            transform: var(--lemon-switch-active-translate);
-        }
+        transform: var(--lemon-switch-active-translate);
     }
 
     .LemonSwitch--active & {
-        transform: scale(1.1);
-
-        .posthog-3000 & {
-            --lemon-switch-handle-width: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio) * 1.2);
+        --lemon-switch-handle-width: calc(var(--lemon-switch-height) * var(--lemon-switch-handle-ratio) * 1.2);
 
-            transform: none;
-        }
+        transform: none;
     }
 
     .LemonSwitch--active.LemonSwitch--checked & {
-        transform: translateX(1rem) scale(1.1);
-
-        .posthog-3000 & {
-            transform: var(--lemon-switch-active-translate);
-        }
+        transform: var(--lemon-switch-active-translate);
     }
 }
diff --git a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
index 2bf5449f0b4aa..b944d2f17635e 100644
--- a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
+++ b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
@@ -1,5 +1,5 @@
 .LemonTable {
-    --row-base-height: 3rem;
+    --row-base-height: auto;
     --row-horizontal-padding: 1rem;
     --lemon-table-background-color: var(--bg-table);
 
@@ -7,6 +7,7 @@
     flex: 1;
     width: 100%;
     overflow: hidden;
+    font-size: 13px;
     background: var(--lemon-table-background-color);
     border: 1px solid var(--border);
     border-radius: var(--radius);
@@ -24,12 +25,6 @@
         border: none;
     }
 
-    .posthog-3000 & {
-        --row-base-height: auto;
-
-        font-size: 13px;
-    }
-
     &.LemonTable--with-ribbon {
         --row-ribbon-width: 0.25rem;
 
@@ -49,18 +44,12 @@
     }
 
     &--xs {
-        --row-base-height: 2rem;
-
         .LemonTable__content > table > tbody > tr > td {
             padding-top: 0.25rem;
             padding-bottom: 0.25rem;
         }
     }
 
-    &--small {
-        --row-base-height: 2.5rem;
-    }
-
     &--embedded {
         background: none;
         border: none;
@@ -72,11 +61,8 @@
 
         .LemonTable__content > table {
             > thead {
+                background: none;
                 border-bottom: none;
-
-                .posthog-3000 & {
-                    background: none;
-                }
             }
 
             > thead,
@@ -127,12 +113,10 @@
     }
 
     a.Link {
-        .posthog-3000 & {
-            color: var(--default);
+        color: var(--default);
 
-            &:not(:disabled):hover {
-                color: var(--primary-3000-hover);
-            }
+        &:not(:disabled):hover {
+            color: var(--primary-3000-hover);
         }
     }
 }
@@ -147,14 +131,12 @@
         font-size: 0.75rem;
         text-transform: uppercase;
         letter-spacing: 0.03125rem;
-        background: var(--mid);
-
-        .posthog-3000 & {
-            background: var(--lemon-table-background-color);
-        }
+        background: var(--lemon-table-background-color);
 
         > tr {
             > th {
+                padding-top: 0.5rem;
+                padding-bottom: 0.5rem;
                 font-weight: 700;
                 text-align: left;
 
@@ -162,15 +144,8 @@
                 // Also it needs to be on the th - any higher and safari will not render the shadow
                 box-shadow: inset 0 -1px var(--border);
 
-                .posthog-3000 & {
-                    padding-top: 0.5rem;
-                    padding-bottom: 0.5rem;
-                }
-
                 .LemonButton {
-                    .posthog-3000 & {
-                        margin: -0.5rem 0;
-                    }
+                    margin: -0.5rem 0;
                 }
             }
 
@@ -293,30 +268,26 @@
 .LemonTable__header {
     cursor: default;
 
-    .posthog-3000 & {
-        .LemonTable__header-content {
-            color: var(--text-secondary);
-        }
+    .LemonTable__header-content {
+        color: var(--text-secondary);
     }
 
     &.LemonTable__header--actionable {
         cursor: pointer;
 
-        .posthog-3000 & {
-            &:hover {
-                &:not(:has(.LemonTable__header--no-hover:hover)) {
-                    .LemonTable__header-content {
-                        color: var(--default);
-                    }
-                }
-            }
-
-            &:active {
+        &:hover {
+            &:not(:has(.LemonTable__header--no-hover:hover)) {
                 .LemonTable__header-content {
                     color: var(--default);
                 }
             }
         }
+
+        &:active {
+            .LemonTable__header-content {
+                color: var(--default);
+            }
+        }
     }
 }
 
@@ -346,11 +317,7 @@
 }
 
 .LemonTable__header--sticky::before {
-    background: var(--mid);
-
-    .posthog-3000 & {
-        background: var(--lemon-table-background-color);
-    }
+    background: var(--lemon-table-background-color);
 }
 
 // Stickiness is disabled in snapshots due to flakiness
diff --git a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.stories.tsx b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.stories.tsx
index b0c604b5e2cf7..a9c360b431cfb 100644
--- a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.stories.tsx
+++ b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.stories.tsx
@@ -176,9 +176,6 @@ WithExpandableRows.args = {
 export const Small: Story = BasicTemplate.bind({})
 Small.args = { size: 'small' }
 
-export const XSmall: Story = BasicTemplate.bind({})
-XSmall.args = { size: 'xs' }
-
 export const Embedded: Story = BasicTemplate.bind({})
 Embedded.args = { embedded: true }
 
diff --git a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.tsx b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.tsx
index 7cba42509ac08..8fb3ee58a65ae 100644
--- a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.tsx
+++ b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.tsx
@@ -47,7 +47,7 @@ export interface LemonTableProps<T extends Record<string, any>> {
     /** Function that for each row determines what props should its `tr` element have based on the row's record. */
     onRow?: (record: T) => Omit<HTMLProps<HTMLTableRowElement>, 'key'>
     /** How tall should rows be. The default value is `"middle"`. */
-    size?: 'xs' | 'small' | 'middle'
+    size?: 'small' | 'middle'
     /** Whether this table already is inset, meaning it needs reduced horizontal padding (0.5rem instead of 1rem). */
     inset?: boolean
     /** An embedded table has no border around it and no background. This way it blends better into other components. */
diff --git a/frontend/src/lib/lemon-ui/LemonTable/LemonTableLoader.scss b/frontend/src/lib/lemon-ui/LemonTable/LemonTableLoader.scss
index c75c739b37653..49a382f7bd061 100644
--- a/frontend/src/lib/lemon-ui/LemonTable/LemonTableLoader.scss
+++ b/frontend/src/lib/lemon-ui/LemonTable/LemonTableLoader.scss
@@ -7,14 +7,10 @@
     height: 0;
     padding: 0.05rem !important;
     overflow: hidden;
-    background: var(--primary-bg-active);
+    background: var(--primary-3000-highlight);
     border: none !important;
     transition: height 200ms ease, top 200ms ease;
 
-    .posthog-3000 & {
-        background: var(--primary-3000-highlight);
-    }
-
     &::after {
         position: absolute;
         top: 0;
@@ -22,12 +18,8 @@
         width: 50%;
         height: 100%;
         content: '';
-        background: var(--primary);
+        background: var(--primary-3000);
         animation: LemonTableLoader__swooping 1.5s linear infinite;
-
-        .posthog-3000 & {
-            background: var(--primary-3000);
-        }
     }
 
     &.LemonTableLoader--enter-active,
diff --git a/frontend/src/lib/lemon-ui/LemonTag/LemonTag.scss b/frontend/src/lib/lemon-ui/LemonTag/LemonTag.scss
index 93f2d8a133165..807b7765e3420 100644
--- a/frontend/src/lib/lemon-ui/LemonTag/LemonTag.scss
+++ b/frontend/src/lib/lemon-ui/LemonTag/LemonTag.scss
@@ -25,14 +25,9 @@
     }
 
     &.LemonTag--primary {
-        color: #fff;
-        background-color: var(--primary-3000);
-
-        .posthog-3000 & {
-            color: var(--primary-3000);
-            background: none;
-            border-color: var(--primary-3000);
-        }
+        color: var(--primary-3000);
+        background: none;
+        border-color: var(--primary-3000);
     }
 
     &.LemonTag--option {
@@ -41,69 +36,39 @@
     }
 
     &.LemonTag--highlight {
-        color: var(--bg-charcoal);
-        background-color: var(--mark);
-
-        .posthog-3000 & {
-            color: var(--highlight);
-            background: none;
-            border-color: var(--highlight);
-        }
+        color: var(--highlight);
+        background: none;
+        border-color: var(--highlight);
     }
 
     &.LemonTag--warning {
-        color: var(--bg-charcoal);
-        background-color: var(--warning);
-
-        .posthog-3000 & {
-            color: var(--warning);
-            background: none;
-            border-color: var(--warning);
-        }
+        color: var(--warning);
+        background-color: none;
+        border-color: var(--warning);
     }
 
     &.LemonTag--danger {
-        color: #fff;
-        background-color: var(--danger);
-
-        .posthog-3000 & {
-            color: var(--danger);
-            background: none;
-            border-color: var(--danger);
-        }
+        color: var(--danger);
+        background: none;
+        border-color: var(--danger);
     }
 
     &.LemonTag--success {
-        color: #fff;
-        background-color: var(--success);
-
-        .posthog-3000 & {
-            color: var(--success);
-            background: none;
-            border-color: var(--success);
-        }
+        color: var(--success);
+        background: none;
+        border-color: var(--success);
     }
 
     &.LemonTag--completion {
-        color: var(--bg-charcoal);
-        background-color: var(--purple-light);
-
-        .posthog-3000 & {
-            color: var(--purple);
-            background: none;
-            border-color: var(--purple);
-        }
+        color: var(--purple);
+        background: none;
+        border-color: var(--purple);
     }
 
     &.LemonTag--caution {
-        color: var(--bg-charcoal);
-        background-color: var(--danger-lighter);
-
-        .posthog-3000 & {
-            color: var(--danger-lighter);
-            background: none;
-            border-color: var(--danger-lighter);
-        }
+        color: var(--danger-lighter);
+        background: none;
+        border-color: var(--danger-lighter);
     }
 
     &.LemonTag--muted {
diff --git a/frontend/src/lib/lemon-ui/LemonTextArea/LemonTextArea.scss b/frontend/src/lib/lemon-ui/LemonTextArea/LemonTextArea.scss
index 3c24f908503e9..9c89b575b4a0b 100644
--- a/frontend/src/lib/lemon-ui/LemonTextArea/LemonTextArea.scss
+++ b/frontend/src/lib/lemon-ui/LemonTextArea/LemonTextArea.scss
@@ -17,11 +17,7 @@
     transition: background-color 200ms ease, color 200ms ease, border 200ms ease, opacity 200ms ease;
 
     &:not(:disabled):hover {
-        border: 1px solid var(--primary-3000-hover);
-
-        .posthog-3000 & {
-            border-color: var(--border-bold);
-        }
+        border: 1px solid var(--border-bold);
     }
 
     &:disabled {
@@ -30,11 +26,7 @@
     }
 
     &:focus:not(:disabled) {
-        border: 1px solid var(--primary-3000);
-
-        .posthog-3000 & {
-            border-color: var(--border-active);
-        }
+        border: 1px solid var(--border-active);
     }
 
     .Field--error & {
diff --git a/frontend/src/lib/lemon-ui/Link/Link.scss b/frontend/src/lib/lemon-ui/Link/Link.scss
index 13969c9df18b1..24a0bf5f65522 100644
--- a/frontend/src/lib/lemon-ui/Link/Link.scss
+++ b/frontend/src/lib/lemon-ui/Link/Link.scss
@@ -28,12 +28,10 @@
     }
 
     &--subtle {
-        .posthog-3000 & {
-            color: var(--default);
+        color: var(--default);
 
-            &:not(:disabled):hover {
-                color: var(--primary-3000-hover);
-            }
+        &:not(:disabled):hover {
+            color: var(--primary-3000-hover);
         }
     }
 }
diff --git a/frontend/src/lib/lemon-ui/Spinner/Spinner.scss b/frontend/src/lib/lemon-ui/Spinner/Spinner.scss
index e5ddf2a3cb175..3ab31c08e9be6 100644
--- a/frontend/src/lib/lemon-ui/Spinner/Spinner.scss
+++ b/frontend/src/lib/lemon-ui/Spinner/Spinner.scss
@@ -78,7 +78,7 @@
         position: relative;
     }
 
-    .posthog-3000 &.SpinnerOverlay--scene-level::before {
+    &.SpinnerOverlay--scene-level::before {
         background: var(--bg-3000);
     }
 }
diff --git a/frontend/src/lib/lemon-ui/Spinner/Spinner.stories.tsx b/frontend/src/lib/lemon-ui/Spinner/Spinner.stories.tsx
index 9353443d74ba0..39239ea7e46a4 100644
--- a/frontend/src/lib/lemon-ui/Spinner/Spinner.stories.tsx
+++ b/frontend/src/lib/lemon-ui/Spinner/Spinner.stories.tsx
@@ -95,3 +95,21 @@ export function AsOverlay(): JSX.Element {
         </div>
     )
 }
+
+export function asOverlayWaiting(): JSX.Element {
+    return (
+        <div className="relative">
+            <h1>Hey there</h1>
+            <p>
+                Before showing something loading, you might want to show a message to the user to let them know what's
+                happening. This is especially useful when the loading might take a while. This is a good place to put
+                that message. It's also a good place to put a message that tells the user what to do if the loading is
+                taking too long. When you're ready to show the spinner, you can use the `mode` prop to change the
+                spinner to a waiting spinner. This will give the user a visual indication that the loading is still
+                about to happen.
+            </p>
+
+            <SpinnerOverlay mode="waiting" />
+        </div>
+    )
+}
diff --git a/frontend/src/lib/lemon-ui/Spinner/Spinner.tsx b/frontend/src/lib/lemon-ui/Spinner/Spinner.tsx
index 5939bc14ec114..0d3c3e97a3fcf 100644
--- a/frontend/src/lib/lemon-ui/Spinner/Spinner.tsx
+++ b/frontend/src/lib/lemon-ui/Spinner/Spinner.tsx
@@ -1,6 +1,7 @@
 import './Spinner.scss'
 
 import clsx from 'clsx'
+import { IconSchedule } from 'lib/lemon-ui/icons'
 
 export interface SpinnerProps {
     textColored?: boolean
@@ -29,16 +30,23 @@ export function SpinnerOverlay({
     sceneLevel,
     visible = true,
     className,
+    mode = 'spinning',
     ...spinnerProps
 }: SpinnerProps & {
     /** @default false */
     sceneLevel?: boolean
     /** @default true */
     visible?: boolean
+    /** @default "spinning" */
+    mode?: 'spinning' | 'waiting'
 }): JSX.Element {
     return (
         <div className={clsx('SpinnerOverlay', sceneLevel && 'SpinnerOverlay--scene-level')} aria-hidden={!visible}>
-            <Spinner className={clsx('text-5xl', className)} {...spinnerProps} />
+            {mode === 'waiting' ? (
+                <IconSchedule className="text-5xl text-primary z-10 animate-pulse drop-shadow-xl" />
+            ) : (
+                <Spinner className={clsx('text-5xl', className)} {...spinnerProps} />
+            )}
         </div>
     )
 }
diff --git a/frontend/src/lib/logic/inAppPrompt/inAppPromptEventCaptureLogic.ts b/frontend/src/lib/logic/inAppPrompt/inAppPromptEventCaptureLogic.ts
deleted file mode 100644
index b8ede572b2214..0000000000000
--- a/frontend/src/lib/logic/inAppPrompt/inAppPromptEventCaptureLogic.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { actions, kea, listeners, path } from 'kea'
-import posthog from 'posthog-js'
-
-import type { inAppPromptEventCaptureLogicType } from './inAppPromptEventCaptureLogicType'
-import { PromptType } from './inAppPromptLogic'
-
-const inAppPromptEventCaptureLogic = kea<inAppPromptEventCaptureLogicType>([
-    path(['lib', 'logic', 'inAppPrompt', 'eventCapture']),
-    actions({
-        reportPromptShown: (type: PromptType, sequence: string, step: number, totalSteps: number) => ({
-            type,
-            sequence,
-            step,
-            totalSteps,
-        }),
-        reportPromptForward: (sequence: string, step: number, totalSteps: number) => ({ sequence, step, totalSteps }),
-        reportPromptBackward: (sequence: string, step: number, totalSteps: number) => ({ sequence, step, totalSteps }),
-        reportPromptSequenceDismissed: (sequence: string, step: number, totalSteps: number) => ({
-            sequence,
-            step,
-            totalSteps,
-        }),
-        reportPromptSequenceCompleted: (sequence: string, step: number, totalSteps: number) => ({
-            sequence,
-            step,
-            totalSteps,
-        }),
-        reportProductTourStarted: true,
-        reportProductTourSkipped: true,
-    }),
-    listeners({
-        reportPromptShown: ({ type, sequence, step, totalSteps }) => {
-            posthog.capture('prompt shown', {
-                type,
-                sequence,
-                step,
-                totalSteps,
-            })
-        },
-        reportPromptForward: ({ sequence, step, totalSteps }) => {
-            posthog.capture('prompt forward', {
-                sequence,
-                step,
-                totalSteps,
-            })
-        },
-        reportPromptBackward: ({ sequence, step, totalSteps }) => {
-            posthog.capture('prompt backward', {
-                sequence,
-                step,
-                totalSteps,
-            })
-        },
-        reportPromptSequenceDismissed: ({ sequence, step, totalSteps }) => {
-            posthog.capture('prompt sequence dismissed', {
-                sequence,
-                step,
-                totalSteps,
-            })
-        },
-        reportPromptSequenceCompleted: ({ sequence, step, totalSteps }) => {
-            posthog.capture('prompt sequence completed', {
-                sequence,
-                step,
-                totalSteps,
-            })
-        },
-        reportProductTourStarted: () => {
-            posthog.capture('product tour started')
-        },
-        reportProductTourSkipped: () => {
-            posthog.capture('product tour skipped')
-        },
-    }),
-])
-
-export { inAppPromptEventCaptureLogic }
diff --git a/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.test.ts b/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.test.ts
deleted file mode 100644
index e1a029a9d2db0..0000000000000
--- a/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.test.ts
+++ /dev/null
@@ -1,401 +0,0 @@
-import { router } from 'kea-router'
-import { expectLogic } from 'kea-test-utils'
-import api from 'lib/api'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { urls } from 'scenes/urls'
-
-import { useMocks } from '~/mocks/jest'
-import { initKeaTests } from '~/test/init'
-
-import { inAppPromptEventCaptureLogic } from './inAppPromptEventCaptureLogic'
-import { inAppPromptLogic, PromptConfig, PromptUserState } from './inAppPromptLogic'
-
-const configProductTours: PromptConfig & { state: PromptUserState } = {
-    sequences: [
-        {
-            key: 'experiment-events-product-tour',
-            prompts: [
-                {
-                    step: 0,
-                    type: 'tooltip',
-                    text: "Welcome! We'd like to give you a quick tour!",
-                    placement: 'top-start',
-                    buttons: [{ action: 'skip', label: 'Skip tutorial' }],
-                    reference: 'tooltip-test',
-                    icon: 'live-events',
-                },
-                {
-                    step: 1,
-                    type: 'tooltip',
-                    text: "Here you can see all events from the past 12 months. Things look a bit quiet, so let's turn on automatic refresh to see events in real-time.",
-                    placement: 'top-start',
-                    reference: 'tooltip-test',
-                    icon: 'live-events',
-                },
-                {
-                    step: 2,
-                    type: 'tooltip',
-                    text: "If you aren't seeing the data you expect then you can always ask for help. For now, lets analyze some data. Click 'Dashboards' in the sidebar.",
-                    placement: 'top-start',
-                    buttons: [{ url: 'https://posthog.com/questions', label: 'Ask for help' }],
-                    icon: 'live-events',
-                    reference: 'tooltip-test',
-                },
-            ],
-            path_match: ['/events'],
-            path_exclude: [],
-            type: 'product-tour',
-        },
-        {
-            key: 'experiment-dashboards-product-tour',
-            prompts: [
-                {
-                    step: 0,
-                    type: 'tooltip',
-                    text: "In PostHog, you analyse data with Insights which can be added to Dashboards to aid collaboration. Let's create a new Dashboard by selecting 'New Dashboard'. ",
-                    placement: 'top-start',
-                    icon: 'dashboard',
-                    reference: 'tooltip-test',
-                },
-                {
-                    step: 1,
-                    type: 'tooltip',
-                    text: "In PostHog, you analyse data with Insights which can be added to Dashboards to aid collaboration. Let's create a new Dashboard by selecting 'New Dashboard'. ",
-                    placement: 'top-start',
-                    icon: 'dashboard',
-                    reference: 'tooltip-test',
-                },
-            ],
-            path_match: ['/dashboard'],
-            path_exclude: ['/dashboard/*'],
-            type: 'product-tour',
-        },
-    ],
-    state: {
-        'experiment-events-product-tour': {
-            key: 'experiment-events-product-tour',
-            step: 0,
-            completed: false,
-            dismissed: false,
-            last_updated_at: '2022-07-26T16:32:55.153Z',
-        },
-        'experiment-dashboards-product-tour': {
-            key: 'experiment-dashboards-product-tour',
-            step: null,
-            completed: false,
-            dismissed: false,
-            last_updated_at: '2022-07-26T16:32:55.153Z',
-        },
-    },
-}
-
-const configOptIn: PromptConfig & { state: PromptUserState } = {
-    sequences: [
-        {
-            key: 'experiment-one-off-intro',
-            prompts: [
-                {
-                    step: 0,
-                    type: 'tooltip',
-                    text: 'This is welcome message to ask users to opt-in',
-                    placement: 'top-start',
-                    icon: 'dashboard',
-                    reference: 'tooltip-test',
-                },
-            ],
-            path_match: ['/*'],
-            path_exclude: [],
-            type: 'one-off',
-        },
-        {
-            key: 'experiment-one-off',
-            prompts: [
-                {
-                    step: 0,
-                    type: 'tooltip',
-                    text: 'This is a one off prompt that requires opt-in',
-                    placement: 'top-start',
-                    icon: 'dashboard',
-                    reference: 'tooltip-test',
-                },
-            ],
-            path_match: ['/*'],
-            path_exclude: [],
-            requires_opt_in: true,
-            type: 'one-off',
-        },
-    ],
-    state: {
-        'experiment-one-off-intro': {
-            key: 'experiment-one-off-intro',
-            step: null,
-            completed: false,
-            dismissed: false,
-            last_updated_at: '2022-07-26T16:32:55.153Z',
-        },
-        'experiment-one-off': {
-            key: 'experiment-one-off',
-            step: null,
-            completed: false,
-            dismissed: false,
-            last_updated_at: '2022-07-26T16:32:55.153Z',
-        },
-    },
-}
-
-describe('inAppPromptLogic', () => {
-    let logic: ReturnType<typeof inAppPromptLogic.build>
-
-    describe('opt-in prompts', () => {
-        beforeEach(async () => {
-            const div = document.createElement('div')
-            div['data-attr'] = 'tooltip-test'
-            const spy = jest.spyOn(document, 'querySelector')
-            spy.mockReturnValue(div)
-            jest.spyOn(api, 'update')
-            useMocks({
-                patch: {
-                    '/api/prompts/my_prompts/': configOptIn,
-                },
-            })
-            localStorage.clear()
-            initKeaTests()
-            featureFlagLogic.mount()
-            logic = inAppPromptLogic()
-            logic.mount()
-            await expectLogic(logic).toMount([inAppPromptEventCaptureLogic])
-        })
-
-        afterEach(() => logic.unmount())
-
-        it('correctly opts in', async () => {
-            logic.actions.optInProductTour()
-            await expectLogic(logic).toMatchValues({
-                canShowProductTour: true,
-            })
-        })
-
-        it('correctly opts out when skipping', async () => {
-            logic.actions.optInProductTour()
-            await expectLogic(logic, () => {
-                logic.actions.promptAction('skip')
-            })
-                .toDispatchActions([
-                    'closePrompts',
-                    'optOutProductTour',
-                    inAppPromptEventCaptureLogic.actionCreators.reportProductTourSkipped(),
-                ])
-                .toMatchValues({
-                    canShowProductTour: false,
-                })
-        })
-
-        it('correctly sets valid sequences respecting opt-out and opt-in', async () => {
-            logic.actions.optOutProductTour()
-            await expectLogic(logic, () => {
-                logic.actions.syncState({ forceRun: true })
-            })
-                .toDispatchActions(['setSequences', 'findValidSequences', 'setValidSequences'])
-                .toMatchValues({
-                    sequences: configOptIn.sequences,
-                    userState: configOptIn.state,
-                    canShowProductTour: false,
-                    validSequences: [
-                        {
-                            sequence: configOptIn.sequences[0],
-                            state: {
-                                step: 0,
-                                completed: false,
-                            },
-                        },
-                    ],
-                })
-
-            logic.actions.optInProductTour()
-            logic.actions.findValidSequences()
-            await expectLogic(logic).toMatchValues({
-                canShowProductTour: true,
-                validSequences: [
-                    {
-                        sequence: configOptIn.sequences[0],
-                        state: {
-                            step: 0,
-                            completed: false,
-                        },
-                    },
-                    {
-                        sequence: configOptIn.sequences[1],
-                        state: {
-                            step: 0,
-                            completed: false,
-                        },
-                    },
-                ],
-            })
-        })
-    })
-
-    describe('product tours', () => {
-        beforeEach(async () => {
-            const div = document.createElement('div')
-            div['data-attr'] = 'tooltip-test'
-            const spy = jest.spyOn(document, 'querySelector')
-            spy.mockReturnValue(div)
-            jest.spyOn(api, 'update')
-            useMocks({
-                patch: {
-                    '/api/prompts/my_prompts/': configProductTours,
-                },
-            })
-            localStorage.clear()
-            initKeaTests()
-            featureFlagLogic.mount()
-            logic = inAppPromptLogic()
-            logic.mount()
-            logic.actions.optInProductTour()
-            await expectLogic(logic).toMount([inAppPromptEventCaptureLogic])
-            await expectLogic(logic, () => {
-                logic.actions.syncState({ forceRun: true })
-            })
-                .toDispatchActions(['setUserState', 'setSequences', 'findValidSequences', 'setValidSequences'])
-                .toMatchValues({
-                    sequences: configProductTours.sequences,
-                    userState: configProductTours.state,
-                    validSequences: [],
-                })
-        })
-
-        afterEach(() => logic.unmount())
-
-        it('changes route and dismissed the sequence in an excluded path', async () => {
-            router.actions.push(urls.dashboard('my-dashboard'))
-            await expectLogic(logic)
-                .toDispatchActions(['closePrompts', 'findValidSequences', 'setValidSequences', 'runFirstValidSequence'])
-                .toNotHaveDispatchedActions(['runSequence'])
-        })
-
-        it('changes route and correctly triggers an unseen sequence', async () => {
-            router.actions.push(urls.dashboards())
-            await expectLogic(logic)
-                .toDispatchActions(['closePrompts', 'findValidSequences', 'setValidSequences'])
-                .toMatchValues({
-                    validSequences: [
-                        {
-                            sequence: configProductTours.sequences[1],
-                            state: {
-                                step: 0,
-                                completed: false,
-                            },
-                        },
-                    ],
-                })
-                .toDispatchActions([
-                    'closePrompts',
-                    logic.actionCreators.runSequence(configProductTours.sequences[1], 0),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptShown(
-                        'tooltip',
-                        configProductTours.sequences[1].key,
-                        0,
-                        2
-                    ),
-                    'promptShownSuccessfully',
-                ])
-                .toMatchValues({
-                    currentSequence: configProductTours.sequences[1],
-                    currentStep: 0,
-                })
-        })
-
-        it('can dismiss a sequence', async () => {
-            router.actions.push(urls.dashboards())
-            await expectLogic(logic).toDispatchActions(['promptShownSuccessfully']).toMatchValues({
-                isPromptVisible: true,
-            })
-            await expectLogic(logic, () => {
-                logic.actions.dismissSequence()
-            })
-                .toDispatchActions([
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptSequenceDismissed(
-                        configProductTours.sequences[1].key,
-                        0,
-                        2
-                    ),
-                ])
-                .toMatchValues({
-                    isPromptVisible: false,
-                })
-        })
-
-        it('can complete sequence, then go back, then dismiss it', async () => {
-            router.actions.push(urls.dashboards())
-            await expectLogic(logic).toDispatchActions(['promptShownSuccessfully']).toMatchValues({
-                isPromptVisible: true,
-            })
-            await expectLogic(logic, () => {
-                logic.actions.nextPrompt()
-            })
-                .toDispatchActions([
-                    logic.actionCreators.runSequence(configProductTours.sequences[1], 1),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptForward(
-                        configProductTours.sequences[1].key,
-                        1,
-                        2
-                    ),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptSequenceCompleted(
-                        configProductTours.sequences[1].key,
-                        1,
-                        2
-                    ),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptShown(
-                        'tooltip',
-                        configProductTours.sequences[1].key,
-                        1,
-                        2
-                    ),
-                    'promptShownSuccessfully',
-                ])
-                .toMatchValues({
-                    currentStep: 1,
-                })
-            await expectLogic(logic, () => {
-                logic.actions.previousPrompt()
-            })
-                .toDispatchActions([
-                    logic.actionCreators.runSequence(configProductTours.sequences[1], 0),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptBackward(
-                        configProductTours.sequences[1].key,
-                        0,
-                        2
-                    ),
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptShown(
-                        'tooltip',
-                        configProductTours.sequences[1].key,
-                        0,
-                        2
-                    ),
-                    'promptShownSuccessfully',
-                ])
-                .toMatchValues({
-                    currentStep: 0,
-                })
-            await expectLogic(logic, () => {
-                logic.actions.dismissSequence()
-            })
-                .toDispatchActions(['clearSequence'])
-                .toNotHaveDispatchedActions([
-                    inAppPromptEventCaptureLogic.actionCreators.reportPromptSequenceDismissed(
-                        configProductTours.sequences[0].key,
-                        1,
-                        2
-                    ),
-                ])
-        })
-
-        it('does not run a sequence left unfinished', async () => {
-            router.actions.push(urls.events())
-            await expectLogic(logic).toNotHaveDispatchedActions(['promptShownSuccessfully']).toMatchValues({
-                isPromptVisible: false,
-            })
-        })
-    })
-})
diff --git a/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.tsx b/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.tsx
deleted file mode 100644
index 4c5cd22f04084..0000000000000
--- a/frontend/src/lib/logic/inAppPrompt/inAppPromptLogic.tsx
+++ /dev/null
@@ -1,517 +0,0 @@
-import { Placement } from '@floating-ui/react'
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
-import { router, urlToAction } from 'kea-router'
-import api from 'lib/api'
-import { now } from 'lib/dayjs'
-import {
-    IconApps,
-    IconBarChart,
-    IconCoffee,
-    IconCohort,
-    IconComment,
-    IconExperiment,
-    IconFlag,
-    IconGauge,
-    IconLive,
-    IconMessages,
-    IconPerson,
-    IconRecording,
-    IconTools,
-    IconTrendUp,
-    IconUnverifiedEvent,
-} from 'lib/lemon-ui/icons'
-import {
-    LemonActionableTooltip,
-    LemonActionableTooltipProps,
-} from 'lib/lemon-ui/LemonActionableTooltip/LemonActionableTooltip'
-import { Lettermark } from 'lib/lemon-ui/Lettermark'
-import { createRoot } from 'react-dom/client'
-import wcmatch from 'wildcard-match'
-
-import { inAppPromptEventCaptureLogic } from './inAppPromptEventCaptureLogic'
-import type { inAppPromptLogicType } from './inAppPromptLogicType'
-
-/** To be extended with other types of notifications e.g. modals, bars */
-export type PromptType = 'tooltip'
-
-export type PromptButton = {
-    url?: string
-    action?: string
-    label: string
-}
-
-export type Prompt = {
-    step: number
-    type: PromptType
-    text: string
-    placement: Placement
-    reference: string | null
-    title?: string
-    buttons?: PromptButton[]
-    icon?: string
-}
-
-export type Tooltip = Prompt & { type: 'tooltip' }
-
-export type PromptSequence = {
-    key: string
-    prompts: Prompt[]
-    path_match: string[]
-    path_exclude: string[]
-    must_be_completed?: string[]
-    requires_opt_in?: boolean
-    type: string
-}
-
-export type PromptConfig = {
-    sequences: PromptSequence[]
-}
-
-export type PromptState = {
-    key: string
-    last_updated_at: string
-    step: number | null
-    completed?: boolean
-    dismissed?: boolean
-}
-
-export type ValidSequenceWithState = {
-    sequence: PromptSequence
-    state: { step: number; completed?: boolean }
-}
-
-export type PromptUserState = {
-    [key: string]: PromptState
-}
-
-export enum DefaultAction {
-    NEXT = 'next',
-    PREVIOUS = 'previous',
-    START_PRODUCT_TOUR = 'start-product-tour',
-    SKIP = 'skip',
-}
-
-// we show a new sequence with 1 second delay, because users immediately dismiss prompts that are invasive
-const NEW_SEQUENCE_DELAY = 1000
-// make sure to change this prefix in case the schema of cached values is changed
-// otherwise the code will try to run with cached deprecated values
-const CACHE_PREFIX = 'v5'
-
-const iconMap = {
-    home: <Lettermark name="PostHog" />,
-    'live-events': <IconLive />,
-    dashboard: <IconGauge />,
-    insight: <IconBarChart />,
-    messages: <IconMessages />,
-    recordings: <IconRecording />,
-    'feature-flags': <IconFlag />,
-    experiments: <IconExperiment />,
-    'web-performance': <IconCoffee />,
-    'data-management': <IconUnverifiedEvent />,
-    persons: <IconPerson />,
-    cohorts: <IconCohort />,
-    annotations: <IconComment />,
-    apps: <IconApps />,
-    toolbar: <IconTools />,
-    'trend-up': <IconTrendUp />,
-}
-
-/** Display a <LemonActionableTooltip> with the ability to remove it from the DOM */
-function cancellableTooltipWithRetries(
-    tooltip: Tooltip,
-    onAction: (action: string) => void,
-    options: { maxSteps: number; onClose: () => void; next: () => void; previous: () => void }
-): { close: () => void; show: Promise<unknown> } {
-    let trigger = (): void => {}
-    const close = (): number => window.setTimeout(trigger, 1)
-    const show = new Promise((resolve, reject) => {
-        const div = document.createElement('div')
-        const root = createRoot(div)
-        function destroy(): void {
-            root.unmount()
-            if (div.parentNode) {
-                div.parentNode.removeChild(div)
-            }
-        }
-
-        document.body.appendChild(div)
-        trigger = destroy
-
-        const tryRender = function (retries: number): void {
-            try {
-                let props: LemonActionableTooltipProps = {
-                    title: tooltip.title,
-                    text: tooltip.text,
-                    placement: tooltip.placement,
-                    step: tooltip.step,
-                    maxSteps: options.maxSteps,
-                    next: () => {
-                        destroy()
-                        options.next()
-                    },
-                    previous: () => {
-                        destroy()
-                        options.previous()
-                    },
-                    close: () => {
-                        destroy()
-                        options.onClose()
-                    },
-                    visible: true,
-                    buttons: tooltip.buttons
-                        ? tooltip.buttons.map((button) => {
-                              if (button.action) {
-                                  return {
-                                      ...button,
-                                      action: () => onAction(button.action as string),
-                                  }
-                              }
-                              return {
-                                  url: button.url,
-                                  label: button.label,
-                              }
-                          })
-                        : [],
-                    icon: tooltip.icon ? iconMap[tooltip.icon] : null,
-                }
-                if (tooltip.reference) {
-                    const element = tooltip.reference
-                        ? (document.querySelector(`[data-attr="${tooltip.reference}"]`) as HTMLElement)
-                        : null
-                    if (!element) {
-                        throw 'Prompt reference element not found'
-                    }
-                    props = { ...props, element }
-                }
-
-                root.render(<LemonActionableTooltip {...props} />)
-
-                resolve(true)
-            } catch (e) {
-                if (retries == 0) {
-                    reject(e)
-                } else {
-                    setTimeout(function () {
-                        tryRender(retries - 1)
-                    }, 1000)
-                }
-            }
-        }
-        tryRender(3)
-    })
-
-    return {
-        close,
-        show,
-    }
-}
-
-export const inAppPromptLogic = kea<inAppPromptLogicType>([
-    path(['lib', 'logic', 'inAppPrompt']),
-    connect(inAppPromptEventCaptureLogic),
-    actions({
-        findValidSequences: true,
-        setValidSequences: (validSequences: ValidSequenceWithState[]) => ({ validSequences }),
-        runFirstValidSequence: (options: { runDismissedOrCompleted?: boolean }) => ({ options }),
-        runSequence: (sequence: PromptSequence, step: number) => ({ sequence, step }),
-        promptShownSuccessfully: true,
-        closePrompts: true,
-        dismissSequence: true,
-        clearSequence: true,
-        nextPrompt: true,
-        previousPrompt: true,
-        updatePromptState: (update: Partial<PromptState>) => ({ update }),
-        setUserState: (state: PromptUserState, sync = true) => ({ state, sync }),
-        syncState: (options: { forceRun?: boolean }) => ({ options }),
-        setSequences: (sequences: PromptSequence[]) => ({ sequences }),
-        promptAction: (action: string) => ({ action }),
-        optInProductTour: true,
-        optOutProductTour: true,
-    }),
-    reducers(() => ({
-        sequences: [
-            [] as PromptSequence[],
-            { persist: true, prefix: CACHE_PREFIX },
-            {
-                setSequences: (_, { sequences }) => sequences,
-            },
-        ],
-        currentSequence: [
-            null as PromptSequence | null,
-            {
-                runSequence: (_, { sequence }) => sequence,
-                clearSequence: () => null,
-            },
-        ],
-        currentStep: [
-            0,
-            {
-                runSequence: (_, { step }) => step,
-                clearSequence: () => 0,
-            },
-        ],
-        userState: [
-            {} as PromptUserState,
-            { persist: true, prefix: CACHE_PREFIX },
-            {
-                setUserState: (_, { state }) => state,
-            },
-        ],
-        canShowProductTour: [
-            false,
-            { persist: true, prefix: CACHE_PREFIX },
-            {
-                optInProductTour: () => true,
-                optOutProductTour: () => false,
-            },
-        ],
-        validSequences: [
-            [] as ValidSequenceWithState[],
-            {
-                setValidSequences: (_, { validSequences }) => validSequences,
-            },
-        ],
-        validProductTourSequences: [
-            [] as ValidSequenceWithState[],
-            {
-                setValidSequences: (_, { validSequences }) =>
-                    validSequences?.filter((v) => v.sequence.type === 'product-tour') || [],
-            },
-        ],
-        isPromptVisible: [
-            false,
-            {
-                promptShownSuccessfully: () => true,
-                closePrompts: () => false,
-                dismissSequence: () => false,
-            },
-        ],
-    })),
-    selectors(() => ({
-        prompts: [(s) => [s.currentSequence], (sequence: PromptSequence | null) => sequence?.prompts ?? []],
-        sequenceKey: [(s) => [s.currentSequence], (sequence: PromptSequence | null) => sequence?.key],
-    })),
-    listeners(({ actions, values, cache }) => ({
-        syncState: async ({ options }, breakpoint) => {
-            await breakpoint(100)
-            try {
-                const updatedState = await api.update(`api/prompts/my_prompts`, values.userState)
-                if (updatedState) {
-                    if (JSON.stringify(values.userState) !== JSON.stringify(updatedState['state'])) {
-                        actions.setUserState(updatedState['state'], false)
-                    }
-                    if (
-                        JSON.stringify(values.sequences) !== JSON.stringify(updatedState['sequences']) ||
-                        options.forceRun
-                    ) {
-                        actions.setSequences(updatedState['sequences'])
-                    }
-                }
-            } catch (error: any) {
-                console.error(error)
-            }
-        },
-        closePrompts: () => cache.runOnClose?.(),
-        setSequences: actions.findValidSequences,
-        runSequence: async ({ sequence, step = 0 }) => {
-            const prompt = sequence.prompts.find((prompt) => prompt.step === step)
-            if (prompt) {
-                switch (prompt.type) {
-                    case 'tooltip': {
-                        const { close, show } = cancellableTooltipWithRetries(prompt, actions.promptAction, {
-                            maxSteps: values.prompts.length,
-                            onClose: actions.dismissSequence,
-                            previous: () => actions.promptAction(DefaultAction.PREVIOUS),
-                            next: () => actions.promptAction(DefaultAction.NEXT),
-                        })
-                        cache.runOnClose = close
-
-                        try {
-                            await show
-                            const updatedState: Partial<PromptState> = {
-                                step: values.currentStep,
-                            }
-                            if (step === sequence.prompts.length - 1) {
-                                updatedState.completed = true
-                                inAppPromptEventCaptureLogic.actions.reportPromptSequenceCompleted(
-                                    sequence.key,
-                                    step,
-                                    values.prompts.length
-                                )
-                            }
-                            actions.updatePromptState(updatedState)
-                            inAppPromptEventCaptureLogic.actions.reportPromptShown(
-                                prompt.type,
-                                sequence.key,
-                                step,
-                                values.prompts.length
-                            )
-                            actions.promptShownSuccessfully()
-                        } catch (e) {
-                            console.error(e)
-                        }
-                        break
-                    }
-                    default:
-                        break
-                }
-            }
-        },
-        updatePromptState: ({ update }) => {
-            if (values.sequenceKey) {
-                const key = values.sequenceKey
-                const currentState = values.userState[key] || { key, step: 0 }
-                actions.setUserState({
-                    ...values.userState,
-                    [key]: {
-                        ...currentState,
-                        ...update,
-                        last_updated_at: now().toISOString(),
-                    },
-                })
-            }
-        },
-        previousPrompt: () => {
-            if (values.currentSequence) {
-                actions.runSequence(values.currentSequence, values.currentStep - 1)
-                inAppPromptEventCaptureLogic.actions.reportPromptBackward(
-                    values.currentSequence.key,
-                    values.currentStep,
-                    values.currentSequence.prompts.length
-                )
-            }
-        },
-        nextPrompt: () => {
-            if (values.currentSequence) {
-                actions.runSequence(values.currentSequence, values.currentStep + 1)
-                inAppPromptEventCaptureLogic.actions.reportPromptForward(
-                    values.currentSequence.key,
-                    values.currentStep,
-                    values.currentSequence.prompts.length
-                )
-            }
-        },
-        findValidSequences: () => {
-            const pathname = router.values.currentLocation.pathname
-            const valid = []
-            for (const sequence of values.sequences) {
-                // for now the only valid rule is related to the pathname, can be extended
-                const must_match = [...sequence.path_match]
-                if (must_match.includes('/*')) {
-                    must_match.push('/**')
-                }
-                const isMatchingPath = must_match.some((value) => wcmatch(value)(pathname))
-                if (!isMatchingPath) {
-                    continue
-                }
-                const isMatchingExclusion = sequence.path_exclude.some((value) => wcmatch(value)(pathname))
-                if (isMatchingExclusion) {
-                    continue
-                }
-                const hasOptedInToSequence = sequence.requires_opt_in ? values.canShowProductTour : true
-                if (!values.userState[sequence.key]) {
-                    continue
-                }
-                const sequenceState = values.userState[sequence.key]
-                const completed = !!sequenceState.completed || sequenceState.step === sequence.prompts.length
-                const canRun = !sequenceState.dismissed && hasOptedInToSequence
-                if (!canRun) {
-                    continue
-                }
-                if (sequence.type !== 'product-tour' && (completed || sequenceState.step === sequence.prompts.length)) {
-                    continue
-                }
-                valid.push({
-                    sequence,
-                    state: {
-                        step: sequenceState.step ? sequenceState.step + 1 : 0,
-                        completed,
-                    },
-                })
-            }
-            actions.setValidSequences(valid)
-        },
-        setValidSequences: () => {
-            if (!values.isPromptVisible) {
-                actions.runFirstValidSequence({})
-            }
-        },
-        runFirstValidSequence: ({ options }) => {
-            if (values.validSequences) {
-                actions.closePrompts()
-                let firstValid = null
-                if (options.runDismissedOrCompleted) {
-                    firstValid = values.validSequences[0]
-                } else {
-                    // to make it less greedy, we don't allow half-run sequences to be started automatically
-                    firstValid = values.validSequences.filter(
-                        (sequence) => !sequence.state.completed && sequence.state.step === 0
-                    )?.[0]
-                }
-                if (firstValid) {
-                    const { sequence, state } = firstValid
-                    setTimeout(() => actions.runSequence(sequence, state.step), NEW_SEQUENCE_DELAY)
-                }
-            }
-        },
-        dismissSequence: () => {
-            if (values.sequenceKey) {
-                const key = values.sequenceKey
-                const currentState = values.userState[key]
-                if (currentState && !currentState.completed) {
-                    actions.updatePromptState({
-                        dismissed: true,
-                    })
-                    if (values.currentStep < values.prompts.length) {
-                        inAppPromptEventCaptureLogic.actions.reportPromptSequenceDismissed(
-                            values.sequenceKey,
-                            values.currentStep,
-                            values.prompts.length
-                        )
-                    }
-                }
-                actions.clearSequence()
-            }
-        },
-        setUserState: ({ sync }) => sync && actions.syncState({}),
-        promptAction: ({ action }) => {
-            actions.closePrompts()
-            switch (action) {
-                case DefaultAction.NEXT:
-                    actions.nextPrompt()
-                    break
-                case DefaultAction.PREVIOUS:
-                    actions.previousPrompt()
-                    break
-                case DefaultAction.START_PRODUCT_TOUR:
-                    actions.optInProductTour()
-                    inAppPromptEventCaptureLogic.actions.reportProductTourStarted()
-                    actions.runFirstValidSequence({ runDismissedOrCompleted: true })
-                    break
-                case DefaultAction.SKIP:
-                    actions.optOutProductTour()
-                    inAppPromptEventCaptureLogic.actions.reportProductTourSkipped()
-                    break
-                default: {
-                    const potentialSequence = values.sequences.find((s) => s.key === action)
-                    if (potentialSequence) {
-                        actions.runSequence(potentialSequence, 0)
-                    }
-                    break
-                }
-            }
-        },
-    })),
-    urlToAction(({ actions }) => ({
-        '*': () => {
-            actions.closePrompts()
-            if (!['login', 'signup', 'ingestion'].find((path) => router.values.location.pathname.includes(path))) {
-                actions.findValidSequences()
-            }
-        },
-    })),
-    afterMount(({ actions }) => {
-        actions.syncState({ forceRun: true })
-    }),
-    beforeUnmount(({ cache }) => cache.runOnClose?.()),
-])
diff --git a/frontend/src/lib/logic/promptLogic.tsx b/frontend/src/lib/logic/promptLogic.tsx
index 371cc7cdc7d25..d6f78532b8ed0 100644
--- a/frontend/src/lib/logic/promptLogic.tsx
+++ b/frontend/src/lib/logic/promptLogic.tsx
@@ -106,7 +106,7 @@ function Prompt({
     )
 }
 
-export function cancellablePrompt(config: Pick<PromptProps, 'title' | 'placeholder' | 'value' | 'rules'>): {
+function cancellablePrompt(config: Pick<PromptProps, 'title' | 'placeholder' | 'value' | 'rules'>): {
     cancel: () => void
     promise: Promise<unknown>
 } {
diff --git a/frontend/src/lib/taxonomy.tsx b/frontend/src/lib/taxonomy.tsx
index 4f7d470271b63..a703ebf73046e 100644
--- a/frontend/src/lib/taxonomy.tsx
+++ b/frontend/src/lib/taxonomy.tsx
@@ -61,6 +61,14 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = {
             label: 'Screen',
             description: 'When a user loads a screen in a mobile app.',
         },
+        $set: {
+            label: 'Set',
+            description: 'Setting person properties.',
+        },
+        $opt_in: {
+            label: 'Opt In',
+            description: 'When a user opts into analytics.',
+        },
         $feature_flag_called: {
             label: 'Feature Flag Called',
             description: (
@@ -106,14 +114,6 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = {
             label: 'Rageclick',
             description: 'A user has rapidly and repeatedly clicked in a single place',
         },
-        $set: {
-            label: 'Set',
-            description: 'Person properties to be set',
-        },
-        $set_once: {
-            label: 'Set Once',
-            description: 'Person properties to be set if not set already (i.e. first-touch)',
-        },
         $exception: {
             label: 'Exception',
             description: 'Automatically captured exceptions from the client Sentry integration',
@@ -178,6 +178,14 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = {
     },
     event_properties: {
         distinct_id: {} as CoreFilterDefinition, // Copied from metadata down below
+        $set: {
+            label: 'Set',
+            description: 'Person properties to be set',
+        },
+        $set_once: {
+            label: 'Set Once',
+            description: 'Person properties to be set if not set already (i.e. first-touch)',
+        },
         $pageview_id: {
             label: 'Pageview ID',
             description: "PostHog's internal ID for matching events to a pageview.",
@@ -901,6 +909,7 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = {
         },
     },
 } satisfies Partial<Record<TaxonomicFilterGroupType, Record<string, CoreFilterDefinition>>>
+
 CORE_FILTER_DEFINITIONS_BY_GROUP.person_properties = Object.fromEntries(
     Object.entries(CORE_FILTER_DEFINITIONS_BY_GROUP.event_properties).flatMap(([key, value]) =>
         eventToPersonProperties.has(key) || key.startsWith('$geoip_')
diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.ts
index 93d80167f6ca7..9025128a3ae11 100644
--- a/frontend/src/mocks/handlers.ts
+++ b/frontend/src/mocks/handlers.ts
@@ -111,8 +111,5 @@ export const defaultMocks: Mocks = {
         'https://app.posthog.com/engage/': (): MockSignature => [200, 'ok'],
         '/api/projects/:team_id/insights/:insight_id/viewed/': (): MockSignature => [201, null],
     },
-    patch: {
-        '/api/prompts/my_prompts': (): MockSignature => [200, {}],
-    },
 }
 export const handlers = mocksToHandlers(defaultMocks)
diff --git a/frontend/src/models/cohortsModel.ts b/frontend/src/models/cohortsModel.ts
index b095a9b946472..89b75b7e01404 100644
--- a/frontend/src/models/cohortsModel.ts
+++ b/frontend/src/models/cohortsModel.ts
@@ -8,6 +8,7 @@ import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 import { BehavioralFilterKey } from 'scenes/cohorts/CohortFilters/types'
 import { personsLogic } from 'scenes/persons/personsLogic'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
+import { urls } from 'scenes/urls'
 
 import {
     AnyCohortCriteriaType,
@@ -131,7 +132,7 @@ export const cohortsModel = kea<cohortsModelType>([
     listeners(({ actions }) => ({
         loadCohortsSuccess: async ({ cohorts }: { cohorts: CohortType[] }) => {
             const is_calculating = cohorts.filter((cohort) => cohort.is_calculating).length > 0
-            if (!is_calculating) {
+            if (!is_calculating || !window.location.pathname.includes(urls.cohorts())) {
                 return
             }
             actions.setPollTimeout(window.setTimeout(actions.loadCohorts, POLL_TIMEOUT))
diff --git a/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx b/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx
new file mode 100644
index 0000000000000..1bef791f6035c
--- /dev/null
+++ b/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx
@@ -0,0 +1,77 @@
+import { useActions, useValues } from 'kea'
+import { IconSettings } from 'lib/lemon-ui/icons'
+import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch'
+import { filterTestAccountsDefaultsLogic } from 'scenes/settings/project/filterTestAccountDefaultsLogic'
+import { teamLogic } from 'scenes/teamLogic'
+import { urls } from 'scenes/urls'
+
+import { DataNode, EventsQuery, HogQLQuery } from '~/queries/schema'
+import { isEventsQuery, isHogQLQuery } from '~/queries/utils'
+
+interface TestAccountFiltersProps {
+    query: DataNode
+    setQuery?: (query: EventsQuery | HogQLQuery) => void
+}
+export function TestAccountFilters({ query, setQuery }: TestAccountFiltersProps): JSX.Element | null {
+    const { currentTeam } = useValues(teamLogic)
+    const hasFilters = (currentTeam?.test_account_filters || []).length > 0
+    const { setLocalDefault } = useActions(filterTestAccountsDefaultsLogic)
+
+    if (!isEventsQuery(query) && !isHogQLQuery(query)) {
+        return null
+    }
+    const checked = hasFilters
+        ? !!(isHogQLQuery(query)
+              ? query.filters?.filterTestAccounts
+              : isEventsQuery(query)
+              ? query.filterTestAccounts
+              : false)
+        : false
+    const onChange = isHogQLQuery(query)
+        ? (checked: boolean) => {
+              const newQuery: HogQLQuery = {
+                  ...query,
+                  filters: {
+                      ...query.filters,
+                      filterTestAccounts: checked,
+                  },
+              }
+              setQuery?.(newQuery)
+          }
+        : isEventsQuery(query)
+        ? (checked: boolean) => {
+              const newQuery: EventsQuery = {
+                  ...query,
+                  filterTestAccounts: checked,
+              }
+              setQuery?.(newQuery)
+          }
+        : undefined
+
+    return (
+        <LemonSwitch
+            checked={checked}
+            onChange={(checked: boolean) => {
+                onChange?.(checked)
+                setLocalDefault(checked)
+            }}
+            id="test-account-filter"
+            bordered
+            label={
+                <div className="flex items-center">
+                    <span>Filter out internal and test users</span>
+                    <LemonButton
+                        icon={<IconSettings />}
+                        to={urls.settings('project-product-analytics', 'internal-user-filtering')}
+                        size="small"
+                        noPadding
+                        className="ml-1"
+                    />
+                </div>
+            }
+            disabledReason={!hasFilters ? "You haven't set any internal and test filters" : null}
+        />
+    )
+    return null
+}
diff --git a/frontend/src/queries/nodes/DataTable/DataTable.tsx b/frontend/src/queries/nodes/DataTable/DataTable.tsx
index a130a03e092f9..4ad6278ed8424 100644
--- a/frontend/src/queries/nodes/DataTable/DataTable.tsx
+++ b/frontend/src/queries/nodes/DataTable/DataTable.tsx
@@ -19,6 +19,7 @@ import { DateRange } from '~/queries/nodes/DataNode/DateRange'
 import { ElapsedTime } from '~/queries/nodes/DataNode/ElapsedTime'
 import { LoadNext } from '~/queries/nodes/DataNode/LoadNext'
 import { Reload } from '~/queries/nodes/DataNode/Reload'
+import { TestAccountFilters } from '~/queries/nodes/DataNode/TestAccountFilters'
 import { BackToSource } from '~/queries/nodes/DataTable/BackToSource'
 import { ColumnConfigurator } from '~/queries/nodes/DataTable/ColumnConfigurator/ColumnConfigurator'
 import { DataTableExport } from '~/queries/nodes/DataTable/DataTableExport'
@@ -130,6 +131,7 @@ export function DataTable({
     const {
         showActions,
         showDateRange,
+        showTestAccountFilters,
         showSearch,
         showEventFilter,
         showPropertyFilter,
@@ -420,6 +422,9 @@ export function DataTable({
     ].filter((x) => !!x)
 
     const firstRowRight = [
+        showTestAccountFilters && sourceFeatures.has(QueryFeature.testAccountFilters) ? (
+            <TestAccountFilters key="test-account-filters" query={query.source} setQuery={setQuerySource} />
+        ) : null,
         showSavedQueries && sourceFeatures.has(QueryFeature.savedEventsQueries) ? (
             <SavedQueries key="saved-queries" query={query} setQuery={setQuery} />
         ) : null,
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
index ea5a114aa6f5f..99c6c2c2e234c 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
@@ -178,6 +178,7 @@ export const dataTableLogic = kea<dataTableLogicType>([
                         showSearch: query.showSearch ?? showIfFull,
                         showActions: query.showActions ?? true,
                         showDateRange: query.showDateRange ?? showIfFull,
+                        showTestAccountFilters: query.showTestAccountFilters ?? showIfFull,
                         showExport: query.showExport ?? showIfFull,
                         showReload: query.showReload ?? showIfFull,
                         showTimings: query.showTimings ?? flagQueryTimingsEnabled,
diff --git a/frontend/src/queries/nodes/DataTable/queryFeatures.ts b/frontend/src/queries/nodes/DataTable/queryFeatures.ts
index ff10bec2b3137..4a6ae92296559 100644
--- a/frontend/src/queries/nodes/DataTable/queryFeatures.ts
+++ b/frontend/src/queries/nodes/DataTable/queryFeatures.ts
@@ -23,6 +23,7 @@ export enum QueryFeature {
     selectAndOrderByColumns,
     displayResponseError,
     hideLoadNextButton,
+    testAccountFilters,
 }
 
 export function getQueryFeatures(query: Node): Set<QueryFeature> {
@@ -34,6 +35,7 @@ export function getQueryFeatures(query: Node): Set<QueryFeature> {
         features.add(QueryFeature.eventPropertyFilters)
         features.add(QueryFeature.resultIsArrayOfArrays)
         features.add(QueryFeature.displayResponseError)
+        features.add(QueryFeature.testAccountFilters)
     }
 
     if (isEventsQuery(query)) {
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Charts/LineGraph.tsx b/frontend/src/queries/nodes/DataVisualization/Components/Charts/LineGraph.tsx
index 0e5066658245e..a7c5e4d9237f7 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/Charts/LineGraph.tsx
+++ b/frontend/src/queries/nodes/DataVisualization/Components/Charts/LineGraph.tsx
@@ -203,7 +203,6 @@ export const LineGraph = (): JSX.Element => {
                                                 },
                                             },
                                         ]}
-                                        size="small"
                                         uppercaseHeader={false}
                                         rowRibbonColor={(_datum, index) => getSeriesColor(index)}
                                         showHeader
diff --git a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
index d7efa47f6f9a6..fcf6b70df4932 100644
--- a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
@@ -79,11 +79,11 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
                         return []
                     }
 
-                    const columns: string[] = response['columns']
-                    const types: string[][] = response['types']
+                    const columns: string[] = response['columns'] ?? []
+                    const types: string[][] = response['types'] ?? []
 
                     return columns.map((column, index) => {
-                        const type = types[index][1]
+                        const type = types[index]?.[1]
                         return {
                             name: column,
                             type,
diff --git a/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx b/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
index 9bc09e1089cb7..45cb608451271 100644
--- a/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
+++ b/frontend/src/queries/nodes/HogQLQuery/HogQLQueryEditor.tsx
@@ -205,10 +205,6 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
                                 monaco.languages.registerCompletionItemProvider('mysql', {
                                     triggerCharacters: [' ', ',', '.'],
                                     provideCompletionItems: async (model, position) => {
-                                        if (!logic.isMounted()) {
-                                            return undefined
-                                        }
-
                                         if (!featureFlags[FEATURE_FLAGS.HOGQL_AUTOCOMPLETE]) {
                                             return undefined
                                         }
@@ -226,7 +222,7 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
 
                                         const response = await query<HogQLAutocomplete>({
                                             kind: NodeKind.HogQLAutocomplete,
-                                            select: logic.values.queryInput,
+                                            select: model.getValue(), // Use the text from the model instead of logic due to a race condition on the logic values updating quick enough
                                             filters: props.query.filters,
                                             startPosition: startOffset,
                                             endPosition: endOffset,
@@ -239,7 +235,10 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
                                             const sortText = kindToSortText(item.kind, item.label)
 
                                             return {
-                                                label: item.label,
+                                                label: {
+                                                    label: item.label,
+                                                    detail: item.detail,
+                                                },
                                                 documentation: item.documentation,
                                                 insertText: item.insertText,
                                                 range: {
@@ -262,6 +261,7 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
 
                                         return {
                                             suggestions,
+                                            incomplete: response.incomplete_list,
                                         }
                                     },
                                 })
@@ -338,6 +338,9 @@ export function HogQLQueryEditor(props: HogQLQueryEditorProps): JSX.Element {
                                 scrollBeyondLastLine: false,
                                 automaticLayout: true,
                                 fixedOverflowWidgets: true,
+                                suggest: {
+                                    showInlineDetails: true,
+                                },
                             }}
                         />
                     </div>
diff --git a/frontend/src/queries/nodes/InsightViz/EditorFilterGroup.tsx b/frontend/src/queries/nodes/InsightViz/EditorFilterGroup.tsx
index b7b3ec8bf4e2c..df2c131fdc499 100644
--- a/frontend/src/queries/nodes/InsightViz/EditorFilterGroup.tsx
+++ b/frontend/src/queries/nodes/InsightViz/EditorFilterGroup.tsx
@@ -1,9 +1,9 @@
 import './EditorFilterGroup.scss'
 
-import { PureField } from 'lib/forms/Field'
 import { IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
 import { LemonBadge } from 'lib/lemon-ui/LemonBadge/LemonBadge'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { slugify } from 'lib/utils'
 import { Fragment, useState } from 'react'
 
@@ -49,13 +49,13 @@ export function EditorFilterGroup({ insightProps, editorFilterGroup }: EditorFil
                         }
                         return (
                             <Fragment key={key}>
-                                <PureField
+                                <LemonField.Pure
                                     label={typeof Label === 'function' ? <Label insightProps={insightProps} /> : Label}
                                     info={tooltip}
                                     showOptional={showOptional}
                                 >
                                     {Component ? <Component insightProps={insightProps} /> : null}
-                                </PureField>
+                                </LemonField.Pure>
                             </Fragment>
                         )
                     })}
diff --git a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.scss b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.scss
index 618d3c39bca1f..8eface52ec75f 100644
--- a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.scss
+++ b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/PropertyGroupFilters.scss
@@ -2,11 +2,8 @@
     .property-group {
         padding: 0.5rem;
         background-color: var(--side);
+        border-width: 1px;
         border-radius: var(--radius);
-
-        .posthog-3000 & {
-            border-width: 1px;
-        }
     }
 
     .property-group-and-or-separator {
diff --git a/frontend/src/queries/query.ts b/frontend/src/queries/query.ts
index 8e5427c250acc..1072be3faa713 100644
--- a/frontend/src/queries/query.ts
+++ b/frontend/src/queries/query.ts
@@ -402,6 +402,25 @@ export function legacyInsightQueryURL({ filters, currentTeamId, refresh }: Legac
     }
 }
 
+export function legacyInsightQueryData({
+    filters,
+    currentTeamId,
+    refresh,
+}: LegacyInsightQueryParams): [string, Record<string, any>] {
+    const baseUrl = `api/projects/${currentTeamId}/insights`
+
+    if (isTrendsFilter(filters) || isStickinessFilter(filters) || isLifecycleFilter(filters)) {
+        return [`${baseUrl}/trend/`, { ...filterTrendsClientSideParams(filters), refresh }]
+    } else if (isRetentionFilter(filters)) {
+        return [`${baseUrl}/retention/`, { ...filters, refresh }]
+    } else if (isFunnelsFilter(filters)) {
+        return [`${baseUrl}/funnel/`, { ...filters, refresh }]
+    } else if (isPathsFilter(filters)) {
+        return [`${baseUrl}/path/`, { ...filters, refresh }]
+    }
+    throw new Error(`Unsupported insight type: ${filters.insight}`)
+}
+
 export function legacyInsightQueryExportContext({
     filters,
     currentTeamId,
@@ -442,16 +461,17 @@ export async function legacyInsightQuery({
     methodOptions,
     refresh,
 }: LegacyInsightQueryParams): Promise<[Response, string]> {
-    const apiUrl = legacyInsightQueryURL({ filters, currentTeamId, refresh })
+    const [apiUrl, data] = legacyInsightQueryData({ filters, currentTeamId, refresh })
     let fetchResponse: Response
-    if (isTrendsFilter(filters) || isStickinessFilter(filters) || isLifecycleFilter(filters)) {
-        fetchResponse = await api.getResponse(apiUrl, methodOptions)
-    } else if (isRetentionFilter(filters)) {
-        fetchResponse = await api.getResponse(apiUrl, methodOptions)
-    } else if (isFunnelsFilter(filters)) {
-        fetchResponse = await api.createResponse(apiUrl, filters, methodOptions)
-    } else if (isPathsFilter(filters)) {
-        fetchResponse = await api.createResponse(apiUrl, filters, methodOptions)
+    if (
+        isTrendsFilter(filters) ||
+        isStickinessFilter(filters) ||
+        isLifecycleFilter(filters) ||
+        isRetentionFilter(filters) ||
+        isFunnelsFilter(filters) ||
+        isPathsFilter(filters)
+    ) {
+        fetchResponse = await api.createResponse(apiUrl, data, methodOptions)
     } else {
         throw new Error(`Unsupported insight type: ${filters.insight}`)
     }
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
index 4c14f1fd1c36d..65324bebb1349 100644
--- a/frontend/src/queries/schema.json
+++ b/frontend/src/queries/schema.json
@@ -314,6 +314,10 @@
         "AutocompleteCompletionItem": {
             "additionalProperties": false,
             "properties": {
+                "detail": {
+                    "description": "A human-readable string with additional information about this item, like type or symbol information.",
+                    "type": "string"
+                },
                 "documentation": {
                     "description": "A human-readable string that represents a doc-comment.",
                     "type": "string"
@@ -659,6 +663,10 @@
                     "description": "Include a free text search field (PersonsNode only)",
                     "type": "boolean"
                 },
+                "showTestAccountFilters": {
+                    "description": "Show filter to exclude test accounts",
+                    "type": "boolean"
+                },
                 "showTimings": {
                     "description": "Show a detailed query timing breakdown",
                     "type": "boolean"
@@ -1128,6 +1136,10 @@
                     "description": "Limit to events matching this string",
                     "type": ["string", "null"]
                 },
+                "filterTestAccounts": {
+                    "description": "Filter test accounts",
+                    "type": "boolean"
+                },
                 "fixedProperties": {
                     "description": "Fixed properties in the query, can't be edited in the interface (e.g. scoping down by person)",
                     "items": {
@@ -1934,6 +1946,10 @@
         "HogQLAutocompleteResponse": {
             "additionalProperties": false,
             "properties": {
+                "incomplete_list": {
+                    "description": "Whether or not the suggestions returned are complete",
+                    "type": "boolean"
+                },
                 "suggestions": {
                     "items": {
                         "$ref": "#/definitions/AutocompleteCompletionItem"
@@ -1941,7 +1957,7 @@
                     "type": "array"
                 }
             },
-            "required": ["suggestions"],
+            "required": ["suggestions", "incomplete_list"],
             "type": "object"
         },
         "HogQLExpression": {
@@ -1954,6 +1970,9 @@
                 "dateRange": {
                     "$ref": "#/definitions/DateRange"
                 },
+                "filterTestAccounts": {
+                    "type": "boolean"
+                },
                 "properties": {
                     "items": {
                         "$ref": "#/definitions/AnyPropertyFilter"
@@ -3568,6 +3587,10 @@
                 {
                     "additionalProperties": false,
                     "properties": {
+                        "incomplete_list": {
+                            "description": "Whether or not the suggestions returned are complete",
+                            "type": "boolean"
+                        },
                         "suggestions": {
                             "items": {
                                 "$ref": "#/definitions/AutocompleteCompletionItem"
@@ -3575,7 +3598,7 @@
                             "type": "array"
                         }
                     },
-                    "required": ["suggestions"],
+                    "required": ["suggestions", "incomplete_list"],
                     "type": "object"
                 },
                 {
@@ -4329,6 +4352,10 @@
                 "showTable": {
                     "type": "boolean"
                 },
+                "showTestAccountFilters": {
+                    "description": "Show filter to exclude test accounts",
+                    "type": "boolean"
+                },
                 "showTimings": {
                     "description": "Show a detailed query timing breakdown",
                     "type": "boolean"
@@ -4981,6 +5008,9 @@
         "WebOverviewQuery": {
             "additionalProperties": false,
             "properties": {
+                "compare": {
+                    "type": "boolean"
+                },
                 "dateRange": {
                     "$ref": "#/definitions/DateRange"
                 },
diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
index 57f0e90f1a9db..39777ac23a726 100644
--- a/frontend/src/queries/schema.ts
+++ b/frontend/src/queries/schema.ts
@@ -206,6 +206,7 @@ export interface HogQLQueryResponse {
 export interface HogQLFilters {
     properties?: AnyPropertyFilter[]
     dateRange?: DateRange
+    filterTestAccounts?: boolean
 }
 
 export interface HogQLQuery extends DataNode {
@@ -249,6 +250,11 @@ export interface AutocompleteCompletionItem {
      * A human-readable string that represents a doc-comment.
      */
     documentation?: string
+    /**
+     * A human-readable string with additional information
+     * about this item, like type or symbol information.
+     */
+    detail?: string
     /**
      * A string or snippet that should be inserted in a document when selecting
      * this completion.
@@ -291,6 +297,8 @@ export interface AutocompleteCompletionItem {
 
 export interface HogQLAutocompleteResponse {
     suggestions: AutocompleteCompletionItem[]
+    /** Whether or not the suggestions returned are complete */
+    incomplete_list: boolean
 }
 
 export interface HogQLMetadata extends DataNode {
@@ -402,6 +410,8 @@ export interface EventsQuery extends DataNode {
     properties?: AnyPropertyFilter[]
     /** Fixed properties in the query, can't be edited in the interface (e.g. scoping down by person) */
     fixedProperties?: AnyPropertyFilter[]
+    /** Filter test accounts */
+    filterTestAccounts?: boolean
     /** Limit to events matching this string */
     event?: string | null
     /**
@@ -501,6 +511,8 @@ interface DataTableNodeViewProps {
     showSearch?: boolean
     /** Include a property filter above the table */
     showPropertyFilter?: boolean
+    /** Show filter to exclude test accounts */
+    showTestAccountFilters?: boolean
     /** Include a HogQL query editor above HogQL tables */
     showHogQLEditor?: boolean
     /** Show the kebab menu at the end of the row */
@@ -961,6 +973,7 @@ export interface WebAnalyticsQueryBase {
 export interface WebOverviewQuery extends WebAnalyticsQueryBase {
     kind: NodeKind.WebOverviewQuery
     response?: WebOverviewQueryResponse
+    compare?: boolean
 }
 
 export interface WebOverviewItem {
diff --git a/frontend/src/scenes/App.tsx b/frontend/src/scenes/App.tsx
index 6c96864370cf3..9c5663b23fd26 100644
--- a/frontend/src/scenes/App.tsx
+++ b/frontend/src/scenes/App.tsx
@@ -4,7 +4,6 @@ import { use3000Body } from 'lib/hooks/use3000Body'
 import { ToastCloseButton } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { inAppPromptLogic } from 'lib/logic/inAppPrompt/inAppPromptLogic'
 import { Slide, ToastContainer } from 'react-toastify'
 import { frontendAppsLogic } from 'scenes/apps/frontendAppsLogic'
 import { appScenes } from 'scenes/appScenes'
@@ -29,7 +28,7 @@ window.process = MOCK_NODE_PROCESS
 
 export const appLogic = kea<appLogicType>([
     path(['scenes', 'App']),
-    connect([teamLogic, organizationLogic, frontendAppsLogic, inAppPromptLogic, actionsModel, cohortsModel]),
+    connect([teamLogic, organizationLogic, frontendAppsLogic, actionsModel, cohortsModel]),
     actions({
         enableDelayedSpinner: true,
         ignoreFeatureFlags: true,
diff --git a/frontend/src/scenes/actions/ActionEdit.tsx b/frontend/src/scenes/actions/ActionEdit.tsx
index 8da08b54dcca1..c1cbcc4145db4 100644
--- a/frontend/src/scenes/actions/ActionEdit.tsx
+++ b/frontend/src/scenes/actions/ActionEdit.tsx
@@ -5,10 +5,10 @@ import { combineUrl, router } from 'kea-router'
 import { EditableField } from 'lib/components/EditableField/EditableField'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { PageHeader } from 'lib/components/PageHeader'
-import { Field } from 'lib/forms/Field'
 import { IconInfo, IconPlayCircle, IconPlus, IconWarning } from 'lib/lemon-ui/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCheckbox } from 'lib/lemon-ui/LemonCheckbox'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 import { Link } from 'lib/lemon-ui/Link'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
@@ -69,7 +69,7 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                 <PageHeader
                     caption={
                         <>
-                            <Field name="description">
+                            <LemonField name="description">
                                 {({ value, onChange }) => (
                                     <EditableField
                                         multiline
@@ -99,8 +99,8 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                         paywall={!hasAvailableFeature(AvailableFeature.INGESTION_TAXONOMY)}
                                     />
                                 )}
-                            </Field>
-                            <Field name="tags" className="mt-2">
+                            </LemonField>
+                            <LemonField name="tags" className="mt-2">
                                 {({ value, onChange }) => (
                                     <ObjectTags
                                         tags={value ?? []}
@@ -110,7 +110,7 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                         tagsAvailable={tags.filter((tag) => !action.tags?.includes(tag))}
                                     />
                                 )}
-                            </Field>
+                            </LemonField>
                         </>
                     }
                     buttons={
@@ -175,7 +175,7 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                             <IconInfo className="ml-1 text-muted text-xl" />
                         </Link>
                     </div>
-                    <Field name="steps">
+                    <LemonField name="steps">
                         {({ onChange }) => (
                             <div className="flex justify-end mb-2">
                                 <LemonButton
@@ -187,8 +187,8 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                 </LemonButton>
                             </div>
                         )}
-                    </Field>
-                    <Field name="steps">
+                    </LemonField>
+                    <LemonField name="steps">
                         {({ value: stepsValue, onChange }) => (
                             <div className="grid grid-cols-2 gap-3">
                                 {stepsValue.map((step: ActionStepType, index: number) => {
@@ -239,10 +239,10 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                 </div>
                             </div>
                         )}
-                    </Field>
+                    </LemonField>
                 </div>
                 <div className="my-8">
-                    <Field name="post_to_slack">
+                    <LemonField name="post_to_slack">
                         {({ value, onChange }) => (
                             <div>
                                 <LemonCheckbox
@@ -270,10 +270,10 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                 </div>
                             </div>
                         )}
-                    </Field>
+                    </LemonField>
                     {!action.bytecode_error && action.post_to_slack && (
                         <>
-                            <Field name="slack_message_format">
+                            <LemonField name="slack_message_format">
                                 {({ value, onChange }) => (
                                     <>
                                         <LemonLabel showOptional>Message format</LemonLabel>
@@ -294,7 +294,7 @@ export function ActionEdit({ action: loadedAction, id }: ActionEditLogicProps):
                                         </small>
                                     </>
                                 )}
-                            </Field>
+                            </LemonField>
                         </>
                     )}
                 </div>
diff --git a/frontend/src/scenes/annotations/AnnotationModal.tsx b/frontend/src/scenes/annotations/AnnotationModal.tsx
index ad4edf2b00b23..4492b82231dc7 100644
--- a/frontend/src/scenes/annotations/AnnotationModal.tsx
+++ b/frontend/src/scenes/annotations/AnnotationModal.tsx
@@ -2,8 +2,8 @@ import { LemonButton, LemonModal, LemonModalProps, LemonSelect, LemonTextArea, L
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { DatePicker } from 'lib/components/DatePicker'
-import { Field } from 'lib/forms/Field'
 import { IconWarning } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { shortTimeZone } from 'lib/utils'
 import { urls } from 'scenes/urls'
 
@@ -81,7 +81,7 @@ export function AnnotationModal({
                 className="space-y-4"
             >
                 <div className="flex gap-2">
-                    <Field
+                    <LemonField
                         name="dateMarker"
                         label={
                             <span>
@@ -101,8 +101,8 @@ export function AnnotationModal({
                             showSecond={false}
                             format={ANNOTATION_DAYJS_FORMAT}
                         />
-                    </Field>
-                    <Field name="scope" label="Scope" className="flex-1">
+                    </LemonField>
+                    <LemonField name="scope" label="Scope" className="flex-1">
                         <LemonSelect
                             options={[
                                 ...(existingModalAnnotation?.scope === AnnotationScope.Insight || onSavedInsight
@@ -132,16 +132,16 @@ export function AnnotationModal({
                             ]}
                             fullWidth
                         />
-                    </Field>
+                    </LemonField>
                 </div>
-                <Field name="content" label="Content">
+                <LemonField name="content" label="Content">
                     <LemonTextArea
                         placeholder="What's this annotation about?"
                         onPressCmdEnter={submitAnnotationModal}
                         data-attr="create-annotation-input"
                         maxLength={400}
                     />
-                </Field>
+                </LemonField>
             </Form>
         </LemonModal>
     )
diff --git a/frontend/src/scenes/authentication/InviteSignup.tsx b/frontend/src/scenes/authentication/InviteSignup.tsx
index 0fce0f5aaeda7..d36fb9df47efa 100644
--- a/frontend/src/scenes/authentication/InviteSignup.tsx
+++ b/frontend/src/scenes/authentication/InviteSignup.tsx
@@ -6,8 +6,8 @@ import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import PasswordStrength from 'lib/components/PasswordStrength'
 import SignupRoleSelect from 'lib/components/SignupRoleSelect'
 import { SocialLoginButtons } from 'lib/components/SocialLoginButton/SocialLoginButton'
-import { Field, PureField } from 'lib/forms/Field'
 import { IconChevronLeft, IconChevronRight } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Link } from 'lib/lemon-ui/Link'
 import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
 import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
@@ -218,10 +218,10 @@ function UnauthenticatedAcceptInvite({ invite }: { invite: PrevalidatedInvite })
         >
             <h2 className="text-center">Create your PostHog account</h2>
             <Form logic={inviteSignupLogic} formKey="signup" className="space-y-4" enableFormOnSubmit>
-                <PureField label="Email">
+                <LemonField.Pure label="Email">
                     <LemonInput type="email" disabled value={invite?.target_email} />
-                </PureField>
-                <Field
+                </LemonField.Pure>
+                <LemonField
                     name="password"
                     label={
                         <div className="flex flex-1 items-center justify-between">
@@ -241,9 +241,9 @@ function UnauthenticatedAcceptInvite({ invite }: { invite: PrevalidatedInvite })
                         autoFocus={window.screen.width >= 768} // do not autofocus on small-width screens
                         disabled={isSignupSubmitting}
                     />
-                </Field>
+                </LemonField>
 
-                <Field
+                <LemonField
                     name="first_name"
                     label="First Name"
                     help={
@@ -251,11 +251,11 @@ function UnauthenticatedAcceptInvite({ invite }: { invite: PrevalidatedInvite })
                     }
                 >
                     <LemonInput data-attr="first_name" placeholder="Jane" />
-                </Field>
+                </LemonField>
 
                 <SignupRoleSelect />
 
-                <Field name="email_opt_in">
+                <LemonField name="email_opt_in">
                     {({ value, onChange }) => {
                         return (
                             <LemonCheckbox
@@ -266,7 +266,7 @@ function UnauthenticatedAcceptInvite({ invite }: { invite: PrevalidatedInvite })
                             />
                         )
                     }}
-                </Field>
+                </LemonField>
 
                 <LemonButton
                     type="primary"
diff --git a/frontend/src/scenes/authentication/Login.tsx b/frontend/src/scenes/authentication/Login.tsx
index 892cc9960be1b..f4f1a45596086 100644
--- a/frontend/src/scenes/authentication/Login.tsx
+++ b/frontend/src/scenes/authentication/Login.tsx
@@ -7,8 +7,8 @@ import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import { SocialLoginButtons, SSOEnforcedLoginButton } from 'lib/components/SocialLoginButton/SocialLoginButton'
-import { Field } from 'lib/forms/Field'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Link } from 'lib/lemon-ui/Link'
 import { useEffect, useRef } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -101,7 +101,7 @@ export function Login(): JSX.Element {
                 )}
                 <Form logic={loginLogic} formKey="login" enableFormOnSubmit className="space-y-4">
                     <RegionSelect />
-                    <Field name="email" label="Email">
+                    <LemonField name="email" label="Email">
                         <LemonInput
                             className="ph-ignore-input"
                             autoFocus
@@ -117,9 +117,9 @@ export function Login(): JSX.Element {
                                 }
                             }}
                         />
-                    </Field>
+                    </LemonField>
                     <div className={clsx('PasswordWrapper', isPasswordHidden && 'zero-height')}>
-                        <Field
+                        <LemonField
                             name="password"
                             label={
                                 <div className="flex flex-1 items-center justify-between gap-2">
@@ -138,7 +138,7 @@ export function Login(): JSX.Element {
                                 placeholder="••••••••••"
                                 autoComplete="current-password"
                             />
-                        </Field>
+                        </LemonField>
                     </div>
                     {precheckResponse.status === 'pending' || !precheckResponse.sso_enforcement ? (
                         <LemonButton
diff --git a/frontend/src/scenes/authentication/Login2FA.tsx b/frontend/src/scenes/authentication/Login2FA.tsx
index 3940f064ad3ab..f620856bf4541 100644
--- a/frontend/src/scenes/authentication/Login2FA.tsx
+++ b/frontend/src/scenes/authentication/Login2FA.tsx
@@ -2,8 +2,8 @@ import { LemonButton, LemonInput } from '@posthog/lemon-ui'
 import { useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
-import { Field } from 'lib/forms/Field'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
 import { login2FALogic } from './login2FALogic'
@@ -29,7 +29,7 @@ export function Login2FA(): JSX.Element {
 
                 <Form logic={login2FALogic} formKey="twofactortoken" enableFormOnSubmit className="space-y-4">
                     {generalError && <LemonBanner type="error">{generalError.detail}</LemonBanner>}
-                    <Field name="token" label="Authenticator token">
+                    <LemonField name="token" label="Authenticator token">
                         <LemonInput
                             className="ph-ignore-input"
                             autoFocus
@@ -38,7 +38,7 @@ export function Login2FA(): JSX.Element {
                             inputMode="numeric"
                             autoComplete="one-time-code"
                         />
-                    </Field>
+                    </LemonField>
                     <LemonButton
                         type="primary"
                         status="alt"
diff --git a/frontend/src/scenes/authentication/PasswordReset.tsx b/frontend/src/scenes/authentication/PasswordReset.tsx
index f920250ccfd44..fbe83bbf9b60b 100644
--- a/frontend/src/scenes/authentication/PasswordReset.tsx
+++ b/frontend/src/scenes/authentication/PasswordReset.tsx
@@ -7,8 +7,8 @@ import { Form } from 'kea-forms'
 import { router } from 'kea-router'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
-import { Field } from 'lib/forms/Field'
 import { IconCheckCircleOutline, IconErrorOutline } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { SceneExport } from 'scenes/sceneTypes'
@@ -92,7 +92,7 @@ function ResetForm(): JSX.Element {
             <div className="text-center">
                 Enter your email address. If an account exists, you’ll receive an email with a password reset link soon.
             </div>
-            <Field name="email" label="Email">
+            <LemonField name="email" label="Email">
                 <LemonInput
                     className="ph-ignore-input"
                     autoFocus
@@ -101,7 +101,7 @@ function ResetForm(): JSX.Element {
                     type="email"
                     disabled={isRequestPasswordResetSubmitting}
                 />
-            </Field>
+            </LemonField>
             <LemonButton
                 fullWidth
                 type="primary"
diff --git a/frontend/src/scenes/authentication/PasswordResetComplete.tsx b/frontend/src/scenes/authentication/PasswordResetComplete.tsx
index 4042f346ff9fd..83056725f0d6c 100644
--- a/frontend/src/scenes/authentication/PasswordResetComplete.tsx
+++ b/frontend/src/scenes/authentication/PasswordResetComplete.tsx
@@ -6,9 +6,9 @@ import { useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import PasswordStrength from 'lib/components/PasswordStrength'
-import { Field } from 'lib/forms/Field'
 import { IconErrorOutline } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { SceneExport } from 'scenes/sceneTypes'
 
@@ -54,7 +54,7 @@ function NewPasswordForm(): JSX.Element {
                 </LemonBanner>
             )}
             <Form logic={passwordResetLogic} formKey="passwordReset" className="space-y-4" enableFormOnSubmit>
-                <Field
+                <LemonField
                     name="password"
                     label={
                         <div className="flex flex-1 items-center justify-between">
@@ -72,9 +72,9 @@ function NewPasswordForm(): JSX.Element {
                         placeholder="••••••••••"
                         data-attr="password"
                     />
-                </Field>
+                </LemonField>
 
-                <Field name="passwordConfirm" label="Confirm Password">
+                <LemonField name="passwordConfirm" label="Confirm Password">
                     <LemonInput
                         autoComplete="new-password"
                         type="password"
@@ -82,7 +82,7 @@ function NewPasswordForm(): JSX.Element {
                         placeholder="••••••••••"
                         data-attr="password-confirm"
                     />
-                </Field>
+                </LemonField>
 
                 <LemonButton
                     fullWidth
diff --git a/frontend/src/scenes/authentication/RegionSelect.tsx b/frontend/src/scenes/authentication/RegionSelect.tsx
index 3b8e3eda542e1..2080c6bf65188 100644
--- a/frontend/src/scenes/authentication/RegionSelect.tsx
+++ b/frontend/src/scenes/authentication/RegionSelect.tsx
@@ -2,8 +2,8 @@ import { LemonModal, LemonSelect } from '@posthog/lemon-ui'
 import { useValues } from 'kea'
 import { router } from 'kea-router'
 import { CLOUD_HOSTNAMES, FEATURE_FLAGS } from 'lib/constants'
-import { PureField } from 'lib/forms/Field'
 import { IconCheckmark } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { useState } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -75,7 +75,7 @@ const RegionSelect = (): JSX.Element | null => {
     }
     return (
         <>
-            <PureField label="Data region" onExplanationClick={() => setRegionModalOpen(true)}>
+            <LemonField.Pure label="Data region" onExplanationClick={() => setRegionModalOpen(true)}>
                 <LemonSelect
                     onChange={(region) => {
                         if (!region) {
@@ -98,7 +98,7 @@ const RegionSelect = (): JSX.Element | null => {
                     ]}
                     fullWidth
                 />
-            </PureField>
+            </LemonField.Pure>
 
             <WhyCloudModal open={regionModalOpen} setOpen={setRegionModalOpen} />
         </>
diff --git a/frontend/src/scenes/authentication/Setup2FA.tsx b/frontend/src/scenes/authentication/Setup2FA.tsx
index d8ec16c187a8f..c1f84f3f1e03a 100644
--- a/frontend/src/scenes/authentication/Setup2FA.tsx
+++ b/frontend/src/scenes/authentication/Setup2FA.tsx
@@ -3,8 +3,8 @@ import './Setup2FA.scss'
 import { LemonButton, LemonInput } from '@posthog/lemon-ui'
 import { useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 import { setup2FALogic } from './setup2FALogic'
 
@@ -21,7 +21,7 @@ export function Setup2FA({ onSuccess }: { onSuccess: () => void }): JSX.Element
                     <img src="/account/two_factor/qrcode/" className="Setup2FA__image" />
                 </div>
                 {generalError && <LemonBanner type="error">{generalError.detail}</LemonBanner>}
-                <Field name="token" label="Authenticator token">
+                <LemonField name="token" label="Authenticator token">
                     <LemonInput
                         className="ph-ignore-input"
                         autoFocus
@@ -30,7 +30,7 @@ export function Setup2FA({ onSuccess }: { onSuccess: () => void }): JSX.Element
                         inputMode="numeric"
                         autoComplete="one-time-code"
                     />
-                </Field>
+                </LemonField>
                 <LemonButton htmlType="submit" data-attr="2fa-setup" fullWidth type="primary" center loading={false}>
                     Login
                 </LemonButton>
diff --git a/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel1.tsx b/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel1.tsx
index 5687d7490c8bb..237ab96e27df5 100644
--- a/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel1.tsx
+++ b/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel1.tsx
@@ -3,7 +3,7 @@ import { useValues } from 'kea'
 import { Form } from 'kea-forms'
 import PasswordStrength from 'lib/components/PasswordStrength'
 import { SocialLoginButtons } from 'lib/components/SocialLoginButton/SocialLoginButton'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Link } from 'lib/lemon-ui/Link'
 import { useEffect, useRef } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -31,7 +31,7 @@ export function SignupPanel1(): JSX.Element | null {
                 </>
             )}
             <Form logic={signupLogic} formKey="signupPanel1" className="space-y-4" enableFormOnSubmit>
-                <Field name="email" label="Email">
+                <LemonField name="email" label="Email">
                     <LemonInput
                         className="ph-ignore-input"
                         autoFocus
@@ -41,9 +41,9 @@ export function SignupPanel1(): JSX.Element | null {
                         ref={emailInputRef}
                         disabled={isSignupPanel1Submitting}
                     />
-                </Field>
+                </LemonField>
                 {!preflight?.demo && (
-                    <Field
+                    <LemonField
                         name="password"
                         label={
                             <div className="flex flex-1 items-center justify-between">
@@ -62,7 +62,7 @@ export function SignupPanel1(): JSX.Element | null {
                             placeholder="••••••••••"
                             disabled={isSignupPanel1Submitting}
                         />
-                    </Field>
+                    </LemonField>
                 )}
                 <LemonButton
                     fullWidth
diff --git a/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel2.tsx b/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel2.tsx
index 35d6a3616ec02..1952c156a8fa2 100644
--- a/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel2.tsx
+++ b/frontend/src/scenes/authentication/signup/signupForm/panels/SignupPanel2.tsx
@@ -3,7 +3,7 @@ import { useValues } from 'kea'
 import { Form } from 'kea-forms'
 import SignupReferralSource from 'lib/components/SignupReferralSource'
 import SignupRoleSelect from 'lib/components/SignupRoleSelect'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
 import { signupLogic } from '../signupLogic'
@@ -17,22 +17,22 @@ export function SignupPanel2(): JSX.Element | null {
     return (
         <div className="space-y-4 Signup__panel__2">
             <Form logic={signupLogic} formKey="signupPanel2" className="space-y-4" enableFormOnSubmit>
-                <Field name="first_name" label="Your name">
+                <LemonField name="first_name" label="Your name">
                     <LemonInput
                         className="ph-ignore-input"
                         data-attr="signup-first-name"
                         placeholder="Jane Doe"
                         disabled={isSignupPanel2Submitting}
                     />
-                </Field>
-                <Field name="organization_name" label="Organization name">
+                </LemonField>
+                <LemonField name="organization_name" label="Organization name">
                     <LemonInput
                         className="ph-ignore-input"
                         data-attr="signup-organization-name"
                         placeholder="Hogflix Movies"
                         disabled={isSignupPanel2Submitting}
                     />
-                </Field>
+                </LemonField>
                 <SignupRoleSelect />
                 <SignupReferralSource disabled={isSignupPanel2Submitting} />
                 <div className="divider" />
diff --git a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
index 1c5ae84c4f2cb..5a2cc5c9263a1 100644
--- a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
@@ -1,8 +1,8 @@
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCalendarSelectInput } from 'lib/lemon-ui/LemonCalendar/LemonCalendarSelect'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { userLogic } from 'scenes/userLogic'
 
@@ -59,13 +59,13 @@ export function BatchExportBackfillModal(): JSX.Element {
                 enableFormOnSubmit
                 className="space-y-2"
             >
-                <Field name="start_at" label="Start Date" className="flex-1">
+                <LemonField name="start_at" label="Start Date" className="flex-1">
                     {({ value, onChange }) => (
                         <LemonCalendarSelectInput value={value} onChange={onChange} placeholder="Select start date" />
                     )}
-                </Field>
+                </LemonField>
 
-                <Field name="end_at" label="End date" className="flex-1">
+                <LemonField name="end_at" label="End date" className="flex-1">
                     {({ value, onChange }) => (
                         <LemonCalendarSelectInput
                             value={value}
@@ -73,7 +73,7 @@ export function BatchExportBackfillModal(): JSX.Element {
                             placeholder="Select end date (optional)"
                         />
                     )}
-                </Field>
+                </LemonField>
             </Form>
         </LemonModal>
     )
diff --git a/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx b/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
index 2ec791c86aebb..601dbc2475182 100644
--- a/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
@@ -2,10 +2,10 @@ import { LemonButton, LemonCheckbox, LemonDivider, LemonInput, LemonSelect } fro
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { FEATURE_FLAGS } from 'lib/constants'
-import { Field } from 'lib/forms/Field'
 import { IconInfo } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonCalendarSelectInput } from 'lib/lemon-ui/LemonCalendar/LemonCalendarSelect'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonFileInput } from 'lib/lemon-ui/LemonFileInput/LemonFileInput'
 import { LemonSelectMultiple } from 'lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
@@ -81,13 +81,13 @@ export function BatchExportsEditFields({
         <>
             <div className="space-y-4 max-w-200">
                 {!isPipeline && (
-                    <Field name="name" label="Name">
+                    <LemonField name="name" label="Name">
                         <LemonInput placeholder="Name your workflow for future reference" />
-                    </Field>
+                    </LemonField>
                 )}
 
                 <div className="flex gap-2 items-start flex-wrap">
-                    <Field
+                    <LemonField
                         name="interval"
                         label="Batch interval"
                         className="flex-1"
@@ -109,9 +109,9 @@ export function BatchExportsEditFields({
                                 },
                             ]}
                         />
-                    </Field>
+                    </LemonField>
                     {(!isPipeline || batchExportConfigForm.end_at) && ( // Not present in the new UI unless grandfathered in
-                        <Field
+                        <LemonField
                             name="end_at"
                             label="End date"
                             className="flex-1"
@@ -130,7 +130,7 @@ export function BatchExportsEditFields({
                                     clearable
                                 />
                             )}
-                        </Field>
+                        </LemonField>
                     )}
                 </div>
 
@@ -140,7 +140,7 @@ export function BatchExportsEditFields({
                 </LemonBanner>
 
                 {isNew && !isPipeline ? (
-                    <Field name="paused">
+                    <LemonField name="paused">
                         <LemonCheckbox
                             bordered
                             label={
@@ -156,13 +156,13 @@ export function BatchExportsEditFields({
                                 </span>
                             }
                         />
-                    </Field>
+                    </LemonField>
                 ) : null}
             </div>
 
             <div className="space-y-4 max-w-200 w-full ">
                 <LemonDivider />
-                <Field name="destination" label="Destination">
+                <LemonField name="destination" label="Destination">
                     <LemonSelect
                         options={[
                             { value: 'BigQuery', label: 'BigQuery' },
@@ -172,17 +172,17 @@ export function BatchExportsEditFields({
                             { value: 'Snowflake', label: 'Snowflake' },
                         ]}
                     />
-                </Field>
+                </LemonField>
 
                 {!batchExportConfigForm.destination ? (
                     <p className="text-muted-alt italic">Select a destination to continue configuring</p>
                 ) : batchExportConfigForm.destination === 'S3' ? (
                     <>
                         <div className="flex gap-4">
-                            <Field name="bucket_name" label="Bucket" className="flex-1">
+                            <LemonField name="bucket_name" label="Bucket" className="flex-1">
                                 <LemonInput placeholder="e.g. my-bucket" />
-                            </Field>
-                            <Field name="region" label="Region" className="flex-1">
+                            </LemonField>
+                            <LemonField name="region" label="Region" className="flex-1">
                                 <LemonSelect
                                     options={[
                                         { value: 'us-east-1', label: 'US East (N. Virginia)' },
@@ -213,14 +213,14 @@ export function BatchExportsEditFields({
                                         { value: 'sa-east-1', label: 'South America (São Paulo)' },
                                     ]}
                                 />
-                            </Field>
+                            </LemonField>
                         </div>
-                        <Field name="prefix" label="Key prefix">
+                        <LemonField name="prefix" label="Key prefix">
                             <LemonInput placeholder="e.g. posthog-events/" />
-                        </Field>
+                        </LemonField>
 
                         <div className="flex gap-4">
-                            <Field name="compression" label="Compression" className="flex-1">
+                            <LemonField name="compression" label="Compression" className="flex-1">
                                 <LemonSelect
                                     options={[
                                         { value: 'gzip', label: 'gzip' },
@@ -228,9 +228,9 @@ export function BatchExportsEditFields({
                                         { value: null, label: 'No compression' },
                                     ]}
                                 />
-                            </Field>
+                            </LemonField>
 
-                            <Field name="encryption" label="Encryption" className="flex-1">
+                            <LemonField name="encryption" label="Encryption" className="flex-1">
                                 <LemonSelect
                                     options={[
                                         { value: 'AES256', label: 'AES256' },
@@ -238,127 +238,127 @@ export function BatchExportsEditFields({
                                         { value: null, label: 'No encryption' },
                                     ]}
                                 />
-                            </Field>
+                            </LemonField>
                         </div>
 
                         <div className="flex gap-4">
-                            <Field name="aws_access_key_id" label="AWS Access Key ID" className="flex-1">
+                            <LemonField name="aws_access_key_id" label="AWS Access Key ID" className="flex-1">
                                 <LemonInput placeholder={isNew ? 'e.g. AKIAIOSFODNN7EXAMPLE' : 'Leave unchanged'} />
-                            </Field>
+                            </LemonField>
 
-                            <Field name="aws_secret_access_key" label="AWS Secret Access Key" className="flex-1">
+                            <LemonField name="aws_secret_access_key" label="AWS Secret Access Key" className="flex-1">
                                 <LemonInput
                                     placeholder={isNew ? 'e.g. secret-key' : 'Leave unchanged'}
                                     type="password"
                                 />
-                            </Field>
+                            </LemonField>
 
                             {batchExportConfigForm.encryption == 'aws:kms' && (
-                                <Field name="kms_key_id" label="AWS KMS Key ID" className="flex-1">
+                                <LemonField name="kms_key_id" label="AWS KMS Key ID" className="flex-1">
                                     <LemonInput
                                         placeholder={
                                             isNew ? 'e.g. 1234abcd-12ab-34cd-56ef-1234567890ab' : 'leave unchanged'
                                         }
                                     />
-                                </Field>
+                                </LemonField>
                             )}
                         </div>
 
-                        <Field name="exclude_events" label="Events to exclude" className="flex-1">
+                        <LemonField name="exclude_events" label="Events to exclude" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to exclude from the export (optional)"
                             />
-                        </Field>
-                        <Field name="include_events" label="Events to include" className="flex-1">
+                        </LemonField>
+                        <LemonField name="include_events" label="Events to include" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to include in the export (optional)"
                             />
-                        </Field>
+                        </LemonField>
                     </>
                 ) : batchExportConfigForm.destination === 'Snowflake' ? (
                     <>
-                        <Field name="user" label="User">
+                        <LemonField name="user" label="User">
                             <LemonInput placeholder="my-user" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="password" label="Password">
+                        <LemonField name="password" label="Password">
                             <LemonInput placeholder="my-password" type="password" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="account" label="Account">
+                        <LemonField name="account" label="Account">
                             <LemonInput placeholder="my-account" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="database" label="Database">
+                        <LemonField name="database" label="Database">
                             <LemonInput placeholder="my-database" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="warehouse" label="Warehouse">
+                        <LemonField name="warehouse" label="Warehouse">
                             <LemonInput placeholder="my-warehouse" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="schema" label="Schema">
+                        <LemonField name="schema" label="Schema">
                             <LemonInput placeholder="my-schema" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="table_name" label="Table name">
+                        <LemonField name="table_name" label="Table name">
                             <LemonInput placeholder="events" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="role" label="Role" showOptional>
+                        <LemonField name="role" label="Role" showOptional>
                             <LemonInput placeholder="my-role" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="exclude_events" label="Events to exclude" className="flex-1">
+                        <LemonField name="exclude_events" label="Events to exclude" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to exclude from the export (optional)"
                             />
-                        </Field>
-                        <Field name="include_events" label="Events to include" className="flex-1">
+                        </LemonField>
+                        <LemonField name="include_events" label="Events to include" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to include in the export (optional)"
                             />
-                        </Field>
+                        </LemonField>
                     </>
                 ) : batchExportConfigForm.destination === 'Postgres' ? (
                     <>
-                        <Field name="user" label="User">
+                        <LemonField name="user" label="User">
                             <LemonInput placeholder="my-user" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="password" label="Password">
+                        <LemonField name="password" label="Password">
                             <LemonInput placeholder="my-password" type="password" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="host" label="Host">
+                        <LemonField name="host" label="Host">
                             <LemonInput placeholder="my-host" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="port" label="Port">
+                        <LemonField name="port" label="Port">
                             <LemonInput placeholder="5432" type="number" min="0" max="65535" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="database" label="Database">
+                        <LemonField name="database" label="Database">
                             <LemonInput placeholder="my-database" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="schema" label="Schema">
+                        <LemonField name="schema" label="Schema">
                             <LemonInput placeholder="public" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="table_name" label="Table name">
+                        <LemonField name="table_name" label="Table name">
                             <LemonInput placeholder="events" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="has_self_signed_cert">
+                        <LemonField name="has_self_signed_cert">
                             <LemonCheckbox
                                 bordered
                                 label={
@@ -370,54 +370,54 @@ export function BatchExportsEditFields({
                                     </span>
                                 }
                             />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="exclude_events" label="Events to exclude" className="flex-1">
+                        <LemonField name="exclude_events" label="Events to exclude" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to exclude from the export (optional)"
                             />
-                        </Field>
-                        <Field name="include_events" label="Events to include" className="flex-1">
+                        </LemonField>
+                        <LemonField name="include_events" label="Events to include" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to include in the export (optional)"
                             />
-                        </Field>
+                        </LemonField>
                     </>
                 ) : batchExportConfigForm.destination === 'Redshift' ? (
                     <>
-                        <Field name="user" label="User">
+                        <LemonField name="user" label="User">
                             <LemonInput placeholder="my-user" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="password" label="Password">
+                        <LemonField name="password" label="Password">
                             <LemonInput placeholder="my-password" type="password" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="host" label="Host">
+                        <LemonField name="host" label="Host">
                             <LemonInput placeholder="my-host" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="port" label="Port">
+                        <LemonField name="port" label="Port">
                             <LemonInput placeholder="5439" type="number" min="0" max="65535" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="database" label="Database">
+                        <LemonField name="database" label="Database">
                             <LemonInput placeholder="my-database" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="schema" label="Schema">
+                        <LemonField name="schema" label="Schema">
                             <LemonInput placeholder="public" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="table_name" label="Table name">
+                        <LemonField name="table_name" label="Table name">
                             <LemonInput placeholder="events" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="properties_data_type" label="Properties data type">
+                        <LemonField name="properties_data_type" label="Properties data type">
                             <LemonSelect
                                 options={[
                                     { value: 'varchar', label: 'VARCHAR(65535)' },
@@ -425,39 +425,39 @@ export function BatchExportsEditFields({
                                 ]}
                                 value="varchar"
                             />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="exclude_events" label="Events to exclude" className="flex-1">
+                        <LemonField name="exclude_events" label="Events to exclude" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to exclude from the export (optional)"
                             />
-                        </Field>
-                        <Field name="include_events" label="Events to include" className="flex-1">
+                        </LemonField>
+                        <LemonField name="include_events" label="Events to include" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to include in the export (optional)"
                             />
-                        </Field>
+                        </LemonField>
                     </>
                 ) : batchExportConfigForm.destination === 'BigQuery' ? (
                     <>
-                        <Field name="json_config_file" label="Google Cloud JSON key file">
+                        <LemonField name="json_config_file" label="Google Cloud JSON key file">
                             <LemonFileInput accept=".json" multiple={false} />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="table_id" label="Table ID">
+                        <LemonField name="table_id" label="Table ID">
                             <LemonInput placeholder="events" />
-                        </Field>
+                        </LemonField>
 
-                        <Field name="dataset_id" label="Dataset ID">
+                        <LemonField name="dataset_id" label="Dataset ID">
                             <LemonInput placeholder="dataset" />
-                        </Field>
+                        </LemonField>
 
                         {isNew ? (
-                            <Field name="use_json_type" label="Structured fields data type">
+                            <LemonField name="use_json_type" label="Structured fields data type">
                                 <LemonCheckbox
                                     bordered
                                     label={
@@ -469,23 +469,23 @@ export function BatchExportsEditFields({
                                         </span>
                                     }
                                 />
-                            </Field>
+                            </LemonField>
                         ) : null}
 
-                        <Field name="exclude_events" label="Events to exclude" className="flex-1">
+                        <LemonField name="exclude_events" label="Events to exclude" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to exclude from the export (optional)"
                             />
-                        </Field>
-                        <Field name="include_events" label="Events to include" className="flex-1">
+                        </LemonField>
+                        <LemonField name="include_events" label="Events to include" className="flex-1">
                             <LemonSelectMultiple
                                 mode="multiple-custom"
                                 options={[]}
                                 placeholder="Input one or more events to include in the export (optional)"
                             />
-                        </Field>
+                        </LemonField>
                     </>
                 ) : null}
             </div>
diff --git a/frontend/src/scenes/batch_exports/BatchExportScene.tsx b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
index c3c0bb68228f0..039a47a104354 100644
--- a/frontend/src/scenes/batch_exports/BatchExportScene.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
@@ -125,7 +125,6 @@ export function RunsTab(): JSX.Element {
                                         <LemonTable
                                             dataSource={groupedRuns.runs}
                                             embedded={true}
-                                            size="small"
                                             columns={[
                                                 {
                                                     title: 'Status',
@@ -373,7 +372,6 @@ export function LogsTab({ batchExportId }: BatchExportLogsProps): JSX.Element {
                 dataSource={batchExportLogs}
                 columns={columns}
                 loading={batchExportLogsLoading}
-                size="small"
                 className="ph-no-capture"
                 pagination={{ pageSize: 200, hideOnSinglePage: true }}
             />
diff --git a/frontend/src/scenes/billing/BillingProduct.tsx b/frontend/src/scenes/billing/BillingProduct.tsx
index 088fc2a11a2ea..25a6d6dcaefba 100644
--- a/frontend/src/scenes/billing/BillingProduct.tsx
+++ b/frontend/src/scenes/billing/BillingProduct.tsx
@@ -536,7 +536,7 @@ export const BillingProduct = ({ product }: { product: BillingProductV2Type }):
                                     <LemonTable
                                         stealth
                                         embedded
-                                        size="xs"
+                                        size="small"
                                         uppercaseHeader={false}
                                         columns={tableColumns}
                                         dataSource={tableTierData}
@@ -559,7 +559,7 @@ export const BillingProduct = ({ product }: { product: BillingProductV2Type }):
                                 <LemonTable
                                     stealth
                                     embedded
-                                    size="xs"
+                                    size="small"
                                     uppercaseHeader={false}
                                     columns={[
                                         { title: '', dataIndex: 'name' },
diff --git a/frontend/src/scenes/billing/ExportsUnsubscribeTable/ExportsUnsubscribeTable.tsx b/frontend/src/scenes/billing/ExportsUnsubscribeTable/ExportsUnsubscribeTable.tsx
index dde100e766313..2df52f4287688 100644
--- a/frontend/src/scenes/billing/ExportsUnsubscribeTable/ExportsUnsubscribeTable.tsx
+++ b/frontend/src/scenes/billing/ExportsUnsubscribeTable/ExportsUnsubscribeTable.tsx
@@ -19,7 +19,7 @@ export function ExportsUnsubscribeTable(): JSX.Element {
     return (
         <LemonTable
             dataSource={itemsToDisable}
-            size="xs"
+            size="small"
             loading={loading}
             columns={[
                 {
diff --git a/frontend/src/scenes/billing/PlanComparison.tsx b/frontend/src/scenes/billing/PlanComparison.tsx
index af1edc3ce3c10..496f3d0c6a332 100644
--- a/frontend/src/scenes/billing/PlanComparison.tsx
+++ b/frontend/src/scenes/billing/PlanComparison.tsx
@@ -130,7 +130,7 @@ export const PlanComparison = ({
                         }
                     }}
                 >
-                    {plan.current_plan ? 'Current plan' : 'Upgrade'}
+                    {plan.current_plan ? 'Current plan' : 'Subscribe'}
                 </LemonButton>
                 {!plan.current_plan && includeAddons && product.addons?.length > 0 && (
                     <p className="text-center ml-0 mt-2 mb-0">
@@ -139,7 +139,7 @@ export const PlanComparison = ({
                             className="text-muted text-xs"
                             disableClientSideRouting
                         >
-                            or upgrade without addons
+                            or subscribe without addons
                         </Link>
                     </p>
                 )}
diff --git a/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx b/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
index 7c0d7b4ede08d..096713fc5445c 100644
--- a/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
+++ b/frontend/src/scenes/billing/UnsubscribeSurveyModal.tsx
@@ -30,96 +30,92 @@ export const UnsubscribeSurveyModal = ({
                 reportSurveyDismissed(surveyID)
             }}
             width="max(40vw)"
-        >
-            <div>
-                {includesPipelinesAddon && itemsToDisable.length > 0 ? (
-                    <div className="mb-6">
-                        <div className="mb-4">
-                            <h3 className="mt-2 mb-2 mr-8">Important: Disable remaining export apps</h3>
-                            <p>
-                                To avoid unexpected impact on your data, you must explicitly disable the following apps
-                                and exports before unsubscribing:
-                            </p>
-                        </div>
-                        <ExportsUnsubscribeTable />
-                    </div>
-                ) : (
-                    <></>
-                )}
-                <h3 className="mt-2 mb-4 mr-8">{`Why are you unsubscribing from ${product.name}?`}</h3>
-                <div className="flex flex-col gap-3.5">
-                    <LemonTextArea
-                        data-attr="unsubscribe-reason-survey-textarea"
-                        placeholder="Start typing..."
-                        value={surveyResponse['$survey_response']}
-                        onChange={(value) => {
-                            setSurveyResponse(value, '$survey_response')
+            title={`Why are you unsubscribing from ${product.name}?`}
+            footer={
+                <>
+                    <LemonButton
+                        type="secondary"
+                        onClick={() => {
+                            reportSurveyDismissed(surveyID)
                         }}
-                    />
-                    <LemonBanner type="info">
-                        <p>
-                            {'Need to control your costs? Learn about ways to '}
-                            <Link
-                                to="https://posthog.com/docs/billing/estimating-usage-costs#how-to-reduce-your-posthog-costs"
-                                target="_blank"
-                                onClick={() => {
-                                    reportSurveyDismissed(surveyID)
-                                }}
-                            >
-                                reduce your bill
-                            </Link>
-                            {`${product.type !== 'session_replay' ? ' or ' : ', '}`}
-                            <Link
-                                to="mailto:sales@posthog.com?subject=Help%20reducing%20PostHog%20bill"
-                                target="_blank"
-                                onClick={() => {
-                                    reportSurveyDismissed(surveyID)
-                                }}
-                            >
-                                chat with support
-                            </Link>
-
-                            {product.type === 'session_replay' && (
-                                <>
-                                    {', or '}
-                                    <Link
-                                        to="mailto:sales@posthog.com?subject=Joining%session%replay%controls%20beta"
-                                        target="_blank"
-                                        onClick={() => {
-                                            reportSurveyDismissed(surveyID)
-                                        }}
-                                    >
-                                        join our beta
-                                    </Link>
-                                    {' for tuning recording volume with sampling and minimum duration.'}
-                                </>
-                            )}
-                        </p>
-                    </LemonBanner>
-                    <div className="flex justify-end gap-4">
-                        <LemonButton
-                            type="tertiary"
+                    >
+                        Cancel
+                    </LemonButton>
+                    <LemonButton
+                        type={textAreaNotEmpty ? 'primary' : 'secondary'}
+                        disabledReason={includesPipelinesAddon && unsubscribeDisabledReason}
+                        onClick={() => {
+                            textAreaNotEmpty
+                                ? reportSurveySent(surveyID, surveyResponse)
+                                : reportSurveyDismissed(surveyID)
+                            deactivateProduct(product.type)
+                        }}
+                    >
+                        Unsubscribe
+                    </LemonButton>
+                </>
+            }
+        >
+            <div className="flex flex-col gap-3.5">
+                <LemonTextArea
+                    data-attr="unsubscribe-reason-survey-textarea"
+                    placeholder="Reason for unsubscribing..."
+                    value={surveyResponse['$survey_response']}
+                    onChange={(value) => {
+                        setSurveyResponse(value, '$survey_response')
+                    }}
+                />
+                <LemonBanner type="info">
+                    <p>
+                        {'Need to control your costs? Learn about ways to '}
+                        <Link
+                            to="https://posthog.com/docs/billing/estimating-usage-costs#how-to-reduce-your-posthog-costs"
+                            target="_blank"
                             onClick={() => {
                                 reportSurveyDismissed(surveyID)
                             }}
                         >
-                            Cancel
-                        </LemonButton>
-                        <LemonButton
-                            type={textAreaNotEmpty ? 'primary' : 'tertiary'}
-                            disabledReason={includesPipelinesAddon && unsubscribeDisabledReason}
+                            reduce your bill
+                        </Link>
+                        {`${product.type !== 'session_replay' ? ' or ' : ', '}`}
+                        <Link
+                            to="mailto:sales@posthog.com?subject=Help%20reducing%20PostHog%20bill"
+                            target="_blank"
                             onClick={() => {
-                                textAreaNotEmpty
-                                    ? reportSurveySent(surveyID, surveyResponse)
-                                    : reportSurveyDismissed(surveyID)
-                                deactivateProduct(product.type)
+                                reportSurveyDismissed(surveyID)
                             }}
                         >
-                            Unsubscribe
-                        </LemonButton>
-                    </div>
-                </div>
+                            chat with support
+                        </Link>
+
+                        {product.type === 'session_replay' && (
+                            <>
+                                {', or '}
+                                <Link
+                                    to="mailto:sales@posthog.com?subject=Joining%session%replay%controls%20beta"
+                                    target="_blank"
+                                    onClick={() => {
+                                        reportSurveyDismissed(surveyID)
+                                    }}
+                                >
+                                    join our beta
+                                </Link>
+                                {' for tuning recording volume with sampling and minimum duration.'}
+                            </>
+                        )}
+                    </p>
+                </LemonBanner>
             </div>
+            {includesPipelinesAddon && itemsToDisable.length > 0 ? (
+                <div className="mt-6">
+                    <h3 className="mt-2 mb-2 mr-8">Important: Disable remaining export apps</h3>
+                    <p>
+                        To avoid unexpected impact on your data, you must explicitly disable the following apps and
+                        exports before unsubscribing:
+                    </p>
+                    <ExportsUnsubscribeTable />
+                </div>
+            ) : null}
         </LemonModal>
     )
 }
diff --git a/frontend/src/scenes/cohorts/CohortEdit.tsx b/frontend/src/scenes/cohorts/CohortEdit.tsx
index 48a8b59483ba1..f731dc692bcef 100644
--- a/frontend/src/scenes/cohorts/CohortEdit.tsx
+++ b/frontend/src/scenes/cohorts/CohortEdit.tsx
@@ -5,10 +5,10 @@ import { router } from 'kea-router'
 import { NotFound } from 'lib/components/NotFound'
 import { PageHeader } from 'lib/components/PageHeader'
 import { CohortTypeEnum } from 'lib/constants'
-import { Field } from 'lib/forms/Field'
 import { IconUploadFile } from 'lib/lemon-ui/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { More } from 'lib/lemon-ui/LemonButton/More'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
@@ -120,16 +120,15 @@ export function CohortEdit({ id }: CohortLogicProps): JSX.Element {
                         </div>
                     }
                 />
-                <LemonDivider className="my-2 non-3000" />
                 <div className="space-y-2 max-w-160">
                     <div className="flex gap-4 flex-wrap">
                         <div className="flex-1">
-                            <Field name="name" label="Name">
+                            <LemonField name="name" label="Name">
                                 <LemonInput data-attr="cohort-name" />
-                            </Field>
+                            </LemonField>
                         </div>
                         <div className="flex-1">
-                            <Field name="is_static" label="Type">
+                            <LemonField name="is_static" label="Type">
                                 {({ value, onChange }) => (
                                     <LemonSelect
                                         disabledReason={
@@ -146,20 +145,24 @@ export function CohortEdit({ id }: CohortLogicProps): JSX.Element {
                                         data-attr="cohort-type"
                                     />
                                 )}
-                            </Field>
+                            </LemonField>
                         </div>
                     </div>
                     {hasAvailableFeature(AvailableFeature.DASHBOARD_COLLABORATION) && (
                         <div className="ph-ignore-input">
-                            <Field name="description" label="Description" data-attr="cohort-description">
+                            <LemonField name="description" label="Description" data-attr="cohort-description">
                                 <LemonTextArea />
-                            </Field>
+                            </LemonField>
                         </div>
                     )}
                 </div>
                 {cohort.is_static ? (
                     <div className="mt-4 ph-ignore-input">
-                        <Field name="csv" label={isNewCohort ? 'Upload users' : 'Add users'} data-attr="cohort-csv">
+                        <LemonField
+                            name="csv"
+                            label={isNewCohort ? 'Upload users' : 'Add users'}
+                            data-attr="cohort-csv"
+                        >
                             {({ onChange }) => (
                                 <>
                                     <span>
@@ -199,7 +202,7 @@ export function CohortEdit({ id }: CohortLogicProps): JSX.Element {
                                     />
                                 </>
                             )}
-                        </Field>
+                        </LemonField>
                     </div>
                 ) : (
                     <>
diff --git a/frontend/src/scenes/dashboard/DashboardItems.tsx b/frontend/src/scenes/dashboard/DashboardItems.tsx
index 0c5156c4c4c88..a0f21dc44d1c5 100644
--- a/frontend/src/scenes/dashboard/DashboardItems.tsx
+++ b/frontend/src/scenes/dashboard/DashboardItems.tsx
@@ -21,6 +21,7 @@ export function DashboardItems(): JSX.Element {
         layouts,
         dashboardMode,
         placement,
+        isRefreshingQueued,
         isRefreshing,
         highlightedInsightId,
         refreshStatus,
@@ -133,6 +134,7 @@ export function DashboardItems(): JSX.Element {
                             <InsightCard
                                 key={tile.id}
                                 insight={insight}
+                                loadingQueued={isRefreshingQueued(insight.short_id)}
                                 loading={isRefreshing(insight.short_id)}
                                 apiErrored={refreshStatus[insight.short_id]?.error || false}
                                 highlighted={highlightedInsightId && insight.short_id === highlightedInsightId}
diff --git a/frontend/src/scenes/dashboard/DeleteDashboardModal.tsx b/frontend/src/scenes/dashboard/DeleteDashboardModal.tsx
index 5929b58873108..4909ab0391453 100644
--- a/frontend/src/scenes/dashboard/DeleteDashboardModal.tsx
+++ b/frontend/src/scenes/dashboard/DeleteDashboardModal.tsx
@@ -1,8 +1,8 @@
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCheckbox } from 'lib/lemon-ui/LemonCheckbox'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { deleteDashboardLogic } from 'scenes/dashboard/deleteDashboardLogic'
 
@@ -47,7 +47,7 @@ export function DeleteDashboardModal(): JSX.Element {
                 enableFormOnSubmit
                 className="space-y-2"
             >
-                <Field
+                <LemonField
                     name="deleteInsights"
                     help="This will only delete insights if they're not on any other dashboards."
                 >
@@ -59,7 +59,7 @@ export function DeleteDashboardModal(): JSX.Element {
                             onChange={onChange}
                         />
                     )}
-                </Field>
+                </LemonField>
             </Form>
         </LemonModal>
     )
diff --git a/frontend/src/scenes/dashboard/DuplicateDashboardModal.tsx b/frontend/src/scenes/dashboard/DuplicateDashboardModal.tsx
index 46beee57edbee..a03841992a717 100644
--- a/frontend/src/scenes/dashboard/DuplicateDashboardModal.tsx
+++ b/frontend/src/scenes/dashboard/DuplicateDashboardModal.tsx
@@ -1,8 +1,8 @@
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCheckbox } from 'lib/lemon-ui/LemonCheckbox'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { duplicateDashboardLogic } from 'scenes/dashboard/duplicateDashboardLogic'
 
@@ -55,14 +55,14 @@ export function DuplicateDashboardModal(): JSX.Element {
                 enableFormOnSubmit
                 className="space-y-2"
             >
-                <Field
+                <LemonField
                     name="duplicateTiles"
                     help="Choose whether to duplicate this dashboard's insights and text or attach them to the new dashboard."
                 >
                     {({ value, onChange }) => (
                         <LemonCheckbox checked={value} label="Duplicate this dashboard's tiles" onChange={onChange} />
                     )}
-                </Field>
+                </LemonField>
             </Form>
         </LemonModal>
     )
diff --git a/frontend/src/scenes/dashboard/EmptyDashboardComponent.scss b/frontend/src/scenes/dashboard/EmptyDashboardComponent.scss
index b8e3359b89362..a96eade91b6d6 100644
--- a/frontend/src/scenes/dashboard/EmptyDashboardComponent.scss
+++ b/frontend/src/scenes/dashboard/EmptyDashboardComponent.scss
@@ -11,13 +11,11 @@
         overflow: hidden;
 
         &::after {
+            --bg-light: var(--bg-3000); // Make the fade blend in with the 3000 background smoothly
+
             width: 100%;
             height: 150px;
 
-            .posthog-3000 & {
-                --bg-light: var(--bg-3000); // Make the fade blend in with the 3000 background smoothly
-            }
-
             @extend %mixin-gradient-overlay;
         }
     }
diff --git a/frontend/src/scenes/dashboard/NewDashboardModal.tsx b/frontend/src/scenes/dashboard/NewDashboardModal.tsx
index 5cd2d74953f4c..6c20019690db9 100644
--- a/frontend/src/scenes/dashboard/NewDashboardModal.tsx
+++ b/frontend/src/scenes/dashboard/NewDashboardModal.tsx
@@ -9,40 +9,13 @@ import { DashboardTemplateChooser } from './DashboardTemplateChooser'
 import { DashboardTemplateVariables } from './DashboardTemplateVariables'
 import { dashboardTemplateVariablesLogic } from './dashboardTemplateVariablesLogic'
 
-export function DashboardTemplatePreview(): JSX.Element {
-    const { activeDashboardTemplate, variableSelectModalVisible } = useValues(newDashboardLogic)
-    const { variables } = useValues(dashboardTemplateVariablesLogic)
-    const { createDashboardFromTemplate, clearActiveDashboardTemplate } = useActions(newDashboardLogic)
-
-    return (
-        <div>
-            <DashboardTemplateVariables />
-
-            <div className="flex justify-between my-4">
-                {variableSelectModalVisible ? (
-                    <div />
-                ) : (
-                    <LemonButton onClick={clearActiveDashboardTemplate} type="secondary">
-                        Back
-                    </LemonButton>
-                )}
-                <LemonButton
-                    onClick={() => {
-                        activeDashboardTemplate && createDashboardFromTemplate(activeDashboardTemplate, variables)
-                    }}
-                    type="primary"
-                >
-                    Create
-                </LemonButton>
-            </div>
-        </div>
-    )
-}
-
 export function NewDashboardModal(): JSX.Element {
     const builtLogic = useMountedLogic(newDashboardLogic)
-    const { hideNewDashboardModal } = useActions(newDashboardLogic)
-    const { newDashboardModalVisible, activeDashboardTemplate } = useValues(newDashboardLogic)
+    const { hideNewDashboardModal, clearActiveDashboardTemplate, createDashboardFromTemplate } =
+        useActions(newDashboardLogic)
+    const { newDashboardModalVisible, activeDashboardTemplate, variableSelectModalVisible } =
+        useValues(newDashboardLogic)
+    const { variables } = useValues(dashboardTemplateVariablesLogic)
 
     const templatesLogic = dashboardTemplatesLogic({
         scope: builtLogic.props.featureFlagId ? 'feature_flag' : 'default',
@@ -82,9 +55,31 @@ export function NewDashboardModal(): JSX.Element {
                     </div>
                 )
             }
+            footer={
+                activeDashboardTemplate ? (
+                    <>
+                        {variableSelectModalVisible ? (
+                            <div />
+                        ) : (
+                            <LemonButton onClick={clearActiveDashboardTemplate} type="secondary">
+                                Back
+                            </LemonButton>
+                        )}
+                        <LemonButton
+                            onClick={() => {
+                                activeDashboardTemplate &&
+                                    createDashboardFromTemplate(activeDashboardTemplate, variables)
+                            }}
+                            type="primary"
+                        >
+                            Create
+                        </LemonButton>
+                    </>
+                ) : null
+            }
         >
             <div className="NewDashboardModal">
-                {activeDashboardTemplate ? <DashboardTemplatePreview /> : _dashboardTemplateChooser}
+                {activeDashboardTemplate ? <DashboardTemplateVariables /> : _dashboardTemplateChooser}
             </div>
         </LemonModal>
     )
diff --git a/frontend/src/scenes/dashboard/dashboardLogic.test.ts b/frontend/src/scenes/dashboard/dashboardLogic.test.ts
index 3ff6ee22c6b98..2260b27dc075b 100644
--- a/frontend/src/scenes/dashboard/dashboardLogic.test.ts
+++ b/frontend/src/scenes/dashboard/dashboardLogic.test.ts
@@ -526,18 +526,21 @@ describe('dashboardLogic', () => {
                                 }
                                 return acc
                             }, [] as InsightShortId[]),
+                            false,
                             true
                         ),
                     ])
                     .toMatchValues({
                         refreshStatus: {
                             [dashboards['5'].tiles[0].insight!.short_id]: {
-                                loading: true,
-                                timer: expect.anything(),
+                                loading: false,
+                                queued: true,
+                                timer: null,
                             },
                             [dashboards['5'].tiles[1].insight!.short_id]: {
-                                loading: true,
-                                timer: expect.anything(),
+                                loading: false,
+                                queued: true,
+                                timer: null,
                             },
                         },
                         refreshMetrics: {
@@ -585,13 +588,18 @@ describe('dashboardLogic', () => {
                     .toFinishAllListeners()
                     .toDispatchActions([
                         'refreshAllDashboardItems',
-                        logic.actionCreators.setRefreshStatuses([dashboards['5'].tiles[0].insight!.short_id], true),
+                        logic.actionCreators.setRefreshStatuses(
+                            [dashboards['5'].tiles[0].insight!.short_id],
+                            false,
+                            true
+                        ),
                     ])
                     .toMatchValues({
                         refreshStatus: {
                             [dashboards['5'].tiles[0].insight!.short_id]: {
-                                loading: true,
-                                timer: expect.anything(),
+                                loading: false,
+                                queued: true,
+                                timer: null,
                             },
                         },
                         refreshMetrics: {
@@ -724,7 +732,7 @@ describe('dashboardLogic', () => {
                         total: 2,
                     },
                 })
-                .toDispatchActions(['setRefreshStatus', 'setRefreshStatus'])
+                .toDispatchActions(['setRefreshStatus', 'setRefreshStatus', 'setRefreshStatus', 'setRefreshStatus'])
                 .toMatchValues({
                     refreshMetrics: {
                         completed: 2,
diff --git a/frontend/src/scenes/dashboard/dashboardLogic.tsx b/frontend/src/scenes/dashboard/dashboardLogic.tsx
index c36b1f31c6fab..5c8d9977c4d23 100644
--- a/frontend/src/scenes/dashboard/dashboardLogic.tsx
+++ b/frontend/src/scenes/dashboard/dashboardLogic.tsx
@@ -76,6 +76,9 @@ export interface DashboardLogicProps {
 }
 
 export interface RefreshStatus {
+    /** Insight is about to be loaded */
+    queued?: boolean
+    /** Insight is currently loading */
     loading?: boolean
     refreshed?: boolean
     error?: boolean
@@ -165,8 +168,12 @@ export const dashboardLogic = kea<dashboardLogicType>([
         }),
         setProperties: (properties: AnyPropertyFilter[]) => ({ properties }),
         setAutoRefresh: (enabled: boolean, interval: number) => ({ enabled, interval }),
-        setRefreshStatus: (shortId: InsightShortId, loading = false) => ({ shortId, loading }),
-        setRefreshStatuses: (shortIds: InsightShortId[], loading = false) => ({ shortIds, loading }),
+        setRefreshStatus: (shortId: InsightShortId, loading = false, queued = false) => ({ shortId, loading, queued }),
+        setRefreshStatuses: (shortIds: InsightShortId[], loading = false, queued = false) => ({
+            shortIds,
+            loading,
+            queued,
+        }),
         setRefreshError: (shortId: InsightShortId) => ({ shortId }),
         reportDashboardViewed: true, // Reports `viewed dashboard` and `dashboard analyzed` events
         setShouldReportOnAPILoad: (shouldReport: boolean) => ({ shouldReport }), // See reducer for details
@@ -499,18 +506,22 @@ export const dashboardLogic = kea<dashboardLogicType>([
         refreshStatus: [
             {} as Record<string, RefreshStatus>,
             {
-                setRefreshStatus: (state, { shortId, loading }) => ({
+                setRefreshStatus: (state, { shortId, loading, queued }) => ({
                     ...state,
                     [shortId]: loading
-                        ? { loading: true, timer: new Date() }
+                        ? { loading: true, queued: true, timer: new Date() }
+                        : queued
+                        ? { loading: false, queued: true, timer: null }
                         : { refreshed: true, timer: state[shortId]?.timer || null },
                 }),
-                setRefreshStatuses: (state, { shortIds, loading }) =>
+                setRefreshStatuses: (state, { shortIds, loading, queued }) =>
                     Object.fromEntries(
                         shortIds.map((shortId) => [
                             shortId,
                             loading
-                                ? { loading: true, timer: new Date() }
+                                ? { loading: true, queued: true, timer: new Date() }
+                                : queued
+                                ? { loading: false, queued: true, timer: null }
                                 : { refreshed: true, timer: state[shortId]?.timer || null },
                         ])
                     ) as Record<string, RefreshStatus>,
@@ -658,6 +669,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 return dashboardLoading || Object.values(refreshStatus).some((s) => s.loading)
             },
         ],
+        isRefreshingQueued: [(s) => [s.refreshStatus], (refreshStatus) => (id: string) => !!refreshStatus[id]?.queued],
         isRefreshing: [(s) => [s.refreshStatus], (refreshStatus) => (id: string) => !!refreshStatus[id]?.loading],
         highlightedInsightId: [
             () => [router.selectors.searchParams],
@@ -728,7 +740,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
             (refreshStatus) => {
                 const total = Object.keys(refreshStatus).length ?? 0
                 return {
-                    completed: total - (Object.values(refreshStatus).filter((s) => s.loading).length ?? 0),
+                    completed: total - (Object.values(refreshStatus).filter((s) => s.loading || s.queued).length ?? 0),
                     total,
                 }
             },
@@ -934,6 +946,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
             let cancelled = false
             actions.setRefreshStatuses(
                 insights.map((item) => item.short_id),
+                false,
                 true
             )
 
@@ -963,6 +976,8 @@ export const dashboardLogic = kea<dashboardLogicType>([
                     session_id: currentSessionId(),
                 })}`
 
+                actions.setRefreshStatus(insight.short_id, true, true)
+
                 try {
                     breakpoint()
 
@@ -1076,6 +1091,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
             if (values.autoRefresh.enabled) {
                 // Refresh right now after enabling if we haven't refreshed recently
                 if (
+                    !values.itemsLoading &&
                     values.lastRefreshed &&
                     values.lastRefreshed.isBefore(now().subtract(values.autoRefresh.interval, 'seconds'))
                 ) {
diff --git a/frontend/src/scenes/dashboard/dashboards/Dashboards.tsx b/frontend/src/scenes/dashboard/dashboards/Dashboards.tsx
index f58102bc85a70..d05b32840f29c 100644
--- a/frontend/src/scenes/dashboard/dashboards/Dashboards.tsx
+++ b/frontend/src/scenes/dashboard/dashboards/Dashboards.tsx
@@ -2,7 +2,6 @@ import { useActions, useValues } from 'kea'
 import { PageHeader } from 'lib/components/PageHeader'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
-import { inAppPromptLogic } from 'lib/logic/inAppPrompt/inAppPromptLogic'
 import { dashboardsLogic, DashboardsTab } from 'scenes/dashboard/dashboards/dashboardsLogic'
 import { DashboardsTableContainer } from 'scenes/dashboard/dashboards/DashboardsTable'
 import { DashboardTemplatesTable } from 'scenes/dashboard/dashboards/templates/DashboardTemplatesTable'
@@ -26,7 +25,6 @@ export function Dashboards(): JSX.Element {
     const { setCurrentTab } = useActions(dashboardsLogic)
     const { dashboards, currentTab, isFiltering } = useValues(dashboardsLogic)
     const { showNewDashboardModal } = useActions(newDashboardLogic)
-    const { closePrompts } = useActions(inAppPromptLogic)
 
     const enabledTabs: LemonTab<DashboardsTab>[] = [
         {
@@ -49,7 +47,6 @@ export function Dashboards(): JSX.Element {
                     <LemonButton
                         data-attr="new-dashboard"
                         onClick={() => {
-                            closePrompts()
                             showNewDashboardModal()
                         }}
                         type="primary"
diff --git a/frontend/src/scenes/data-management/database/DatabaseTable.tsx b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
index bbf5c67db647e..83b70c8abb41c 100644
--- a/frontend/src/scenes/data-management/database/DatabaseTable.tsx
+++ b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
@@ -13,7 +13,6 @@ interface DatabaseTableProps {
 export function DatabaseTable({ table, tables }: DatabaseTableProps): JSX.Element {
     return (
         <LemonTable
-            size="small"
             dataSource={tables.find(({ name }) => name === table)?.columns ?? []}
             columns={[
                 {
diff --git a/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx b/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
index 350724df79410..50dd73bddb3bd 100644
--- a/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
+++ b/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
@@ -4,9 +4,9 @@ import { VerifiedDefinitionCheckbox } from 'lib/components/DefinitionPopover/Def
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { PageHeader } from 'lib/components/PageHeader'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
 import { LemonTextArea } from 'lib/lemon-ui/LemonTextArea/LemonTextArea'
 import { getFilterLabel, isCoreFilter } from 'lib/taxonomy'
@@ -64,14 +64,14 @@ export function DefinitionEdit(props: DefinitionEditLogicProps): JSX.Element {
                 </div>
                 {hasTaxonomyFeatures && (
                     <div className="mt-4 ph-ignore-input">
-                        <Field name="description" label="Description" data-attr="definition-description">
+                        <LemonField name="description" label="Description" data-attr="definition-description">
                             <LemonTextArea value={definition.description} />
-                        </Field>
+                        </LemonField>
                     </div>
                 )}
                 {showVerifiedCheckbox && (
                     <div className="mt-4 ph-ignore-input">
-                        <Field name="verified" data-attr="definition-verified">
+                        <LemonField name="verified" data-attr="definition-verified">
                             {({ value, onChange }) => (
                                 <VerifiedDefinitionCheckbox
                                     isProperty={isProperty}
@@ -81,12 +81,12 @@ export function DefinitionEdit(props: DefinitionEditLogicProps): JSX.Element {
                                     }}
                                 />
                             )}
-                        </Field>
+                        </LemonField>
                     </div>
                 )}
                 {hasTaxonomyFeatures && 'tags' in definition && (
                     <div className="mt-4 ph-ignore-input">
-                        <Field name="tags" label="Tags" data-attr="definition-tags">
+                        <LemonField name="tags" label="Tags" data-attr="definition-tags">
                             {({ value, onChange }) => (
                                 <ObjectTags
                                     className="definition-tags"
@@ -97,12 +97,12 @@ export function DefinitionEdit(props: DefinitionEditLogicProps): JSX.Element {
                                     tagsAvailable={tags}
                                 />
                             )}
-                        </Field>
+                        </LemonField>
                     </div>
                 )}
                 {isProperty && (
                     <div className="mt-4 ph-ignore-input">
-                        <Field name="property_type" label="Property Type" data-attr="property-type">
+                        <LemonField name="property_type" label="Property Type" data-attr="property-type">
                             {({ value, onChange }) => (
                                 <LemonSelect
                                     onChange={(val) => onChange(val)}
@@ -115,7 +115,7 @@ export function DefinitionEdit(props: DefinitionEditLogicProps): JSX.Element {
                                     ]}
                                 />
                             )}
-                        </Field>
+                        </LemonField>
                     </div>
                 )}
             </div>
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
index bb635d6e8fd55..f9dd1830383b8 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
+++ b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
@@ -239,7 +239,6 @@ function RenderNestedWarnings(warningSummary: IngestionWarningSummary): JSX.Elem
                 },
             ]}
             embedded
-            size="small"
             showHeader={false}
         />
     )
diff --git a/frontend/src/scenes/data-warehouse/external/forms/SourceForm.tsx b/frontend/src/scenes/data-warehouse/external/forms/SourceForm.tsx
index df83d79972b5d..a7a858b9d0858 100644
--- a/frontend/src/scenes/data-warehouse/external/forms/SourceForm.tsx
+++ b/frontend/src/scenes/data-warehouse/external/forms/SourceForm.tsx
@@ -1,6 +1,6 @@
 import { LemonInput } from '@posthog/lemon-ui'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 import { ExternalDataSourceType } from '~/types'
 
@@ -21,13 +21,13 @@ export default function SourceForm({ sourceType }: SourceFormProps): JSX.Element
             enableFormOnSubmit
         >
             {SOURCE_DETAILS[sourceType].fields.map((field) => (
-                <Field key={field.name} name={['payload', field.name]} label={field.label}>
+                <LemonField key={field.name} name={['payload', field.name]} label={field.label}>
                     <LemonInput className="ph-ignore-input" data-attr={field.name} />
-                </Field>
+                </LemonField>
             ))}
-            <Field name="prefix" label="Table Prefix (optional)">
+            <LemonField name="prefix" label="Table Prefix (optional)">
                 <LemonInput className="ph-ignore-input" data-attr="prefix" placeholder="internal_" />
-            </Field>
+            </LemonField>
         </Form>
     )
 }
diff --git a/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx b/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx
index bd00fa492c5ae..a6a3a2a40bcfc 100644
--- a/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx
+++ b/frontend/src/scenes/data-warehouse/new_table/DataWarehouseTableForm.tsx
@@ -1,6 +1,6 @@
 import { LemonInput, LemonSelect } from '@posthog/lemon-ui'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 import { dataWarehouseTableLogic } from './dataWarehouseTableLogic'
 
@@ -8,7 +8,7 @@ export function DatawarehouseTableForm(): JSX.Element {
     return (
         <Form formKey="table" logic={dataWarehouseTableLogic} className="space-y-4" enableFormOnSubmit>
             <div className="flex flex-col gap-2 max-w-160">
-                <Field name="name" label="Table Name">
+                <LemonField name="name" label="Table Name">
                     <LemonInput
                         data-attr="table-name"
                         className="ph-ignore-input"
@@ -19,9 +19,9 @@ export function DatawarehouseTableForm(): JSX.Element {
                         autoCorrect="off"
                         spellCheck={false}
                     />
-                </Field>
+                </LemonField>
                 <div className="text-muted text-xs mb-4">This will be the table name used when writing queries</div>
-                <Field name="url_pattern" label="Files URL pattern">
+                <LemonField name="url_pattern" label="Files URL pattern">
                     <LemonInput
                         data-attr="table-name"
                         className="ph-ignore-input"
@@ -32,11 +32,11 @@ export function DatawarehouseTableForm(): JSX.Element {
                         autoCorrect="off"
                         spellCheck={false}
                     />
-                </Field>
+                </LemonField>
                 <div className="text-muted text-xs mb-4">
                     You can use <strong>*</strong> to select multiple files.
                 </div>
-                <Field name="format" label="File format" className="w-max">
+                <LemonField name="format" label="File format" className="w-max">
                     <LemonSelect
                         data-attr="table-format"
                         options={[
@@ -45,8 +45,8 @@ export function DatawarehouseTableForm(): JSX.Element {
                             { label: 'JSON', value: 'JSONEachRow' },
                         ]}
                     />
-                </Field>
-                <Field name={['credential', 'access_key']} label="Access Key">
+                </LemonField>
+                <LemonField name={['credential', 'access_key']} label="Access Key">
                     <LemonInput
                         data-attr="access-key"
                         className="ph-ignore-input"
@@ -57,8 +57,8 @@ export function DatawarehouseTableForm(): JSX.Element {
                         autoCorrect="off"
                         spellCheck={false}
                     />
-                </Field>
-                <Field name={['credential', 'access_secret']} label="Access Secret">
+                </LemonField>
+                <LemonField name={['credential', 'access_secret']} label="Access Secret">
                     <LemonInput
                         data-attr="access-secret"
                         className="ph-ignore-input"
@@ -70,7 +70,7 @@ export function DatawarehouseTableForm(): JSX.Element {
                         autoCorrect="off"
                         spellCheck={false}
                     />
-                </Field>
+                </LemonField>
             </div>
         </Form>
     )
diff --git a/frontend/src/scenes/data-warehouse/redirect/DataWarehouseRedirectScene.tsx b/frontend/src/scenes/data-warehouse/redirect/DataWarehouseRedirectScene.tsx
index 89b23c525c094..0d7b433cbc7cb 100644
--- a/frontend/src/scenes/data-warehouse/redirect/DataWarehouseRedirectScene.tsx
+++ b/frontend/src/scenes/data-warehouse/redirect/DataWarehouseRedirectScene.tsx
@@ -1,6 +1,6 @@
 import { LemonButton, LemonInput } from '@posthog/lemon-ui'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { sourceFormLogic } from 'scenes/data-warehouse/external/forms/sourceFormLogic'
 import { SceneExport } from 'scenes/sceneTypes'
 
@@ -20,9 +20,9 @@ export function DataWarehouseRedirectScene(): JSX.Element {
                 className="space-y-4 max-w-100"
                 enableFormOnSubmit
             >
-                <Field name="prefix" label="Table prefix">
+                <LemonField name="prefix" label="Table prefix">
                     <LemonInput />
-                </Field>
+                </LemonField>
                 <LemonButton type="primary" htmlType="submit">
                     Submit
                 </LemonButton>
diff --git a/frontend/src/scenes/early-access-features/EarlyAccessFeature.tsx b/frontend/src/scenes/early-access-features/EarlyAccessFeature.tsx
index def6034aceb44..65b34a32ad3fa 100644
--- a/frontend/src/scenes/early-access-features/EarlyAccessFeature.tsx
+++ b/frontend/src/scenes/early-access-features/EarlyAccessFeature.tsx
@@ -8,9 +8,9 @@ import { NotFound } from 'lib/components/NotFound'
 import { PageHeader } from 'lib/components/PageHeader'
 import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { Field, PureField } from 'lib/forms/Field'
 import { IconClose, IconFlag, IconHelpOutline } from 'lib/lemon-ui/icons'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
 import { featureFlagLogic } from 'scenes/feature-flags/featureFlagLogic'
 import { personsLogic, PersonsLogicProps } from 'scenes/persons/personsLogic'
@@ -187,12 +187,12 @@ export function EarlyAccessFeature({ id }: { id?: string } = {}): JSX.Element {
             >
                 <div className="flex flex-col gap-4 flex-2 min-w-[15rem]">
                     {isNewEarlyAccessFeature && (
-                        <Field name="name" label="Name">
+                        <LemonField name="name" label="Name">
                             <LemonInput data-attr="feature-name" />
-                        </Field>
+                        </LemonField>
                     )}
                     {'feature_flag' in earlyAccessFeature ? (
-                        <PureField label="Connected Feature flag">
+                        <LemonField.Pure label="Connected Feature flag">
                             <div>
                                 <LemonButton
                                     type="secondary"
@@ -205,9 +205,9 @@ export function EarlyAccessFeature({ id }: { id?: string } = {}): JSX.Element {
                                     {earlyAccessFeature.feature_flag.key}
                                 </LemonButton>
                             </div>
-                        </PureField>
+                        </LemonField.Pure>
                     ) : (
-                        <Field
+                        <LemonField
                             name="feature_flag_id"
                             label="Link feature flag (optional)"
                             info={<>A feature flag will be generated from feature name if not provided</>}
@@ -226,7 +226,7 @@ export function EarlyAccessFeature({ id }: { id?: string } = {}): JSX.Element {
                                     )}
                                 </div>
                             )}
-                        </Field>
+                        </LemonField>
                     )}
                     {isEditingFeature || isNewEarlyAccessFeature ? (
                         <></>
@@ -250,12 +250,12 @@ export function EarlyAccessFeature({ id }: { id?: string } = {}): JSX.Element {
                         </div>
                     )}
                     {isEditingFeature || isNewEarlyAccessFeature ? (
-                        <Field name="description" label="Description" showOptional>
+                        <LemonField name="description" label="Description" showOptional>
                             <LemonTextArea
                                 className="ph-ignore-input"
                                 placeholder="Help your users understand the feature"
                             />
-                        </Field>
+                        </LemonField>
                     ) : (
                         <div className="mb-2">
                             <b>Description</b>
@@ -269,9 +269,9 @@ export function EarlyAccessFeature({ id }: { id?: string } = {}): JSX.Element {
                         </div>
                     )}
                     {isEditingFeature || isNewEarlyAccessFeature ? (
-                        <Field name="documentation_url" label="Documentation URL" showOptional>
+                        <LemonField name="documentation_url" label="Documentation URL" showOptional>
                             <LemonInput autoComplete="off" autoCapitalize="off" autoCorrect="off" spellCheck={false} />
-                        </Field>
+                        </LemonField>
                     ) : (
                         <div className="mb-2">
                             <b>Documentation URL</b>
diff --git a/frontend/src/scenes/events/Events.tsx b/frontend/src/scenes/events/Events.tsx
index ae21bad463961..4ae39dc817fa1 100644
--- a/frontend/src/scenes/events/Events.tsx
+++ b/frontend/src/scenes/events/Events.tsx
@@ -14,7 +14,6 @@ export function Events(): JSX.Element {
     return (
         <>
             <PageHeader />
-            <div className="non-3000 pt-4 border-t" />
             <AndroidRecordingsPromptBanner context="events" />
             <EventsScene />
         </>
diff --git a/frontend/src/scenes/experiments/Experiment.tsx b/frontend/src/scenes/experiments/Experiment.tsx
index 7625d2d9484ee..13cb2139e75a2 100644
--- a/frontend/src/scenes/experiments/Experiment.tsx
+++ b/frontend/src/scenes/experiments/Experiment.tsx
@@ -20,12 +20,12 @@ import { EditableField } from 'lib/components/EditableField/EditableField'
 import { NotFound } from 'lib/components/NotFound'
 import { PageHeader } from 'lib/components/PageHeader'
 import { dayjs } from 'lib/dayjs'
-import { Field } from 'lib/forms/Field'
 import { IconDelete, IconPlusMini, IconWarning } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { LemonCollapse } from 'lib/lemon-ui/LemonCollapse'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonProgress } from 'lib/lemon-ui/LemonProgress'
 import { Link } from 'lib/lemon-ui/Link'
 import { capitalizeFirstLetter, humanFriendlyNumber } from 'lib/utils'
@@ -212,16 +212,16 @@ export function Experiment(): JSX.Element {
                         <BindLogic logic={insightLogic} props={insightProps}>
                             <>
                                 <div className="flex flex-col gap-2 max-w-1/2">
-                                    <Field name="name" label="Name">
+                                    <LemonField name="name" label="Name">
                                         <LemonInput data-attr="experiment-name" />
-                                    </Field>
-                                    <Field name="feature_flag_key" label="Feature flag key">
+                                    </LemonField>
+                                    <LemonField name="feature_flag_key" label="Feature flag key">
                                         <LemonInput
                                             data-attr="experiment-feature-flag-key"
                                             disabled={editingExistingExperiment}
                                         />
-                                    </Field>
-                                    <Field
+                                    </LemonField>
+                                    <LemonField
                                         name="description"
                                         label={
                                             <div>
@@ -234,7 +234,7 @@ export function Experiment(): JSX.Element {
                                             className="ph-ignore-input"
                                             placeholder="Adding a helpful description can ensure others know what this experiment is about."
                                         />
-                                    </Field>
+                                    </LemonField>
                                     {experiment.parameters.feature_flag_variants && (
                                         <div>
                                             <label>
@@ -276,7 +276,7 @@ export function Experiment(): JSX.Element {
                                                             >
                                                                 {index === 0 ? 'Control' : 'Test'}
                                                             </div>
-                                                            <Field name="key" className="extend-variant-fully">
+                                                            <LemonField name="key" className="extend-variant-fully">
                                                                 <LemonInput
                                                                     disabled={index === 0 || experimentId !== 'new'}
                                                                     data-attr="experiment-variant-key"
@@ -289,7 +289,7 @@ export function Experiment(): JSX.Element {
                                                                     autoCorrect="off"
                                                                     spellCheck={false}
                                                                 />
-                                                            </Field>
+                                                            </LemonField>
 
                                                             <div className="float-right">
                                                                 {experimentId === 'new' &&
@@ -460,7 +460,7 @@ export function Experiment(): JSX.Element {
                                         </BindLogic>
                                     </div>
                                 </div>
-                                <Field name="secondary_metrics">
+                                <LemonField name="secondary_metrics">
                                     {({ value, onChange }) => (
                                         <div className="secondary-metrics">
                                             <div className="flex flex-col">
@@ -483,7 +483,7 @@ export function Experiment(): JSX.Element {
                                             </div>
                                         </div>
                                     )}
-                                </Field>
+                                </LemonField>
                                 <div className="bg-bg-light border rounded experiment-preview p-4">
                                     <ExperimentPreview
                                         experimentId={experiment.id}
diff --git a/frontend/src/scenes/experiments/MetricSelector.tsx b/frontend/src/scenes/experiments/MetricSelector.tsx
index df86d4f8482c3..4df25546fe8a9 100644
--- a/frontend/src/scenes/experiments/MetricSelector.tsx
+++ b/frontend/src/scenes/experiments/MetricSelector.tsx
@@ -112,7 +112,9 @@ export function ExperimentInsightCreator({ insightProps }: { insightProps: Insig
                         ),
                     } as TrendsQuery | FunnelsQuery)
                 }}
-                typeKey={`experiment-${isTrends ? InsightType.TRENDS : InsightType.FUNNELS}-secondary-metric`}
+                typeKey={`experiment-${isTrends ? InsightType.TRENDS : InsightType.FUNNELS}-${
+                    insightProps.dashboardItemId
+                }-metric`}
                 mathAvailability={isTrends ? undefined : MathAvailability.None}
                 hideDeleteBtn={isTrends || filterSteps.length === 1}
                 buttonCopy={isTrends ? 'Add graph series' : 'Add funnel step'}
diff --git a/frontend/src/scenes/experiments/SecondaryMetrics.tsx b/frontend/src/scenes/experiments/SecondaryMetrics.tsx
index a3202c05dc055..a56abec6c4902 100644
--- a/frontend/src/scenes/experiments/SecondaryMetrics.tsx
+++ b/frontend/src/scenes/experiments/SecondaryMetrics.tsx
@@ -5,9 +5,9 @@ import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { getSeriesColor } from 'lib/colors'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { Field } from 'lib/forms/Field'
 import { IconDelete, IconEdit } from 'lib/lemon-ui/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { capitalizeFirstLetter, humanFriendlyNumber } from 'lib/utils'
 import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
@@ -152,16 +152,16 @@ export function SecondaryMetrics({
                     id="secondary-metric-modal-form"
                     className="space-y-4"
                 >
-                    <Field name="name" label="Name">
+                    <LemonField name="name" label="Name">
                         <LemonInput data-attr="secondary-metric-name" />
-                    </Field>
-                    <Field name="filters" label="Query">
+                    </LemonField>
+                    <LemonField name="filters" label="Query">
                         <MetricSelector
                             dashboardItemId={SECONDARY_METRIC_INSIGHT_ID}
                             setPreviewInsight={setPreviewInsight}
                             showDateRangeBanner={isExperimentRunning}
                         />
-                    </Field>
+                    </LemonField>
                 </Form>
             </LemonModal>
             {experimentId == 'new' || editingExistingExperiment ? (
diff --git a/frontend/src/scenes/feature-flags/FeatureFlag.tsx b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
index 14dc419296a87..ee658db1b2061 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlag.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
@@ -12,13 +12,13 @@ import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { PageHeader } from 'lib/components/PageHeader'
 import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
 import { FEATURE_FLAGS } from 'lib/constants'
-import { Field } from 'lib/forms/Field'
 import { IconDelete, IconLock, IconPlus, IconUnfoldLess, IconUnfoldMore } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { LemonCheckbox } from 'lib/lemon-ui/LemonCheckbox'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
@@ -275,7 +275,6 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                 </div>
                             }
                         />
-                        <LemonDivider className="my-2 non-3000" />
                         {featureFlag.experiment_set && featureFlag.experiment_set?.length > 0 && (
                             <LemonBanner type="warning">
                                 This feature flag is linked to an experiment. Edit settings here only for advanced
@@ -285,9 +284,9 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                 </Link>
                             </LemonBanner>
                         )}
-                        <div className="mt-4 mb-8">
+                        <div className="my-4">
                             <div className="max-w-1/2 space-y-4">
-                                <Field
+                                <LemonField
                                     name="key"
                                     label="Key"
                                     help={
@@ -328,17 +327,17 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                             <span className="text-muted text-sm">Feature flag keys must be unique</span>
                                         </>
                                     )}
-                                </Field>
+                                </LemonField>
 
-                                <Field name="name" label="Description">
+                                <LemonField name="name" label="Description">
                                     <LemonTextArea
                                         className="ph-ignore-input"
                                         data-attr="feature-flag-description"
                                         defaultValue={featureFlag.name || ''}
                                     />
-                                </Field>
+                                </LemonField>
                                 {hasAvailableFeature(AvailableFeature.TAGGING) && (
-                                    <Field name="tags" label="Tags">
+                                    <LemonField name="tags" label="Tags">
                                         {({ value, onChange }) => {
                                             return (
                                                 <ObjectTags
@@ -352,9 +351,9 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                                 />
                                             )
                                         }}
-                                    </Field>
+                                    </LemonField>
                                 )}
-                                <Field name="active">
+                                <LemonField name="active">
                                     {({ value, onChange }) => (
                                         <div className="border rounded p-4">
                                             <LemonCheckbox
@@ -365,8 +364,8 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                             />
                                         </div>
                                     )}
-                                </Field>
-                                <Field name="ensure_experience_continuity">
+                                </LemonField>
+                                <LemonField name="ensure_experience_continuity">
                                     {({ value, onChange }) => (
                                         <div className="border rounded p-4">
                                             <LemonCheckbox
@@ -390,7 +389,7 @@ export function FeatureFlag({ id }: { id?: string } = {}): JSX.Element {
                                             </div>
                                         </div>
                                     )}
-                                </Field>
+                                </LemonField>
                             </div>
                         </div>
                         <LemonDivider />
@@ -876,12 +875,12 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                 </strong>
                             </div>
                             <Group name={['filters', 'payloads']}>
-                                <Field name="true">
+                                <LemonField name="true">
                                     <JSONEditorInput
                                         readOnly={readOnly}
                                         placeholder={'Examples: "A string", 2500, {"key": "value"}'}
                                     />
-                                </Field>
+                                </LemonField>
                             </Group>
                         </div>
                     )}
@@ -916,7 +915,7 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                         <Lettermark name={alphabet[index]} color={LettermarkColor.Gray} />
                                     </div>
                                     <div className="col-span-4">
-                                        <Field name={['multivariate', 'variants', index, 'key']}>
+                                        <LemonField name={['multivariate', 'variants', index, 'key']}>
                                             <LemonInput
                                                 data-attr="feature-flag-variant-key"
                                                 data-key-index={index.toString()}
@@ -933,19 +932,19 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                                     )
                                                 }
                                             />
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                     <div className="col-span-6">
-                                        <Field name={['multivariate', 'variants', index, 'name']}>
+                                        <LemonField name={['multivariate', 'variants', index, 'name']}>
                                             <LemonInput
                                                 data-attr="feature-flag-variant-name"
                                                 className="ph-ignore-input"
                                                 placeholder="Description"
                                             />
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                     <div className="col-span-8">
-                                        <Field name={['payloads', index]}>
+                                        <LemonField name={['payloads', index]}>
                                             {({ value, onChange }) => {
                                                 return (
                                                     <JSONEditorInput
@@ -955,10 +954,10 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                                     />
                                                 )
                                             }}
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                     <div className="col-span-3">
-                                        <Field name={['multivariate', 'variants', index, 'rollout_percentage']}>
+                                        <LemonField name={['multivariate', 'variants', index, 'rollout_percentage']}>
                                             {({ value, onChange }) => (
                                                 <div>
                                                     <LemonInput
@@ -1004,7 +1003,7 @@ function FeatureFlagRollout({ readOnly }: { readOnly?: boolean }): JSX.Element {
                                                     )}
                                                 </div>
                                             )}
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                     <div className="flex items-center justify-center">
                                         {variants.length > 1 && (
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagAutoRollout.tsx b/frontend/src/scenes/feature-flags/FeatureFlagAutoRollout.tsx
index 07016ce4b4e7a..1954103fcff96 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagAutoRollout.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagAutoRollout.tsx
@@ -2,8 +2,8 @@ import { LemonButton, LemonDivider, LemonInput, LemonSelect, LemonTag, Link } fr
 import { useActions, useValues } from 'kea'
 import { Group } from 'kea-forms'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { Field } from 'lib/forms/Field'
 import { IconDelete } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { capitalizeFirstLetter, genericOperatorMap, humanFriendlyNumber } from 'lib/utils'
 import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
@@ -87,7 +87,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                         <div className="mt-3 mr-3">
                                             <b>Rollback Condition Type</b>
                                         </div>
-                                        <Field name="threshold_type">
+                                        <LemonField name="threshold_type">
                                             {({ value, onChange }) => (
                                                 <LemonSelect
                                                     value={value}
@@ -98,7 +98,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                     ]}
                                                 />
                                             )}
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                     <LemonButton
                                         icon={<IconDelete />}
@@ -111,7 +111,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                 <LemonDivider className="my-3" />
                                 {featureFlag.rollback_conditions[index].threshold_type == 'insight' ? (
                                     <div className="flex gap-2 items-center mt-4">
-                                        <Field name="threshold_metric">
+                                        <LemonField name="threshold_metric">
                                             {({ value, onChange }) => (
                                                 <ActionFilter
                                                     filters={value}
@@ -137,7 +137,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                     ]}
                                                 />
                                             )}
-                                        </Field>
+                                        </LemonField>
                                         <span>
                                             trailing 7 day average is&nbsp;
                                             {insightRollingAverages[index] !== undefined ? (
@@ -147,7 +147,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                             )}
                                             . Trigger when trailing average is
                                         </span>
-                                        <Field name="operator">
+                                        <LemonField name="operator">
                                             {({ value, onChange }) => (
                                                 <LemonSelect
                                                     value={value}
@@ -158,10 +158,10 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                     ]}
                                                 />
                                             )}
-                                        </Field>
-                                        <Field name="threshold">
+                                        </LemonField>
+                                        <LemonField name="threshold">
                                             <LemonInput min={0} type="number" />
-                                        </Field>
+                                        </LemonField>
                                     </div>
                                 ) : sentryIntegrationEnabled ? (
                                     <div>
@@ -175,7 +175,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                 <Spinner />
                                             )}
                                             <span>&nbsp;Trigger when there is a</span>
-                                            <Field name="threshold" className="ml-3 mr-3">
+                                            <LemonField name="threshold" className="ml-3 mr-3">
                                                 {({ value, onChange }) => (
                                                     <LemonInput
                                                         value={value}
@@ -185,8 +185,8 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                         onChange={onChange}
                                                     />
                                                 )}
-                                            </Field>
-                                            <Field name="operator" className="mr-3">
+                                            </LemonField>
+                                            <LemonField name="operator" className="mr-3">
                                                 {({ value, onChange }) => (
                                                     <LemonSelect
                                                         options={[
@@ -197,7 +197,7 @@ export function FeatureFlagAutoRollback({ readOnly }: FeatureFlagAutoRollbackPro
                                                         onChange={onChange}
                                                     />
                                                 )}
-                                            </Field>
+                                            </LemonField>
                                             <span>
                                                 to{' '}
                                                 {sentryErrorCount ? (
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagCodeOptions.tsx b/frontend/src/scenes/feature-flags/FeatureFlagCodeOptions.tsx
index ebfe728f181df..1c87dd765df0f 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagCodeOptions.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagCodeOptions.tsx
@@ -135,6 +135,7 @@ export const PAYLOAD_LIBRARIES: string[] = [
     SDKKey.ANDROID,
     SDKKey.REACT_NATIVE,
     SDKKey.IOS,
+    SDKKey.FLUTTER,
 ]
 
 export const BOOTSTRAPPING_OPTIONS: InstructionOption[] = [
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx b/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
index 0df3f02935852..ea12260ab2583 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagReleaseConditions.tsx
@@ -8,13 +8,13 @@ import { allOperatorsToHumanName } from 'lib/components/DefinitionPopover/utils'
 import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
 import { isPropertyFilterWithOperator } from 'lib/components/PropertyFilters/utils'
 import { FEATURE_FLAGS, INSTANTLY_AVAILABLE_PROPERTIES } from 'lib/constants'
-import { Field } from 'lib/forms/Field'
 import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
 import { GroupsIntroductionOption } from 'lib/introductions/GroupsIntroductionOption'
 import { IconCopy, IconDelete, IconErrorOutline, IconOpenInNew, IconPlus, IconSubArrowRight } from 'lib/lemon-ui/icons'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonSlider } from 'lib/lemon-ui/LemonSlider'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
@@ -279,7 +279,7 @@ export function FeatureFlagReleaseConditions({
                                     className="ml-1.5 w-20"
                                 />
                                 <Group name={['filters', 'groups', index]}>
-                                    <Field name="rollout_percentage">
+                                    <LemonField name="rollout_percentage">
                                         <LemonInput
                                             data-attr="rollout-percentage"
                                             type="number"
@@ -293,7 +293,7 @@ export function FeatureFlagReleaseConditions({
                                             step="any"
                                             suffix={<span>%</span>}
                                         />
-                                    </Field>
+                                    </LemonField>
                                 </Group>{' '}
                                 of <b>{aggregationTargetName}</b> in this set.{' '}
                             </div>
diff --git a/frontend/src/scenes/feature-flags/FeatureFlagSnippets.tsx b/frontend/src/scenes/feature-flags/FeatureFlagSnippets.tsx
index c4ad007bb45c5..06037bb23c2ea 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlagSnippets.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlagSnippets.tsx
@@ -329,7 +329,7 @@ export function AndroidSnippet({ flagKey, multivariant, payload }: FeatureFlagSn
     const variantSuffix = multivariant ? ` == "example-variant"` : ''
     return (
         <CodeSnippet language={Language.Kotlin} wrap>
-            {`if (${clientSuffix}${flagFunction}("${flagKey}") ${variantSuffix}) {
+            {`if (${clientSuffix}${flagFunction}("${flagKey}")${variantSuffix}) {
     // do something
 }
             `}
@@ -337,10 +337,24 @@ export function AndroidSnippet({ flagKey, multivariant, payload }: FeatureFlagSn
     )
 }
 
-export function FlutterSnippet({ flagKey }: FeatureFlagSnippet): JSX.Element {
+export function FlutterSnippet({ flagKey, multivariant, payload }: FeatureFlagSnippet): JSX.Element {
+    const clientSuffix = 'await Posthog().'
+
+    if (payload) {
+        return (
+            <CodeSnippet language={Language.Dart} wrap>
+                {`${clientSuffix}getFeatureFlagPayload('${flagKey}');`}
+            </CodeSnippet>
+        )
+    }
+
+    const flagFunction = multivariant ? 'getFeatureFlag' : 'isFeatureEnabled'
+
+    const variantSuffix = multivariant ? ` == 'example-variant'` : ''
+
     return (
         <CodeSnippet language={Language.Dart} wrap>
-            {`if (await Posthog().isFeatureEnabled('${flagKey}') ?? false) {
+            {`if (${clientSuffix}${flagFunction}('${flagKey}')${variantSuffix}) {
     // do something
 }
             `}
@@ -364,7 +378,7 @@ export function iOSSnippet({ flagKey, multivariant, payload }: FeatureFlagSnippe
     const variantSuffix = multivariant ? `as? String == "example-variant"` : ''
     return (
         <CodeSnippet language={Language.Swift} wrap>
-            {`if ${clientSuffix}${flagFunction}("${flagKey}") ${variantSuffix} {
+            {`if ${clientSuffix}${flagFunction}("${flagKey}")${variantSuffix} {
     // do something
 }`}
         </CodeSnippet>
diff --git a/frontend/src/scenes/funnels/FunnelBarGraph/FunnelBarGraph.scss b/frontend/src/scenes/funnels/FunnelBarGraph/FunnelBarGraph.scss
index 92510c254be38..a2349cfa463a0 100644
--- a/frontend/src/scenes/funnels/FunnelBarGraph/FunnelBarGraph.scss
+++ b/frontend/src/scenes/funnels/FunnelBarGraph/FunnelBarGraph.scss
@@ -115,13 +115,9 @@ $glyph_height: 23px; // Based on .funnel-step-glyph
         flex-direction: row;
         height: 32px;
         margin: 4px 0;
-        background-color: var(--border-light);
+        background-color: var(--border-3000);
         border-radius: var(--radius);
 
-        .posthog-3000 & {
-            background-color: var(--border-3000);
-        }
-
         .funnel-bar {
             position: relative;
             height: 100%;
diff --git a/frontend/src/scenes/insights/EditorFilters/FunnelsAdvanced.tsx b/frontend/src/scenes/insights/EditorFilters/FunnelsAdvanced.tsx
index 4eb2ebd8c4c99..6d34791efaf1c 100644
--- a/frontend/src/scenes/insights/EditorFilters/FunnelsAdvanced.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/FunnelsAdvanced.tsx
@@ -1,6 +1,6 @@
 import { useActions, useValues } from 'kea'
-import { PureField } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
 
 import { Noun } from '~/models/groupsModel'
@@ -16,14 +16,14 @@ export function FunnelsAdvanced({ insightProps }: EditorFilterProps): JSX.Elemen
 
     return (
         <div className="space-y-4">
-            <PureField label="Step order" info={<StepOrderInfo />}>
+            <LemonField.Pure label="Step order" info={<StepOrderInfo />}>
                 <FunnelStepOrderPicker />
-            </PureField>
-            <PureField label="Conversion rate calculation">
+            </LemonField.Pure>
+            <LemonField.Pure label="Conversion rate calculation">
                 <FunnelStepReferencePicker />
-            </PureField>
+            </LemonField.Pure>
 
-            <PureField
+            <LemonField.Pure
                 label="Exclusion steps"
                 info={
                     <ExclusionStepsInfo
@@ -33,7 +33,7 @@ export function FunnelsAdvanced({ insightProps }: EditorFilterProps): JSX.Elemen
                 }
             >
                 <FunnelExclusionsFilter />
-            </PureField>
+            </LemonField.Pure>
 
             {!!advancedOptionsUsedCount && (
                 <div className="mt-4">
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
index 8895ed32ae55b..b431815584f17 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.stories.tsx
@@ -69,6 +69,8 @@ export const ValidationError: StoryFn = () => {
                 ctx.status(200),
                 ctx.json({ count: 1, results: [{ ...insight, result: null }] }),
             ],
+        },
+        post: {
             '/api/projects/:team_id/insights/:id': (_, __, ctx) => [
                 ctx.delay(100),
                 ctx.status(400),
@@ -92,6 +94,8 @@ export const EstimatedQueryExecutionTimeTooLong: StoryFn = () => {
                 ctx.status(200),
                 ctx.json({ count: 1, results: [{ ...insight, result: null }] }),
             ],
+        },
+        post: {
             '/api/projects/:team_id/insights/trend/': (_, __, ctx) => [
                 ctx.delay(100),
                 ctx.status(512),
@@ -120,6 +124,8 @@ export const LongLoading: StoryFn = () => {
                 ctx.status(200),
                 ctx.json({ count: 1, results: [{ ...insight, result: null }] }),
             ],
+        },
+        post: {
             '/api/projects/:team_id/insights/trend/': (_, __, ctx) => [
                 ctx.delay(86400000),
                 ctx.status(200),
diff --git a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
index dcd9f19fffdac..7a0893ca724e0 100644
--- a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
+++ b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
@@ -178,7 +178,6 @@ export function InsightTooltip({
                     dataSource={dataSource.slice(0, rowCutoff)}
                     columns={columns}
                     rowKey="id"
-                    size="small"
                     uppercaseHeader={false}
                     rowRibbonColor={hideColorCol ? undefined : (datum) => datum.color || null}
                     showHeader={showHeader}
@@ -239,7 +238,6 @@ export function InsightTooltip({
                 dataSource={dataSource.slice(0, rowCutoff)}
                 columns={columns}
                 rowKey="id"
-                size="small"
                 className="ph-no-capture"
                 uppercaseHeader={false}
                 rowRibbonColor={hideColorCol ? undefined : (datum: SeriesDatum) => datum.color || null}
diff --git a/frontend/src/scenes/insights/utils.tsx b/frontend/src/scenes/insights/utils.tsx
index b249415792a49..50cc8fc63ec8c 100644
--- a/frontend/src/scenes/insights/utils.tsx
+++ b/frontend/src/scenes/insights/utils.tsx
@@ -263,7 +263,7 @@ export function formatBreakdownLabel(
         return cohorts?.filter((c) => c.id == breakdown_value)[0]?.name ?? (breakdown_value || '').toString()
     } else if (typeof breakdown_value == 'number') {
         return isOtherBreakdown(breakdown_value)
-            ? 'Other'
+            ? 'Other (Groups all remaining values)'
             : isNullBreakdown(breakdown_value)
             ? 'None'
             : formatPropertyValueForDisplay
@@ -271,7 +271,7 @@ export function formatBreakdownLabel(
             : String(breakdown_value)
     } else if (typeof breakdown_value == 'string') {
         return isOtherBreakdown(breakdown_value) || breakdown_value === 'nan'
-            ? 'Other'
+            ? 'Other (Groups all remaining values)'
             : isNullBreakdown(breakdown_value) || breakdown_value === ''
             ? 'None'
             : breakdown_value
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
index 9256f192ecab8..7c854998efc6f 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
@@ -1,5 +1,5 @@
 import { createPostHogWidgetNode } from 'scenes/notebooks/Nodes/NodeWrapper'
-import { FilterType, NotebookNodeType, RecordingFilters } from '~/types'
+import { FilterType, NotebookNodeType, RecordingFilters, ReplayTabs } from '~/types'
 import {
     SessionRecordingPlaylistLogicProps,
     addedAdvancedFilters,
@@ -165,6 +165,14 @@ export const NotebookNodePlaylist = createPostHogWidgetNode<NotebookNodePlaylist
             default: undefined,
         },
     },
+    pasteOptions: {
+        find: urls.replay(ReplayTabs.Recent) + '(.*)',
+        getAttributes: async (match) => {
+            const url = new URL(match[0])
+            const filters = url.searchParams.get('filters')
+            return { filters: filters ? JSON.parse(filters) : {}, pinned: [] }
+        },
+    },
     Settings,
 })
 
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
index 07073be4f5ef8..9589712745280 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
@@ -36,6 +36,9 @@ const Component = ({
     const { expanded } = useValues(nodeLogic)
     const { setTitlePlaceholder } = useActions(nodeLogic)
     const summarizeInsight = useSummarizeInsight()
+    const { insightName } = useValues(
+        insightLogic({ dashboardItemId: query.kind === NodeKind.SavedInsightNode ? query.shortId : 'new' })
+    )
 
     useEffect(() => {
         let title = 'Query'
@@ -58,13 +61,13 @@ const Component = ({
                 }
             }
         }
+
         if (query.kind === NodeKind.SavedInsightNode) {
-            const logic = insightLogic.findMounted({ dashboardItemId: query.shortId })
-            title = (logic?.values.insight.name || logic?.values.insight.derived_name) ?? 'Saved Insight'
+            title = insightName ?? 'Saved Insight'
         }
 
         setTitlePlaceholder(title)
-    }, [query])
+    }, [query, insightName])
 
     const modifiedQuery = useMemo(() => {
         const modifiedQuery = { ...query, full: false }
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeRecording.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeRecording.tsx
index 095277d8a2d3a..ec1515df9fba6 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeRecording.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeRecording.tsx
@@ -157,7 +157,7 @@ export const NotebookNodeRecording = createPostHogWidgetNode<NotebookNodeRecordi
         },
     },
     pasteOptions: {
-        find: urls.replaySingle('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'),
+        find: urls.replaySingle('([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'),
         getAttributes: async (match) => {
             return { id: match[1], noInspector: false }
         },
diff --git a/frontend/src/scenes/onboarding/Onboarding.tsx b/frontend/src/scenes/onboarding/Onboarding.tsx
index 1940085873012..0dc78e6eaaf47 100644
--- a/frontend/src/scenes/onboarding/Onboarding.tsx
+++ b/frontend/src/scenes/onboarding/Onboarding.tsx
@@ -10,7 +10,6 @@ import { AvailableFeature, ProductKey } from '~/types'
 import { OnboardingBillingStep } from './OnboardingBillingStep'
 import { OnboardingInviteTeammates } from './OnboardingInviteTeammates'
 import { onboardingLogic, OnboardingStepKey } from './onboardingLogic'
-import { OnboardingOtherProductsStep } from './OnboardingOtherProductsStep'
 import { OnboardingProductConfiguration } from './OnboardingProductConfiguration'
 import { ProductConfigOption } from './onboardingProductConfigurationLogic'
 import { OnboardingVerificationStep } from './OnboardingVerificationStep'
@@ -29,7 +28,7 @@ export const scene: SceneExport = {
  * Wrapper for custom onboarding content. This automatically includes billing, other products, and invite steps.
  */
 const OnboardingWrapper = ({ children }: { children: React.ReactNode }): JSX.Element => {
-    const { currentOnboardingStep, shouldShowBillingStep, shouldShowOtherProductsStep } = useValues(onboardingLogic)
+    const { currentOnboardingStep, shouldShowBillingStep } = useValues(onboardingLogic)
     const { setAllOnboardingSteps } = useActions(onboardingLogic)
     const { product } = useValues(onboardingLogic)
     const [allSteps, setAllSteps] = useState<JSX.Element[]>([])
@@ -60,10 +59,6 @@ const OnboardingWrapper = ({ children }: { children: React.ReactNode }): JSX.Ele
             const BillingStep = <OnboardingBillingStep product={product} stepKey={OnboardingStepKey.BILLING} />
             steps = [...steps, BillingStep]
         }
-        if (shouldShowOtherProductsStep) {
-            const OtherProductsStep = <OnboardingOtherProductsStep stepKey={OnboardingStepKey.OTHER_PRODUCTS} />
-            steps = [...steps, OtherProductsStep]
-        }
         const inviteTeammatesStep = <OnboardingInviteTeammates stepKey={OnboardingStepKey.INVITE_TEAMMATES} />
         steps = [...steps, inviteTeammatesStep]
         setAllSteps(steps)
diff --git a/frontend/src/scenes/onboarding/OnboardingOtherProductsStep.tsx b/frontend/src/scenes/onboarding/OnboardingOtherProductsStep.tsx
deleted file mode 100644
index caac1d4f6cc0a..0000000000000
--- a/frontend/src/scenes/onboarding/OnboardingOtherProductsStep.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useActions, useValues } from 'kea'
-import { useWindowSize } from 'lib/hooks/useWindowSize'
-import { ProductCard } from 'scenes/products/Products'
-
-import { onboardingLogic, OnboardingStepKey } from './onboardingLogic'
-import { OnboardingStep } from './OnboardingStep'
-
-export const OnboardingOtherProductsStep = ({
-    stepKey = OnboardingStepKey.OTHER_PRODUCTS,
-}: {
-    stepKey?: OnboardingStepKey
-}): JSX.Element => {
-    const { product, suggestedProducts } = useValues(onboardingLogic)
-    const { completeOnboarding } = useActions(onboardingLogic)
-    const { width } = useWindowSize()
-    const horizontalCard = width && width >= 640
-
-    return (
-        <OnboardingStep
-            title={`${product?.name} pairs with...`}
-            subtitle="The magic in PostHog is having everything all in one place. Get started with our other products to unlock your product and data superpowers."
-            showSkip
-            continueOverride={<></>}
-            stepKey={stepKey}
-        >
-            <div className="flex flex-col gap-y-6 my-6 items-center">
-                {suggestedProducts?.map((suggestedProduct) => (
-                    <ProductCard
-                        product={suggestedProduct}
-                        key={suggestedProduct.type}
-                        getStartedActionOverride={() => completeOnboarding(suggestedProduct.type)}
-                        orientation={horizontalCard ? 'horizontal' : 'vertical'}
-                        className="w-full"
-                    />
-                ))}
-            </div>
-        </OnboardingStep>
-    )
-}
diff --git a/frontend/src/scenes/onboarding/onboardingLogic.tsx b/frontend/src/scenes/onboarding/onboardingLogic.tsx
index f6d46eee16751..942fe3ced24c4 100644
--- a/frontend/src/scenes/onboarding/onboardingLogic.tsx
+++ b/frontend/src/scenes/onboarding/onboardingLogic.tsx
@@ -34,8 +34,8 @@ export const getProductUri = (productKey: ProductKey, featureFlags?: FeatureFlag
     switch (productKey) {
         case ProductKey.PRODUCT_ANALYTICS:
             return featureFlags && featureFlags[FEATURE_FLAGS.REDIRECT_WEB_PRODUCT_ANALYTICS_ONBOARDING] === 'test'
-                ? combineUrl(urls.webAnalytics(), { onboarding_completed: true }).url
-                : combineUrl(urls.insights(), { onboarding_completed: true }).url
+                ? combineUrl(urls.webAnalytics(), {}, { panel: 'activation' }).url
+                : combineUrl(urls.insights(), {}, { panel: 'activation' }).url
         case ProductKey.SESSION_REPLAY:
             return urls.replay()
         case ProductKey.FEATURE_FLAGS:
@@ -143,22 +143,6 @@ export const onboardingLogic = kea<onboardingLogicType>([
                 return !product?.subscribed || !hasAllAddons || subscribedDuringOnboarding
             },
         ],
-        shouldShowOtherProductsStep: [
-            (s) => [s.suggestedProducts, s.isFirstProductOnboarding],
-            (suggestedProducts: BillingProductV2Type[], isFirstProductOnboarding: boolean) =>
-                suggestedProducts.length > 0 && isFirstProductOnboarding,
-        ],
-        suggestedProducts: [
-            (s) => [s.billing, s.product, s.currentTeam],
-            (billing, product, currentTeam) =>
-                billing?.products?.filter(
-                    (p) =>
-                        p.type !== product?.type &&
-                        !p.contact_support &&
-                        !p.inclusion_only &&
-                        !currentTeam?.has_completed_onboarding_for?.[p.type]
-                ) || [],
-        ],
         isStepKeyInvalid: [
             (s) => [s.stepKey, s.allOnboardingSteps, s.currentOnboardingStep],
             (stepKey: string, allOnboardingSteps: AllOnboardingSteps, currentOnboardingStep: React.ReactNode | null) =>
diff --git a/frontend/src/scenes/onboarding/sdks/product-analytics/flutter.tsx b/frontend/src/scenes/onboarding/sdks/product-analytics/flutter.tsx
index a5cd98e80bf96..aa02bdb26a604 100644
--- a/frontend/src/scenes/onboarding/sdks/product-analytics/flutter.tsx
+++ b/frontend/src/scenes/onboarding/sdks/product-analytics/flutter.tsx
@@ -6,7 +6,7 @@ function FlutterCaptureSnippet(): JSX.Element {
     return (
         <CodeSnippet language={Language.Dart}>
             {
-                "import 'package:posthog_flutter/posthog_flutter.dart';\n\nPosthog().screen(\n\tscreenName: 'Example Screen',\n);"
+                "import 'package:posthog_flutter/posthog_flutter.dart';\n\nawait Posthog().screen(\n\tscreenName: 'Example Screen',\n);"
             }
         </CodeSnippet>
     )
diff --git a/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/flutter.tsx b/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/flutter.tsx
index a663a65327552..67e3a4a7799d3 100644
--- a/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/flutter.tsx
+++ b/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/flutter.tsx
@@ -4,7 +4,7 @@ import { apiHostOrigin } from 'lib/utils/apiHost'
 import { teamLogic } from 'scenes/teamLogic'
 
 function FlutterInstallSnippet(): JSX.Element {
-    return <CodeSnippet language={Language.YAML}>posthog_flutter: ^3.0.0</CodeSnippet>
+    return <CodeSnippet language={Language.YAML}>posthog_flutter: ^4.0.0</CodeSnippet>
 }
 
 function FlutterAndroidSetupSnippet(): JSX.Element {
@@ -17,7 +17,7 @@ function FlutterAndroidSetupSnippet(): JSX.Element {
                 currentTeam?.api_token +
                 '" />\n\t<meta-data android:name="com.posthog.posthog.POSTHOG_HOST" android:value="' +
                 url +
-                '" />\n\t<meta-data android:name="com.posthog.posthog.TRACK_APPLICATION_LIFECYCLE_EVENTS" android:value="false" />\n\t<meta-data android:name="com.posthog.posthog.DEBUG" android:value="false" />\n</application>'}
+                '" />\n\t<meta-data android:name="com.posthog.posthog.TRACK_APPLICATION_LIFECYCLE_EVENTS" android:value="true" />\n\t<meta-data android:name="com.posthog.posthog.DEBUG" android:value="true" />\n</application>'}
         </CodeSnippet>
     )
 }
@@ -32,7 +32,31 @@ function FlutterIOSSetupSnippet(): JSX.Element {
                 currentTeam?.api_token +
                 '</string>\n\t<key>com.posthog.posthog.POSTHOG_HOST</key>\n\t<string>' +
                 url +
-                '</string>\n\t<key>com.posthog.posthog.CAPTURE_APPLICATION_LIFECYCLE_EVENTS</key>\n\t<false/>\n\t[...]\n</dict>'}
+                '</string>\n\t<key>com.posthog.posthog.CAPTURE_APPLICATION_LIFECYCLE_EVENTS</key>\n\t<true/>\n\t[...]\n</dict>'}
+        </CodeSnippet>
+    )
+}
+
+function FlutterWebSetupSnippet(): JSX.Element {
+    const { currentTeam } = useValues(teamLogic)
+    const url = apiHostOrigin()
+
+    return (
+        <CodeSnippet language={Language.HTML}>
+            {`<!DOCTYPE html>
+<html>
+  <head>
+    ...
+    <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||[]);
+      posthog.init('${currentTeam?.api_token}', {api_host: '${url}'})
+    </script>
+  </head>
+
+  <body>
+    ...
+  </body>
+</html>`}
         </CodeSnippet>
     )
 }
@@ -45,9 +69,12 @@ export function SDKInstallFlutterInstructions(): JSX.Element {
             <h3>Android Setup</h3>
             <p className="prompt-text">Add these values in AndroidManifest.xml</p>
             <FlutterAndroidSetupSnippet />
-            <h3>iOS Setup</h3>
+            <h3>iOS/macOS Setup</h3>
             <p className="prompt-text">Add these values in Info.plist</p>
             <FlutterIOSSetupSnippet />
+            <h3>Web Setup</h3>
+            <p className="prompt-text">Add these values in index.html</p>
+            <FlutterWebSetupSnippet />
         </>
     )
 }
diff --git a/frontend/src/scenes/organization/ConfirmOrganization/ConfirmOrganization.tsx b/frontend/src/scenes/organization/ConfirmOrganization/ConfirmOrganization.tsx
index 24c1ab43ec1a1..300d5825846d6 100644
--- a/frontend/src/scenes/organization/ConfirmOrganization/ConfirmOrganization.tsx
+++ b/frontend/src/scenes/organization/ConfirmOrganization/ConfirmOrganization.tsx
@@ -5,9 +5,9 @@ import { AnimatedCollapsible } from 'lib/components/AnimatedCollapsible'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import SignupReferralSource from 'lib/components/SignupReferralSource'
 import SignupRoleSelect from 'lib/components/SignupRoleSelect'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { SceneExport } from 'scenes/sceneTypes'
@@ -62,21 +62,21 @@ export function ConfirmOrganization(): JSX.Element {
                 enableFormOnSubmit
                 className="space-y-4"
             >
-                <Field name="email" label="Email">
+                <LemonField name="email" label="Email">
                     <LemonInput className="ph-ignore-input" value={email} disabled />
-                </Field>
+                </LemonField>
 
-                <Field name="first_name" label="Your name">
+                <LemonField name="first_name" label="Your name">
                     <LemonInput className="ph-ignore-input" placeholder="Jane Doe" />
-                </Field>
+                </LemonField>
 
-                <Field
+                <LemonField
                     name="organization_name"
                     label="Organization name"
                     help="You can always rename your organization later"
                 >
                     <LemonInput className="ph-ignore-input" placeholder="Hogflix Movies" />
-                </Field>
+                </LemonField>
 
                 <SignupRoleSelect />
                 <SignupReferralSource disabled={isConfirmOrganizationSubmitting} />
diff --git a/frontend/src/scenes/organization/CreateOrganizationModal.tsx b/frontend/src/scenes/organization/CreateOrganizationModal.tsx
index 68375eda4308b..f0aa3482f534f 100644
--- a/frontend/src/scenes/organization/CreateOrganizationModal.tsx
+++ b/frontend/src/scenes/organization/CreateOrganizationModal.tsx
@@ -1,6 +1,6 @@
 import { LemonButton, LemonInput, LemonModal, Link } from '@posthog/lemon-ui'
 import { useActions } from 'kea'
-import { PureField } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { useState } from 'react'
 import { organizationLogic } from 'scenes/organizationLogic'
 
@@ -63,7 +63,7 @@ export function CreateOrganizationModal({
             isOpen={isVisible}
             inline={inline}
         >
-            <PureField label="Organization name">
+            <LemonField.Pure label="Organization name">
                 <LemonInput
                     placeholder="Acme Inc."
                     maxLength={64}
@@ -76,7 +76,7 @@ export function CreateOrganizationModal({
                         }
                     }}
                 />
-            </PureField>
+            </LemonField.Pure>
         </LemonModal>
     )
 }
diff --git a/frontend/src/scenes/pipeline/Destinations.tsx b/frontend/src/scenes/pipeline/Destinations.tsx
index 9f251fe942d1e..149f8a2cc60fb 100644
--- a/frontend/src/scenes/pipeline/Destinations.tsx
+++ b/frontend/src/scenes/pipeline/Destinations.tsx
@@ -52,7 +52,7 @@ function DestinationsTable(): JSX.Element {
         <>
             <LemonTable
                 dataSource={destinations}
-                size="xs"
+                size="small"
                 loading={loading}
                 columns={[
                     {
diff --git a/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx b/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
index 67563831846d2..e844df81a3213 100644
--- a/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
+++ b/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
@@ -1,8 +1,8 @@
 import { LemonButton, LemonSkeleton, Tooltip } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { IconLock } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
 import React from 'react'
 import { BatchExportsEditFields } from 'scenes/batch_exports/BatchExportEditForm'
@@ -79,7 +79,7 @@ function PluginConfigurationFields({
             fieldConfig.type &&
             isValidField(fieldConfig) &&
             !hiddenFields.includes(fieldConfig.key) ? (
-                <Field
+                <LemonField
                     name={fieldConfig.key}
                     label={
                         <>
@@ -99,7 +99,7 @@ function PluginConfigurationFields({
                     showOptional={!requiredFields.includes(fieldConfig.key)}
                 >
                     <PluginField fieldConfig={fieldConfig} />
-                </Field>
+                </LemonField>
             ) : (
                 <>
                     {fieldConfig.type ? (
diff --git a/frontend/src/scenes/pipeline/PipelineNodeLogs.tsx b/frontend/src/scenes/pipeline/PipelineNodeLogs.tsx
index 6c2d5e5374f2a..cdb72aecf8d29 100644
--- a/frontend/src/scenes/pipeline/PipelineNodeLogs.tsx
+++ b/frontend/src/scenes/pipeline/PipelineNodeLogs.tsx
@@ -56,7 +56,6 @@ export function PipelineNodeLogs({ id, stage }: PipelineNodeLogicProps): JSX.Ele
                 dataSource={logs}
                 columns={columns}
                 loading={logsLoading}
-                size="small"
                 className="ph-no-capture"
                 rowKey="timestamp"
                 pagination={{ pageSize: 200, hideOnSinglePage: true }}
diff --git a/frontend/src/scenes/pipeline/Transformations.tsx b/frontend/src/scenes/pipeline/Transformations.tsx
index 9194166f4d161..cee7f5dced7e8 100644
--- a/frontend/src/scenes/pipeline/Transformations.tsx
+++ b/frontend/src/scenes/pipeline/Transformations.tsx
@@ -84,7 +84,7 @@ export function Transformations(): JSX.Element {
                     )}
                     <LemonTable
                         dataSource={transformations}
-                        size="xs"
+                        size="small"
                         loading={loading}
                         columns={[
                             {
diff --git a/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx b/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
index cb09686bd9b19..b19681a7c9493 100644
--- a/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
+++ b/frontend/src/scenes/plugins/edit/interface-jobs/PluginJobConfiguration.tsx
@@ -5,10 +5,10 @@ import { ChildFunctionProps, Form } from 'kea-forms'
 import { CodeEditor } from 'lib/components/CodeEditors'
 import { DatePicker } from 'lib/components/DatePicker'
 import { dayjs } from 'lib/dayjs'
-import { Field } from 'lib/forms/Field'
 import { IconClose, IconPlayCircle, IconSettings } from 'lib/lemon-ui/icons'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCalendarRangeInline } from 'lib/lemon-ui/LemonCalendarRange/LemonCalendarRangeInline'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { formatDate, formatDateRange } from 'lib/utils'
@@ -88,9 +88,9 @@ export function PluginJobModal(props: InterfaceJobsProps): JSX.Element {
             {shownFields.length > 0 ? (
                 <Form logic={interfaceJobsLogic} props={props} formKey="jobPayload">
                     {shownFields.map(([key, options]) => (
-                        <Field name={key} label={options.title || key} key={key} className="mb-4">
+                        <LemonField name={key} label={options.title || key} key={key} className="mb-4">
                             {(props) => <FieldInput options={options} {...props} />}
-                        </Field>
+                        </LemonField>
                     ))}
                 </Form>
             ) : null}
diff --git a/frontend/src/scenes/plugins/source/PluginSource.tsx b/frontend/src/scenes/plugins/source/PluginSource.tsx
index 9a5f7e1b876be..7b531e7cbfdda 100644
--- a/frontend/src/scenes/plugins/source/PluginSource.tsx
+++ b/frontend/src/scenes/plugins/source/PluginSource.tsx
@@ -7,8 +7,8 @@ import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { CodeEditor } from 'lib/components/CodeEditors'
 import { Drawer } from 'lib/components/Drawer'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { useEffect } from 'react'
 import { createDefaultPluginSource } from 'scenes/plugins/source/createDefaultPluginSource'
 import { pluginSourceLogic } from 'scenes/plugins/source/pluginSourceLogic'
@@ -112,7 +112,7 @@ export function PluginSource({
                         ) : (
                             <>
                                 <PluginSourceTabs logic={logic} />
-                                <Field name={[currentFile]}>
+                                <LemonField name={[currentFile]}>
                                     {({ value, onChange }) => (
                                         <>
                                             <CodeEditor
@@ -139,7 +139,7 @@ export function PluginSource({
                                             ) : null}
                                         </>
                                     )}
-                                </Field>
+                                </LemonField>
                             </>
                         )}
                     </>
diff --git a/frontend/src/scenes/plugins/source/pluginSourceLogic.tsx b/frontend/src/scenes/plugins/source/pluginSourceLogic.tsx
index cd332a54143f3..a2ebd3a5a8e2b 100644
--- a/frontend/src/scenes/plugins/source/pluginSourceLogic.tsx
+++ b/frontend/src/scenes/plugins/source/pluginSourceLogic.tsx
@@ -3,7 +3,6 @@ import { forms } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload } from 'kea-router'
 import api from 'lib/api'
-import { FormErrors } from 'lib/forms/Errors'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { validateJson } from 'lib/utils'
 import { frontendAppsLogic } from 'scenes/apps/frontendAppsLogic'
@@ -153,7 +152,6 @@ export const pluginSourceLogic = kea<pluginSourceLogicType>([
                 <>
                     <div>Please fix the following errors:</div>
                     <pre>{String(error?.message || error)}</pre>
-                    <FormErrors errors={values.pluginSourceErrors} />
                 </>,
                 { position: 'top-right' }
             )
diff --git a/frontend/src/scenes/project-homepage/ProjectHomepage.scss b/frontend/src/scenes/project-homepage/ProjectHomepage.scss
index 90d80d46c02ea..759f253b69aa6 100644
--- a/frontend/src/scenes/project-homepage/ProjectHomepage.scss
+++ b/frontend/src/scenes/project-homepage/ProjectHomepage.scss
@@ -20,13 +20,11 @@
                 }
             }
 
-            .posthog-3000 & {
-                a {
-                    color: var(--default);
+            a {
+                color: var(--default);
 
-                    &:hover {
-                        color: var(--primary-3000);
-                    }
+                &:hover {
+                    color: var(--primary-3000);
                 }
             }
         }
diff --git a/frontend/src/scenes/project-homepage/ProjectHomepage.tsx b/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
index fa178faaa50dd..17e45f3d86a64 100644
--- a/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
+++ b/frontend/src/scenes/project-homepage/ProjectHomepage.tsx
@@ -43,6 +43,14 @@ export function ProjectHomepage(): JSX.Element {
             {!!featureFlags[FEATURE_FLAGS.YEAR_IN_HOG] && window.POSTHOG_APP_CONTEXT?.year_in_hog_url && (
                 <YearInHogButton url={`${window.location.origin}${window.POSTHOG_APP_CONTEXT.year_in_hog_url}`} />
             )}
+            <LemonButton
+                type="secondary"
+                size="small"
+                data-attr="project-home-customize-homepage"
+                onClick={showSceneDashboardChoiceModal}
+            >
+                Customize homepage
+            </LemonButton>
             <LemonButton
                 data-attr="project-home-invite-team-members"
                 onClick={() => {
@@ -81,16 +89,6 @@ export function ProjectHomepage(): JSX.Element {
                                 </>
                             )}
                         </div>
-                        <div className="flex items-center gap-2">
-                            <LemonButton
-                                type="secondary"
-                                size="small"
-                                data-attr="project-home-change-dashboard"
-                                onClick={showSceneDashboardChoiceModal}
-                            >
-                                Change dashboard
-                            </LemonButton>
-                        </div>
                     </div>
                     <LemonDivider className="mt-3 mb-4" />
                     <Dashboard
diff --git a/frontend/src/scenes/project/CreateProjectModal.tsx b/frontend/src/scenes/project/CreateProjectModal.tsx
index 6739952f31b04..b1212bf53aeea 100644
--- a/frontend/src/scenes/project/CreateProjectModal.tsx
+++ b/frontend/src/scenes/project/CreateProjectModal.tsx
@@ -1,6 +1,6 @@
 import { LemonButton, LemonInput, LemonModal, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
-import { PureField } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { useEffect, useState } from 'react'
 import { teamLogic } from 'scenes/teamLogic'
@@ -90,7 +90,7 @@ export function CreateProjectModal({
             inline={inline}
             closable={!currentTeamLoading}
         >
-            <PureField label="Project name">
+            <LemonField.Pure label="Project name">
                 <LemonInput
                     placeholder="Production / Staging / Admin App"
                     maxLength={64}
@@ -104,7 +104,7 @@ export function CreateProjectModal({
                     }}
                     disabled={currentTeamLoading}
                 />
-            </PureField>
+            </LemonField.Pure>
         </LemonModal>
     )
 }
diff --git a/frontend/src/scenes/session-recordings/player/PlayerFrame.scss b/frontend/src/scenes/session-recordings/player/PlayerFrame.scss
index 924b067190978..9eb6bad67b2ba 100644
--- a/frontend/src/scenes/session-recordings/player/PlayerFrame.scss
+++ b/frontend/src/scenes/session-recordings/player/PlayerFrame.scss
@@ -8,11 +8,7 @@
     width: 100%;
     height: 100%;
     overflow: hidden;
-    background-color: var(--bg-charcoal);
-
-    .posthog-3000 & {
-        background-color: var(--bg-3000-dark);
-    }
+    background-color: var(--bg-3000-dark);
 
     .PlayerFrame__content {
         position: absolute;
diff --git a/frontend/src/scenes/session-recordings/player/PlayerMeta.scss b/frontend/src/scenes/session-recordings/player/PlayerMeta.scss
index ceae9d6b30bc9..a2a89a0af5103 100644
--- a/frontend/src/scenes/session-recordings/player/PlayerMeta.scss
+++ b/frontend/src/scenes/session-recordings/player/PlayerMeta.scss
@@ -39,7 +39,7 @@
 
         .LemonModal & {
             .PlayerMeta__top {
-                padding-right: 3.5rem;
+                padding-right: 3.5rem !important;
             }
         }
     }
@@ -81,12 +81,10 @@
     }
 
     .Link {
-        .posthog-3000 & {
-            color: var(--default);
+        color: var(--default);
 
-            &:hover {
-                color: var(--primary-3000);
-            }
+        &:hover {
+            color: var(--primary-3000);
         }
     }
 }
diff --git a/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.scss b/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.scss
index 0a5e430bf08e4..362eb9aceac3a 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.scss
+++ b/frontend/src/scenes/session-recordings/player/inspector/PlayerInspectorList.scss
@@ -7,12 +7,8 @@
     height: 0.5rem;
     margin-top: 0.25rem;
     pointer-events: none;
-    background-color: var(--primary);
+    background-color: var(--primary-3000);
     border-radius: var(--radius) 0 0 var(--radius);
     transition: transform 200ms linear;
     will-change: transform;
-
-    .posthog-3000 & {
-        background-color: var(--primary-3000);
-    }
 }
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
index b4dd2a5785ac9..e851684d58874 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
@@ -1,6 +1,7 @@
 import { LemonButton, LemonDivider } from '@posthog/lemon-ui'
 import { ErrorDisplay } from 'lib/components/Errors/ErrorDisplay'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
+import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { IconOpenInNew } from 'lib/lemon-ui/icons'
 import { Spinner } from 'lib/lemon-ui/Spinner'
 import { autoCaptureEventToDescription, capitalizeFirstLetter } from 'lib/utils'
@@ -34,6 +35,7 @@ export function ItemEvent({ item, expanded, setExpanded }: ItemEventProps): JSX.
                         disablePopover
                         ellipsis={true}
                         value={capitalizeFirstLetter(autoCaptureEventToDescription(item.data))}
+                        type={TaxonomicFilterGroupType.Events}
                     />
                     {item.data.event === '$autocapture' ? <span className="text-muted-alt">(Autocapture)</span> : null}
                     {subValue ? (
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.stories.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.stories.tsx
new file mode 100644
index 0000000000000..0edaa80036be1
--- /dev/null
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.stories.tsx
@@ -0,0 +1,33 @@
+import { Meta } from '@storybook/react'
+import {
+    BodyDisplay,
+    HeadersDisplay,
+    ItemPerformanceEvent,
+} from 'scenes/session-recordings/player/inspector/components/ItemPerformanceEvent'
+
+import { mswDecorator } from '~/mocks/browser'
+
+const meta: Meta<typeof ItemPerformanceEvent> = {
+    title: 'Components/ItemPerformanceEvent',
+    component: ItemPerformanceEvent,
+    decorators: [
+        mswDecorator({
+            get: {},
+        }),
+    ],
+}
+export default meta
+
+export function InitialHeadersDisplay(): JSX.Element {
+    return <HeadersDisplay request={undefined} response={undefined} isInitial={true} />
+}
+
+export function InitialBodyDisplay(): JSX.Element {
+    return (
+        <BodyDisplay
+            content={undefined}
+            headers={undefined}
+            emptyMessage="Response captured before PostHog was initialized"
+        />
+    )
+}
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 10c4cb545efe9..76a28a190917c 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
@@ -364,6 +364,7 @@ export function ItemPerformanceEvent({
                                                 <HeadersDisplay
                                                     request={item.request_headers}
                                                     response={item.response_headers}
+                                                    isInitial={item.is_initial}
                                                 />
                                             ),
                                         },
@@ -374,7 +375,11 @@ export function ItemPerformanceEvent({
                                                 <BodyDisplay
                                                     content={item.request_body}
                                                     headers={item.request_headers}
-                                                    emptyMessage="No request body captured"
+                                                    emptyMessage={
+                                                        item.is_initial
+                                                            ? 'Request captured before PostHog was initialized'
+                                                            : 'No request body captured'
+                                                    }
                                                 />
                                             ),
                                         },
@@ -386,7 +391,11 @@ export function ItemPerformanceEvent({
                                                       <BodyDisplay
                                                           content={item.response_body}
                                                           headers={item.response_headers}
-                                                          emptyMessage="No response body captured"
+                                                          emptyMessage={
+                                                              item.is_initial
+                                                                  ? 'Response captured before PostHog was initialized'
+                                                                  : 'No response body captured'
+                                                          }
                                                       />
                                                   ),
                                               }
@@ -424,7 +433,7 @@ export function ItemPerformanceEvent({
     )
 }
 
-function BodyDisplay({
+export function BodyDisplay({
     content,
     headers,
     emptyMessage,
@@ -454,23 +463,26 @@ function BodyDisplay({
     )
 }
 
-function HeadersDisplay({
+export function HeadersDisplay({
     request,
     response,
+    isInitial,
 }: {
     request: Record<string, string> | undefined
     response: Record<string, string> | undefined
+    isInitial?: boolean
 }): JSX.Element | null {
+    const emptyMessage = isInitial ? 'captured before PostHog was initialized' : 'No headers captured'
     return (
         <div className="flex flex-col w-full">
             <div>
                 <h4 className="font-semibold">Request Headers</h4>
-                <SimpleKeyValueList item={request || {}} emptyMessage="No headers captured" />
+                <SimpleKeyValueList item={request || {}} emptyMessage={emptyMessage} />
             </div>
             <LemonDivider dashed />
             <div>
                 <h4 className="font-semibold">Response Headers</h4>
-                <SimpleKeyValueList item={response || {}} emptyMessage="No headers captured" />
+                <SimpleKeyValueList item={response || {}} emptyMessage={emptyMessage} />
             </div>
         </div>
     )
diff --git a/frontend/src/scenes/session-recordings/player/playlist-popover/PlaylistPopover.tsx b/frontend/src/scenes/session-recordings/player/playlist-popover/PlaylistPopover.tsx
index 1d19209eabcfc..fef33b2967cae 100644
--- a/frontend/src/scenes/session-recordings/player/playlist-popover/PlaylistPopover.tsx
+++ b/frontend/src/scenes/session-recordings/player/playlist-popover/PlaylistPopover.tsx
@@ -1,9 +1,9 @@
 import { LemonCheckbox, LemonDivider } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { IconOpenInNew, IconPlus, IconWithCount } from 'lib/lemon-ui/icons'
 import { LemonButton, LemonButtonProps } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { Popover } from 'lib/lemon-ui/Popover'
@@ -46,9 +46,9 @@ export function PlaylistPopoverButton(props: LemonButtonProps): JSX.Element {
                                     enableFormOnSubmit
                                     className="space-y-1"
                                 >
-                                    <Field name="name">
+                                    <LemonField name="name">
                                         <LemonInput placeholder="Playlist name" fullWidth />
-                                    </Field>
+                                    </LemonField>
                                     <div className="flex items-center gap-2 justify-end">
                                         <LemonButton
                                             type="secondary"
diff --git a/frontend/src/scenes/session-recordings/player/share/PlayerShare.tsx b/frontend/src/scenes/session-recordings/player/share/PlayerShare.tsx
index e0a02e72fb626..7b2cdbd7a7479 100644
--- a/frontend/src/scenes/session-recordings/player/share/PlayerShare.tsx
+++ b/frontend/src/scenes/session-recordings/player/share/PlayerShare.tsx
@@ -4,9 +4,9 @@ import clsx from 'clsx'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { SharingModalContent } from 'lib/components/Sharing/SharingModal'
-import { Field } from 'lib/forms/Field'
 import { IconCopy } from 'lib/lemon-ui/icons'
 import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { copyToClipboard } from 'lib/utils/copyToClipboard'
 
 import { playerShareLogic, PlayerShareLogicProps } from './playerShareLogic'
@@ -37,10 +37,10 @@ export function PlayerShareRecording(props: PlayerShareLogicProps): JSX.Element
 
             <Form logic={playerShareLogic} props={props} formKey="shareUrl">
                 <div className="flex gap-2 items-center">
-                    <Field name="includeTime">
+                    <LemonField name="includeTime">
                         <LemonCheckbox label="Start at" />
-                    </Field>
-                    <Field name="time" inline>
+                    </LemonField>
+                    <LemonField name="time" inline>
                         <LemonInput
                             className={clsx('w-20', { 'opacity-50': !shareUrl.includeTime })}
                             placeholder="00:00"
@@ -49,7 +49,7 @@ export function PlayerShareRecording(props: PlayerShareLogicProps): JSX.Element
                             fullWidth={false}
                             size="small"
                         />
-                    </Field>
+                    </LemonField>
                 </div>
             </Form>
 
diff --git a/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.scss b/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.scss
index f0a6e629424ea..d2fcab212dbcb 100644
--- a/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.scss
+++ b/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.scss
@@ -22,9 +22,7 @@
         overflow: hidden;
 
         .text-link {
-            .posthog-3000 & {
-                color: var(--default);
-            }
+            color: var(--default);
         }
     }
 
@@ -56,12 +54,8 @@
 
 .SessionRecordingPlaylistHeightWrapper {
     // NOTE: Somewhat random way to offset the various headers and tabs above the playlist
-    height: calc(100vh - 15rem);
+    height: calc(100vh - 9rem);
     min-height: 41rem;
-
-    .posthog-3000 & {
-        height: calc(100vh - 9rem);
-    }
 }
 
 .SessionRecordingPreview {
diff --git a/frontend/src/scenes/settings/Settings.scss b/frontend/src/scenes/settings/Settings.scss
index 37b8f3daf2e94..b749083d2ca68 100644
--- a/frontend/src/scenes/settings/Settings.scss
+++ b/frontend/src/scenes/settings/Settings.scss
@@ -2,20 +2,16 @@
     display: flex;
     gap: 2rem;
     align-items: start;
-    margin-top: 1rem;
+    margin-top: 0;
 
     .Settings__sections {
         position: sticky;
-        top: 0.5rem;
+        top: 4rem;
         flex-shrink: 0;
         width: 20%;
         min-width: 14rem;
         max-width: 20rem;
 
-        .posthog-3000 & {
-            top: 4rem;
-        }
-
         .SidePanel3000 & {
             top: 0;
         }
@@ -33,7 +29,6 @@
         }
     }
 
-    .posthog-3000 &,
     .LemonModal & {
         margin-top: 0;
     }
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
index 770b125d6f861..651e1a3aa2585 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
@@ -2,9 +2,9 @@ import { Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Form } from 'kea-forms'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
-import { Field } from 'lib/forms/Field'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { LemonTextArea } from 'lib/lemon-ui/LemonTextArea/LemonTextArea'
@@ -37,28 +37,28 @@ export function ConfigureSAMLModal(): JSX.Element {
                             Read the docs
                         </Link>
                     </p>
-                    <Field label="ACS Consumer URL" name="_ACSConsumerUrl">
+                    <LemonField label="ACS Consumer URL" name="_ACSConsumerUrl">
                         <CopyToClipboardInline>{`${siteUrl}/complete/saml/`}</CopyToClipboardInline>
-                    </Field>
-                    <Field label="RelayState" name="_RelayState">
+                    </LemonField>
+                    <LemonField label="RelayState" name="_RelayState">
                         <CopyToClipboardInline>{configureSAMLModalId || 'unknown'}</CopyToClipboardInline>
-                    </Field>
-                    <Field label="Audience / Entity ID" name="_Audience">
+                    </LemonField>
+                    <LemonField label="Audience / Entity ID" name="_Audience">
                         <CopyToClipboardInline>{siteUrl}</CopyToClipboardInline>
-                    </Field>
-                    <Field name="saml_acs_url" label="SAML ACS URL">
+                    </LemonField>
+                    <LemonField name="saml_acs_url" label="SAML ACS URL">
                         <LemonInput className="ph-ignore-input" placeholder="Your IdP's ACS or single sign-on URL." />
-                    </Field>
-                    <Field name="saml_entity_id" label="SAML Entity ID">
+                    </LemonField>
+                    <LemonField name="saml_entity_id" label="SAML Entity ID">
                         <LemonInput className="ph-ignore-input" placeholder="Entity ID provided by your IdP." />
-                    </Field>
-                    <Field name="saml_x509_cert" label="SAML X.509 Certificate">
+                    </LemonField>
+                    <LemonField name="saml_x509_cert" label="SAML X.509 Certificate">
                         <LemonTextArea
                             className="ph-ignore-input"
                             minRows={10}
                             placeholder={`Enter the public certificate of your IdP. Keep all line breaks.\n-----BEGIN CERTIFICATE-----\nMIICVjCCAb+gAwIBAgIBADANBgkqhkiG9w0BAQ0FADBIMQswCQYDVQQGEwJ1czEL\n-----END CERTIFICATE-----`}
                         />
-                    </Field>
+                    </LemonField>
                     {!samlReady && (
                         <LemonBanner type="info">
                             SAML will not be enabled unless you enter all attributes above. However you can still
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx
index bf38e5d9133ad..6b502f4c402bc 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifyDomainModal.tsx
@@ -1,7 +1,7 @@
 import { useActions, useValues } from 'kea'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
-import { PureField } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 
@@ -40,14 +40,14 @@ export function VerifyDomainModal(): JSX.Element {
                     <li>
                         Add the following <b>TXT</b> record.
                         <div className="my-4 space-y-2">
-                            <PureField label="Name">
+                            <LemonField.Pure label="Name">
                                 <div className="flex items-center gap-2">
                                     <div className="border rounded p-2 h-10 flex-1">{challengeName}</div>
                                     <CopyToClipboardInline explicitValue={challengeName} selectable={true} />
                                 </div>
-                            </PureField>
+                            </LemonField.Pure>
 
-                            <PureField label="Value or content">
+                            <LemonField.Pure label="Value or content">
                                 <div className="flex items-center gap-2">
                                     <div className="border rounded p-2 h-10 flex-1">
                                         {domainBeingVerified?.verification_challenge}
@@ -59,13 +59,13 @@ export function VerifyDomainModal(): JSX.Element {
                                         />
                                     )}
                                 </div>
-                            </PureField>
-                            <PureField label="TTL">
+                            </LemonField.Pure>
+                            <LemonField.Pure label="TTL">
                                 <div className="flex items-center gap-2">
                                     <div className="border rounded p-2 h-10 flex-1">Default or 3600</div>
                                     <CopyToClipboardInline explicitValue="3600" selectable={true} />
                                 </div>
-                            </PureField>
+                            </LemonField.Pure>
                         </div>
                     </li>
                     <li>Press verify below.</li>
diff --git a/frontend/src/scenes/settings/project/AddMembersModal.tsx b/frontend/src/scenes/settings/project/AddMembersModal.tsx
index 51febcc209c0f..b94bae43d7b9b 100644
--- a/frontend/src/scenes/settings/project/AddMembersModal.tsx
+++ b/frontend/src/scenes/settings/project/AddMembersModal.tsx
@@ -4,8 +4,8 @@ import { Form } from 'kea-forms'
 import { RestrictedComponentProps } from 'lib/components/RestrictedArea'
 import { usersLemonSelectOptions } from 'lib/components/UserSelectItem'
 import { TeamMembershipLevel } from 'lib/constants'
-import { Field } from 'lib/forms/Field'
 import { IconPlus } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonSelectMultiple } from 'lib/lemon-ui/LemonSelectMultiple/LemonSelectMultiple'
 import { membershipLevelToName, teamMembershipLevelIntegers } from 'lib/utils/permissioning'
 import { useState } from 'react'
@@ -42,7 +42,7 @@ export function AddMembersModalWithButton({ isRestricted }: RestrictedComponentP
                         <h3>{`Adding members${currentTeam?.name ? ` to project ${currentTeam.name}` : ''}`}</h3>
                     </LemonModal.Header>
                     <LemonModal.Content className="space-y-2">
-                        <Field name="userUuids">
+                        <LemonField name="userUuids">
                             <LemonSelectMultiple
                                 mode="multiple"
                                 placeholder="Organization members"
@@ -52,8 +52,8 @@ export function AddMembersModalWithButton({ isRestricted }: RestrictedComponentP
                                     'uuid'
                                 )}
                             />
-                        </Field>
-                        <Field name="level" label="With project-specific access level">
+                        </LemonField>
+                        <LemonField name="level" label="With project-specific access level">
                             <LemonSelect
                                 fullWidth
                                 options={teamMembershipLevelIntegers.map(
@@ -64,7 +64,7 @@ export function AddMembersModalWithButton({ isRestricted }: RestrictedComponentP
                                         } as LemonSelectOption<TeamMembershipLevel>)
                                 )}
                             />
-                        </Field>
+                        </LemonField>
                     </LemonModal.Content>
                     <LemonModal.Footer>
                         <LemonButton type="secondary" onClick={closeModal}>
diff --git a/frontend/src/scenes/settings/user/ChangePassword.tsx b/frontend/src/scenes/settings/user/ChangePassword.tsx
index 1e284f1696316..42549b954407c 100644
--- a/frontend/src/scenes/settings/user/ChangePassword.tsx
+++ b/frontend/src/scenes/settings/user/ChangePassword.tsx
@@ -2,7 +2,7 @@ import { LemonButton, LemonInput } from '@posthog/lemon-ui'
 import { useValues } from 'kea'
 import { Form } from 'kea-forms'
 import PasswordStrength from 'lib/components/PasswordStrength'
-import { Field } from 'lib/forms/Field'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 import { changePasswordLogic } from './changePasswordLogic'
 
@@ -11,16 +11,16 @@ export function ChangePassword(): JSX.Element {
 
     return (
         <Form logic={changePasswordLogic} formKey="changePassword" enableFormOnSubmit className="space-y-4 max-w-160">
-            <Field name="current_password" label="Current Password">
+            <LemonField name="current_password" label="Current Password">
                 <LemonInput
                     autoComplete="current-password"
                     type="password"
                     className="ph-ignore-input"
                     placeholder="••••••••••"
                 />
-            </Field>
+            </LemonField>
 
-            <Field
+            <LemonField
                 name="password"
                 label={
                     <div className="flex flex-1 items-center justify-between">
@@ -37,7 +37,7 @@ export function ChangePassword(): JSX.Element {
                     className="ph-ignore-input"
                     placeholder="••••••••••"
                 />
-            </Field>
+            </LemonField>
 
             <LemonButton type="primary" htmlType="submit" loading={isChangePasswordSubmitting}>
                 Change password
diff --git a/frontend/src/scenes/settings/user/UserDetails.tsx b/frontend/src/scenes/settings/user/UserDetails.tsx
index 0ad4587948d61..587b54161b91d 100644
--- a/frontend/src/scenes/settings/user/UserDetails.tsx
+++ b/frontend/src/scenes/settings/user/UserDetails.tsx
@@ -1,8 +1,8 @@
 import { LemonTag } from '@posthog/lemon-ui'
 import { useValues } from 'kea'
 import { Form } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { userLogic } from 'scenes/userLogic'
 
@@ -19,23 +19,23 @@ export function UserDetails(): JSX.Element {
                 maxWidth: '28rem',
             }}
         >
-            <Field name="first_name" label="Your name">
+            <LemonField name="first_name" label="Your name">
                 <LemonInput
                     className="ph-ignore-input"
                     data-attr="settings-update-first-name"
                     placeholder="Jane Doe"
                     disabled={userLoading}
                 />
-            </Field>
+            </LemonField>
 
-            <Field name="email" label="Your email">
+            <LemonField name="email" label="Your email">
                 <LemonInput
                     className="ph-ignore-input"
                     data-attr="settings-update-email"
                     placeholder="email@yourcompany.com"
                     disabled={userLoading}
                 />
-            </Field>
+            </LemonField>
             {user?.pending_email && <LemonTag type="highlight">Pending verification for {user.pending_email}</LemonTag>}
 
             <LemonButton
diff --git a/frontend/src/scenes/surveys/SurveyEdit.tsx b/frontend/src/scenes/surveys/SurveyEdit.tsx
index 7fca119b469bf..a7fda625ac48c 100644
--- a/frontend/src/scenes/surveys/SurveyEdit.tsx
+++ b/frontend/src/scenes/surveys/SurveyEdit.tsx
@@ -16,8 +16,8 @@ import {
 import { BindLogic, useActions, useValues } from 'kea'
 import { FlagSelector } from 'lib/components/FlagSelector'
 import { FEATURE_FLAGS } from 'lib/constants'
-import { Field, PureField } from 'lib/forms/Field'
 import { IconCancel, IconDelete, IconLock, IconPlus } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 import { featureFlagLogic as enabledFeaturesLogic } from 'lib/logic/featureFlagLogic'
 import { featureFlagLogic } from 'scenes/feature-flags/featureFlagLogic'
 import { FeatureFlagReleaseConditions } from 'scenes/feature-flags/FeatureFlagReleaseConditions'
@@ -66,12 +66,12 @@ export default function SurveyEdit(): JSX.Element {
     return (
         <div className="flex flex-row gap-4">
             <div className="flex flex-col gap-2 flex-1 SurveyForm">
-                <Field name="name" label="Name">
+                <LemonField name="name" label="Name">
                     <LemonInput data-attr="survey-name" />
-                </Field>
-                <Field name="description" label="Description (optional)">
+                </LemonField>
+                <LemonField name="description" label="Description (optional)">
                     <LemonTextArea data-attr="survey-description" minRows={2} />
-                </Field>
+                </LemonField>
                 <LemonCollapse
                     activeKey={selectedSection || undefined}
                     onChange={(section) => {
@@ -82,7 +82,7 @@ export default function SurveyEdit(): JSX.Element {
                             key: SurveyEditSection.Presentation,
                             header: 'Presentation',
                             content: (
-                                <Field name="type">
+                                <LemonField name="type">
                                     {({ onChange, value }) => {
                                         return (
                                             <div className="flex gap-4">
@@ -146,7 +146,7 @@ export default function SurveyEdit(): JSX.Element {
                                             </div>
                                         )
                                     }}
-                                </Field>
+                                </LemonField>
                             ),
                         },
                         {
@@ -201,7 +201,7 @@ export default function SurveyEdit(): JSX.Element {
                                                             ),
                                                         })
                                                     ),
-                                                    ...(survey.appearance.displayThankYouMessage
+                                                    ...(survey.appearance?.displayThankYouMessage
                                                         ? [
                                                               {
                                                                   key: survey.questions.length,
@@ -227,7 +227,7 @@ export default function SurveyEdit(): JSX.Element {
                                                                   ),
                                                                   content: (
                                                                       <>
-                                                                          <PureField label="Thank you header">
+                                                                          <LemonField.Pure label="Thank you header">
                                                                               <LemonInput
                                                                                   value={
                                                                                       survey.appearance
@@ -241,8 +241,8 @@ export default function SurveyEdit(): JSX.Element {
                                                                                   }
                                                                                   placeholder="ex: Thank you for your feedback!"
                                                                               />
-                                                                          </PureField>
-                                                                          <PureField
+                                                                          </LemonField.Pure>
+                                                                          <LemonField.Pure
                                                                               label="Thank you description"
                                                                               className="mt-3"
                                                                           >
@@ -266,8 +266,8 @@ export default function SurveyEdit(): JSX.Element {
                                                                                   }
                                                                                   textPlaceholder="ex: We really appreciate it."
                                                                               />
-                                                                          </PureField>
-                                                                          <PureField className="mt-2">
+                                                                          </LemonField.Pure>
+                                                                          <LemonField.Pure className="mt-2">
                                                                               <LemonCheckbox
                                                                                   checked={
                                                                                       !!survey.appearance.autoDisappear
@@ -280,7 +280,7 @@ export default function SurveyEdit(): JSX.Element {
                                                                                       })
                                                                                   }
                                                                               />
-                                                                          </PureField>
+                                                                          </LemonField.Pure>
                                                                       </>
                                                                   ),
                                                               },
@@ -322,7 +322,7 @@ export default function SurveyEdit(): JSX.Element {
                                                 </Link>
                                             )}
                                         </div>
-                                        {!survey.appearance.displayThankYouMessage && (
+                                        {!survey.appearance?.displayThankYouMessage && (
                                             <LemonButton
                                                 type="secondary"
                                                 className="w-max mt-2"
@@ -348,7 +348,7 @@ export default function SurveyEdit(): JSX.Element {
                                       key: SurveyEditSection.Customization,
                                       header: 'Customization',
                                       content: (
-                                          <Field name="appearance" label="">
+                                          <LemonField name="appearance" label="">
                                               {({ value, onChange }) => (
                                                   <>
                                                       {survey.type === SurveyType.Widget && (
@@ -375,7 +375,7 @@ export default function SurveyEdit(): JSX.Element {
                                                       />
                                                   </>
                                               )}
-                                          </Field>
+                                          </LemonField>
                                       ),
                                   },
                               ]
@@ -384,7 +384,7 @@ export default function SurveyEdit(): JSX.Element {
                             key: SurveyEditSection.Targeting,
                             header: 'Targeting',
                             content: (
-                                <PureField>
+                                <LemonField.Pure>
                                     <LemonSelect
                                         onChange={(value) => {
                                             if (value) {
@@ -408,7 +408,7 @@ export default function SurveyEdit(): JSX.Element {
                                         </span>
                                     ) : (
                                         <>
-                                            <Field
+                                            <LemonField
                                                 name="linked_flag_id"
                                                 label="Link feature flag (optional)"
                                                 info={
@@ -432,11 +432,11 @@ export default function SurveyEdit(): JSX.Element {
                                                         )}
                                                     </div>
                                                 )}
-                                            </Field>
-                                            <Field name="conditions">
+                                            </LemonField>
+                                            <LemonField name="conditions">
                                                 {({ value, onChange }) => (
                                                     <>
-                                                        <PureField
+                                                        <LemonField.Pure
                                                             label="URL targeting"
                                                             error={urlMatchTypeValidationError}
                                                             info="Targeting by regex or exact match requires at least version 1.82 of posthog-js"
@@ -471,8 +471,8 @@ export default function SurveyEdit(): JSX.Element {
                                                                     fullWidth
                                                                 />
                                                             </div>
-                                                        </PureField>
-                                                        <PureField label="CSS selector matches:">
+                                                        </LemonField.Pure>
+                                                        <LemonField.Pure label="CSS selector matches:">
                                                             <LemonInput
                                                                 value={value?.selector}
                                                                 onChange={(selectorVal) =>
@@ -480,8 +480,8 @@ export default function SurveyEdit(): JSX.Element {
                                                                 }
                                                                 placeholder="ex: .className or #id"
                                                             />
-                                                        </PureField>
-                                                        <PureField label="Survey wait period">
+                                                        </LemonField.Pure>
+                                                        <LemonField.Pure label="Survey wait period">
                                                             <div className="flex flex-row gap-2 items-center">
                                                                 <LemonCheckbox
                                                                     checked={!!value?.seenSurveyWaitPeriodInDays}
@@ -521,11 +521,11 @@ export default function SurveyEdit(): JSX.Element {
                                                                 />{' '}
                                                                 days.
                                                             </div>
-                                                        </PureField>
+                                                        </LemonField.Pure>
                                                     </>
                                                 )}
-                                            </Field>
-                                            <PureField label="User properties">
+                                            </LemonField>
+                                            <LemonField.Pure label="User properties">
                                                 <BindLogic
                                                     logic={featureFlagLogic}
                                                     props={{ id: survey.targeting_flag?.id || 'new' }}
@@ -562,10 +562,10 @@ export default function SurveyEdit(): JSX.Element {
                                                         </>
                                                     )}
                                                 </BindLogic>
-                                            </PureField>
+                                            </LemonField.Pure>
                                         </>
                                     )}
-                                </PureField>
+                                </LemonField.Pure>
                             ),
                         },
                     ]}
diff --git a/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx b/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
index d3420e1a81749..bb6482e18598b 100644
--- a/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
+++ b/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
@@ -6,8 +6,8 @@ import { CSS } from '@dnd-kit/utilities'
 import { LemonButton, LemonCheckbox, LemonInput, LemonSelect } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { Group } from 'kea-forms'
-import { Field } from 'lib/forms/Field'
 import { IconDelete, IconPlusMini, SortableDragIcon } from 'lib/lemon-ui/icons'
+import { LemonField } from 'lib/lemon-ui/LemonField'
 
 import { Survey, SurveyQuestionType } from '~/types'
 
@@ -88,7 +88,7 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
     return (
         <Group name={`questions.${index}`} key={index}>
             <div className="flex flex-col gap-2">
-                <Field name="type" label="Question type" className="max-w-60">
+                <LemonField name="type" label="Question type" className="max-w-60">
                     <LemonSelect
                         data-attr={`survey-question-type-${index}`}
                         onSelect={(newType) => {
@@ -216,11 +216,11 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
                             ],
                         ]}
                     />
-                </Field>
-                <Field name="question" label="Label">
+                </LemonField>
+                <LemonField name="question" label="Label">
                     <LemonInput value={question.question} />
-                </Field>
-                <Field name="description" label="Description (optional)">
+                </LemonField>
+                <LemonField name="description" label="Description (optional)">
                     {({ value, onChange }) => (
                         <HTMLEditor
                             value={value}
@@ -229,21 +229,21 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
                             setWritingHTMLDescription={setWritingHTMLDescription}
                         />
                     )}
-                </Field>
+                </LemonField>
                 {survey.questions.length > 1 && (
-                    <Field name="optional" className="my-2">
+                    <LemonField name="optional" className="my-2">
                         <LemonCheckbox label="Optional" checked={!!question.optional} />
-                    </Field>
+                    </LemonField>
                 )}
                 {question.type === SurveyQuestionType.Link && (
-                    <Field name="link" label="Link" info="Make sure to include https:// in the url.">
+                    <LemonField name="link" label="Link" info="Make sure to include https:// in the url.">
                         <LemonInput value={question.link || ''} placeholder="https://posthog.com" />
-                    </Field>
+                    </LemonField>
                 )}
                 {question.type === SurveyQuestionType.Rating && (
                     <div className="flex flex-col gap-2">
                         <div className="flex flex-row gap-4">
-                            <Field name="display" label="Display type" className="w-1/2">
+                            <LemonField name="display" label="Display type" className="w-1/2">
                                 <LemonSelect
                                     options={[
                                         { label: 'Number', value: 'number' },
@@ -256,8 +256,8 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
                                         setSurveyValue('questions', newQuestions)
                                     }}
                                 />
-                            </Field>
-                            <Field name="scale" label="Scale" className="w-1/2">
+                            </LemonField>
+                            <LemonField name="scale" label="Scale" className="w-1/2">
                                 <LemonSelect
                                     options={[
                                         ...(question.display === 'emoji' ? [{ label: '1 - 3', value: 3 }] : []),
@@ -268,24 +268,24 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
                                         ...(question.display === 'number' ? [{ label: '0 - 10', value: 10 }] : []),
                                     ]}
                                 />
-                            </Field>
+                            </LemonField>
                         </div>
                         <div className="flex flex-row gap-4">
-                            <Field name="lowerBoundLabel" label="Lower bound label" className="w-1/2">
+                            <LemonField name="lowerBoundLabel" label="Lower bound label" className="w-1/2">
                                 <LemonInput value={question.lowerBoundLabel || ''} />
-                            </Field>
-                            <Field name="upperBoundLabel" label="Upper bound label" className="w-1/2">
+                            </LemonField>
+                            <LemonField name="upperBoundLabel" label="Upper bound label" className="w-1/2">
                                 <LemonInput value={question.upperBoundLabel || ''} />
-                            </Field>
+                            </LemonField>
                         </div>
                     </div>
                 )}
                 {(question.type === SurveyQuestionType.SingleChoice ||
                     question.type === SurveyQuestionType.MultipleChoice) && (
                     <div className="flex flex-col gap-2">
-                        <Field name="hasOpenChoice">
+                        <LemonField name="hasOpenChoice">
                             {({ value: hasOpenChoice, onChange: toggleHasOpenChoice }) => (
-                                <Field name="choices" label="Choices">
+                                <LemonField name="choices" label="Choices">
                                     {({ value, onChange }) => (
                                         <div className="flex flex-col gap-2">
                                             {(value || []).map((choice: string, index: number) => {
@@ -366,18 +366,18 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
                                             </div>
                                         </div>
                                     )}
-                                </Field>
+                                </LemonField>
                             )}
-                        </Field>
+                        </LemonField>
                     </div>
                 )}
-                <Field name="buttonText" label="Button text">
+                <LemonField name="buttonText" label="Button text">
                     <LemonInput
                         value={
                             question.buttonText === undefined ? survey.appearance.submitButtonText : question.buttonText
                         }
                     />
-                </Field>
+                </LemonField>
             </div>
         </Group>
     )
diff --git a/frontend/src/scenes/surveys/SurveyFormAppearance.tsx b/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
index 1adb3c8474978..020e5cfc1a469 100644
--- a/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
+++ b/frontend/src/scenes/surveys/SurveyFormAppearance.tsx
@@ -19,7 +19,7 @@ export function SurveyFormAppearance({
     setActivePreview,
     isEditingSurvey,
 }: SurveyFormAppearanceProps): JSX.Element {
-    const showThankYou = survey.appearance.displayThankYouMessage && activePreview >= survey.questions.length
+    const showThankYou = survey.appearance?.displayThankYouMessage && activePreview >= survey.questions.length
 
     return survey.type !== SurveyType.API ? (
         <>
@@ -48,7 +48,7 @@ export function SurveyFormAppearance({
                         label: `${index + 1}. ${question.question ?? ''}`,
                         value: index,
                     })),
-                    ...(survey.appearance.displayThankYouMessage
+                    ...(survey.appearance?.displayThankYouMessage
                         ? [
                               {
                                   label: `${survey.questions.length + 1}. Confirmation message`,
diff --git a/frontend/src/scenes/teamActivityDescriber.tsx b/frontend/src/scenes/teamActivityDescriber.tsx
new file mode 100644
index 0000000000000..a58fd574c3ebd
--- /dev/null
+++ b/frontend/src/scenes/teamActivityDescriber.tsx
@@ -0,0 +1,236 @@
+import {
+    ActivityChange,
+    ActivityLogItem,
+    ChangeMapping,
+    defaultDescriber,
+    Description,
+    HumanizedChange,
+    userNameForLogItem,
+} from 'lib/components/ActivityLog/humanizeActivity'
+import { SentenceList } from 'lib/components/ActivityLog/SentenceList'
+import { Link } from 'lib/lemon-ui/Link'
+import { pluralize } from 'lib/utils'
+import { urls } from 'scenes/urls'
+
+import { ActivityScope, TeamType } from '~/types'
+
+const teamActionsMapping: Record<
+    keyof TeamType,
+    (change?: ActivityChange, logItem?: ActivityLogItem) => ChangeMapping | null
+> = {
+    // session replay
+    session_recording_minimum_duration_milliseconds: (change) => {
+        const after = change?.after
+        if (after === undefined || typeof after !== 'number') {
+            return null
+        }
+        let prefix = 'changed'
+        if (change?.action === 'created') {
+            prefix = 'set'
+        }
+        return {
+            description: [
+                <>
+                    {prefix} the minimum session recording duration to {after / 1000} seconds
+                </>,
+            ],
+        }
+    },
+    capture_console_log_opt_in(change: ActivityChange | undefined): ChangeMapping | null {
+        return { description: [<>{change?.after ? 'enabled' : 'disabled'} console log capture in session replay</>] }
+    },
+    capture_performance_opt_in(change: ActivityChange | undefined): ChangeMapping | null {
+        return {
+            description: [
+                <>{change?.after ? 'enabled' : 'disabled'} console network performance capture in session replay</>,
+            ],
+        }
+    },
+    recording_domains(change: ActivityChange | undefined): ChangeMapping | null {
+        const before: string[] | null = Array.isArray(change?.before) ? change!.before : null
+        const after: string[] | null = Array.isArray(change?.after) ? change!.after : null
+        if (after === null && before === null) {
+            return null
+        }
+
+        const descriptions = []
+
+        const adds: string[] = []
+        if (after) {
+            for (const domain of after) {
+                if ((!before || !before.includes(domain)) && domain.trim().length > 0) {
+                    adds.push(domain)
+                }
+            }
+        }
+        if (adds.length) {
+            descriptions.push(
+                <>
+                    added {adds.join(', ')} to session recording authorised{' '}
+                    {pluralize(adds.length, 'domain', 'domains', false)}
+                </>
+            )
+        }
+
+        const removes: string[] = []
+        if (before) {
+            for (const domain of before) {
+                if ((!after || !after.includes(domain)) && domain.trim().length > 0) {
+                    removes.push(domain)
+                }
+            }
+        }
+
+        if (removes.length) {
+            descriptions.push(
+                <>
+                    removed {removes.join(', ')} from session recording authorised{' '}
+                    {pluralize(removes.length, 'domain', 'domains', false)}
+                </>
+            )
+        }
+        return { description: descriptions }
+    },
+    session_recording_linked_flag(change: ActivityChange | undefined): ChangeMapping | null {
+        return {
+            description: [
+                <>
+                    {change?.after ? 'linked' : 'unlinked'} session recording to feature flag {change?.after}
+                </>,
+            ],
+        }
+    },
+    session_recording_network_payload_capture_config(change: ActivityChange | undefined): ChangeMapping | null {
+        return {
+            description: [<>{change?.after ? 'enabled' : 'disabled'} network payload capture in session replay</>],
+        }
+    },
+    session_recording_opt_in(change: ActivityChange | undefined): ChangeMapping | null {
+        return { description: [<>{change?.after ? 'enabled' : 'disabled'} session recording</>] }
+    },
+    session_recording_sample_rate(change: ActivityChange | undefined): ChangeMapping | null {
+        return {
+            description: [
+                <>
+                    {change?.action === 'created' ? 'set' : 'changed'} the session recording sample rate to{' '}
+                    {change?.after}%
+                </>,
+            ],
+        }
+    },
+    session_replay_config(_change: ActivityChange | undefined): ChangeMapping | null {
+        // TODO we'll eventually need a deeper mapping for this nested object
+        const recordCanvasAfter = typeof _change?.after === 'object' ? _change?.after?.record_canvas : null
+
+        if (recordCanvasAfter === null) {
+            return null
+        }
+        return { description: [<>{recordCanvasAfter ? 'enabled' : 'disabled'} canvas recording in session replay</>] }
+    },
+    // autocapture
+    autocapture_exceptions_errors_to_ignore: () => null,
+    autocapture_exceptions_opt_in: () => null,
+    autocapture_opt_out(change: ActivityChange | undefined): ChangeMapping | null {
+        return { description: [<>{change?.after ? 'enabled' : 'disabled'} autocapture</>] }
+    },
+    // and.... many more
+    name(change: ActivityChange | undefined): ChangeMapping | null {
+        return {
+            description: [
+                <>
+                    {change?.action === 'created' ? 'set' : 'changed'} the team name to {change?.after}
+                </>,
+            ],
+        }
+    },
+    // TODO if I had to test and describe every single one of this I'd never release this
+    // we can add descriptions here as the need arises
+    access_control: () => null,
+    anonymize_ips: () => null,
+    app_urls: () => null,
+    completed_snippet_onboarding: () => null,
+    correlation_config: () => null,
+    data_attributes: () => null,
+    effective_membership_level: () => null,
+    groups_on_events_querying_enabled: () => null,
+    has_group_types: () => null,
+    ingested_event: () => null,
+    is_demo: () => null,
+    live_events_columns: () => null,
+    organization: () => null,
+    path_cleaning_filters: () => null,
+    person_display_name_properties: () => null,
+    person_on_events_querying_enabled: () => null,
+    primary_dashboard: () => null,
+    slack_incoming_webhook: () => null,
+    test_account_filters: () => null,
+    test_account_filters_default_checked: () => null,
+    timezone: () => null,
+    surveys_opt_in: () => null,
+    week_start_day: () => null,
+    extra_settings: () => null,
+    has_completed_onboarding_for: () => null,
+    // should never come from the backend
+    created_at: () => null,
+    api_token: () => null,
+    id: () => null,
+    updated_at: () => null,
+    uuid: () => null,
+}
+
+function nameAndLink(logItem?: ActivityLogItem): JSX.Element {
+    return logItem?.detail?.short_id ? (
+        <Link to={urls.notebook(logItem.detail.short_id)}>{logItem?.detail.name || 'unknown'}</Link>
+    ) : logItem?.detail.name ? (
+        <>{logItem?.detail.name}</>
+    ) : (
+        <i>Untitled</i>
+    )
+}
+
+export function teamActivityDescriber(logItem: ActivityLogItem, asNotification?: boolean): HumanizedChange {
+    if (logItem.scope !== ActivityScope.TEAM) {
+        console.error('team describer received a non-Team activity')
+        return { description: null }
+    }
+
+    if (logItem.activity == 'changed' || logItem.activity == 'updated') {
+        let changes: Description[] = []
+        let changeSuffix: Description = <>on {nameAndLink(logItem)}</>
+
+        for (const change of logItem.detail.changes || []) {
+            if (!change?.field || !teamActionsMapping[change.field]) {
+                continue //  not all notebook fields are describable
+            }
+
+            const actionHandler = teamActionsMapping[change.field]
+            const processedChange = actionHandler(change, logItem)
+            if (processedChange === null) {
+                continue // // unexpected log from backend is indescribable
+            }
+
+            const { description, suffix } = processedChange
+            if (description) {
+                changes = changes.concat(description)
+            }
+
+            if (suffix) {
+                changeSuffix = suffix
+            }
+        }
+
+        if (changes.length) {
+            return {
+                description: (
+                    <SentenceList
+                        listParts={changes}
+                        prefix={<strong>{userNameForLogItem(logItem)}</strong>}
+                        suffix={changeSuffix}
+                    />
+                ),
+            }
+        }
+    }
+
+    return defaultDescriber(logItem, asNotification, nameAndLink(logItem))
+}
diff --git a/frontend/src/scenes/trends/persons-modal/PersonsModal.tsx b/frontend/src/scenes/trends/persons-modal/PersonsModal.tsx
index fc5a3ad72c8d9..0a75ea3075a97 100644
--- a/frontend/src/scenes/trends/persons-modal/PersonsModal.tsx
+++ b/frontend/src/scenes/trends/persons-modal/PersonsModal.tsx
@@ -126,7 +126,7 @@ export function PersonsModal({
                 <LemonModal.Header>
                     <h3>{getTitle()}</h3>
                 </LemonModal.Header>
-                <div className="px-6 py-2">
+                <div className="px-4 py-2">
                     {actorsResponse && !!missingActorsCount && (
                         <MissingPersonsAlert actorLabel={actorLabel} missingActorsCount={missingActorsCount} />
                     )}
@@ -194,7 +194,7 @@ export function PersonsModal({
                         )}
                     </div>
                 </div>
-                <div className="px-6 overflow-hidden flex flex-col">
+                <div className="px-4 overflow-hidden flex flex-col">
                     <div className="relative min-h-20 p-2 space-y-2 rounded bg-border-light overflow-y-auto mb-2">
                         {errorObject ? (
                             validationError ? (
diff --git a/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx b/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
index af2fb58303e3b..ba777d979da5d 100644
--- a/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
+++ b/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
@@ -14,9 +14,9 @@ export const WebAnalyticsNotice = (): JSX.Element => {
     return (
         <LemonBanner type="info" className="my-4">
             <div className="flex items-center flex-wrap gap-2 justify-between">
-                <span className="flex-1">
+                <div className="flex-1 min-w-full sm:min-w-0">
                     PostHog Web Analytics is in opt-in Beta. Thanks for taking part! We'd love to hear what you think.
-                </span>
+                </div>
                 {showSupportOptions ? (
                     <span className="flex items-center gap-2">
                         <LemonButton
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
index fea26dcf8fa8e..7a6dcd00332c2 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
@@ -402,7 +402,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                     date_from: dateFrom,
                     date_to: dateTo,
                 }
-                const compare = !!(dateRange.date_from && dateRange.date_to)
+                const compare = !!dateRange.date_from && dateRange.date_from !== 'all'
 
                 const sampling = {
                     enabled: !!values.featureFlags[FEATURE_FLAGS.WEB_ANALYTICS_SAMPLING],
@@ -428,6 +428,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                             properties: webAnalyticsFilters,
                             dateRange,
                             sampling,
+                            compare,
                         },
                         insightProps: createInsightProps(TileId.OVERVIEW),
                         canOpenModal: false,
diff --git a/frontend/src/styles/global.scss b/frontend/src/styles/global.scss
index 2140b3aad166d..80ad3b4e660e5 100644
--- a/frontend/src/styles/global.scss
+++ b/frontend/src/styles/global.scss
@@ -53,16 +53,12 @@ input[type='radio'] {
     gap: 0.5rem 1rem;
     align-items: center;
     min-height: 2.5rem;
-    margin: 1.25rem 0 0.25rem;
+    margin: 1rem 0 0.25rem;
 
     .ant-form-item {
         margin-bottom: 0 !important;
     }
 
-    .posthog-3000 & {
-        margin-top: 1rem;
-    }
-
     @include screen($md) {
         flex-wrap: nowrap;
     }
@@ -177,14 +173,10 @@ input::-ms-clear {
     font-family: var(--font-sans);
     font-size: 1rem;
     cursor: unset;
-    border: 1px solid var(--border);
+    border: 1px solid var(--secondary-3000-button-border);
     border-radius: var(--radius);
     box-shadow: var(--shadow-elevation);
     opacity: 1 !important;
-
-    .posthog-3000 & {
-        border-color: var(--secondary-3000-button-border);
-    }
 }
 
 .Toastify__toast-container {
@@ -481,6 +473,9 @@ body {
     --link: var(--primary-3000);
     --tooltip-bg: var(--bg-charcoal);
     --data-color-1-hover: #1d4affe5;
+    --shadow-elevation: var(--shadow-elevation-3000);
+    --primary: var(--primary-3000);
+    --primary-highlight: var(--primary-3000-highlight);
 
     // Remove below once we're using Tailwind's base
     --tw-ring-offset-width: 0px;
@@ -496,69 +491,50 @@ body {
     --tw-scale-y: 1;
 
     touch-action: manipulation; // Disable double-tap-to-zoom on mobile, making taps slightly snappier
+    background: var(--bg-3000);
 
     &.posthog-3000[theme='light'] {
         @include light-mode-3000-variables;
     }
 
     &.posthog-3000[theme='dark'] {
-        @include dark-mode-3000-variables;
-    }
-
-    &.posthog-3000 {
-        --shadow-elevation: var(--shadow-elevation-3000);
-        --primary: var(--primary-3000);
-        --primary-highlight: var(--primary-3000-highlight);
-
-        background: var(--bg-3000);
+        .ant-empty-img-simple-path {
+            fill: var(--border-3000);
+        }
 
-        .non-3000 {
-            // Helper to hide non-3000 elements without JS
-            display: none;
+        .ant-empty-img-simple-ellipse {
+            fill: var(--border-3000);
         }
 
-        .LemonButton,
-        .Link {
-            .text-link {
-                color: var(--text-3000);
-            }
+        @include dark-mode-3000-variables;
+    }
 
-            &:hover {
-                .text-link {
-                    color: var(--primary-3000);
-                }
-            }
+    * > {
+        ::-webkit-scrollbar {
+            width: 0.5rem;
+            height: 0.5rem;
         }
 
-        * > {
-            ::-webkit-scrollbar {
-                width: 0.5rem;
-                height: 0.5rem;
-            }
-
-            ::-webkit-scrollbar-track {
-                background: var(--accent-3000);
-            }
+        ::-webkit-scrollbar-track {
+            background: var(--accent-3000);
+        }
 
-            ::-webkit-scrollbar-thumb {
-                background: var(--trace-3000);
-                border-radius: var(--radius);
+        ::-webkit-scrollbar-thumb {
+            background: var(--trace-3000);
+            border-radius: var(--radius);
 
-                &:hover {
-                    background: var(--muted-3000);
-                }
+            &:hover {
+                background: var(--muted-3000);
             }
         }
+    }
 
-        h1,
-        h2,
-        h3,
-        h4,
-        h5 {
-            font-family: var(--font-title);
-        }
-
-        @include posthog-3000-variables;
+    h1,
+    h2,
+    h3,
+    h4,
+    h5 {
+        font-family: var(--font-title);
     }
 
     h1,
@@ -589,6 +565,19 @@ body {
         color: var(--link);
     }
 
+    .LemonButton,
+    .Link {
+        .text-link {
+            color: var(--text-3000);
+        }
+
+        &:hover {
+            .text-link {
+                color: var(--primary-3000);
+            }
+        }
+    }
+
     // AntD uses its own border color for the bottom of tab lists, but we want to use `var(--border)`
     .ant-tabs-top,
     .ant-tabs-bottom {
@@ -707,6 +696,8 @@ body {
     .ant-table-tbody > tr.ant-table-placeholder:hover > td {
         background: inherit;
     }
+
+    @include posthog-3000-variables;
 }
 
 .storybook-test-runner {
@@ -721,7 +712,7 @@ body {
     }
 
     // Hide some parts of the UI that were causing flakiness
-    ::-webkit-scrollbar, // Scrollbar in WebKit/Blink browsers
+    ::-webkit-scrollbar, * > ::-webkit-scrollbar, // Scrollbar in WebKit/Blink browsers
     .LemonTabs__bar::after, // Active tab slider
     .scrollable::after, // Scrollability indicators
     .scrollable::before {
@@ -729,21 +720,9 @@ body {
     }
 }
 
-.posthog-3000 {
-    .ant-radio-button-wrapper {
-        background: var(--secondary-3000);
-        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);
-    }
+.ant-radio-button-wrapper {
+    background: var(--secondary-3000);
+    border-color: transparent;
 }
 
 .ligatures-none {
diff --git a/frontend/src/styles/vars.scss b/frontend/src/styles/vars.scss
index 1a58abffe8e0e..b6994159c8e88 100644
--- a/frontend/src/styles/vars.scss
+++ b/frontend/src/styles/vars.scss
@@ -176,6 +176,7 @@ $_lifecycle_dormant: $_danger;
     --radius: 0.375rem;
     --radius-sm: 0.25rem;
     --shadow-elevation: 0px 16px 16px -16px rgb(0 0 0 / 35%);
+    --modal-shadow-elevation: 0px 16px 16px -16px rgb(0 0 0 / 35%);
     --opacity-disabled: 0.6;
     --font-medium: 500;
     --font-semibold: 600;
diff --git a/frontend/src/toolbar/elements/Elements.tsx b/frontend/src/toolbar/elements/Elements.tsx
index 904cd148e8ab8..0e8c0a278d67f 100644
--- a/frontend/src/toolbar/elements/Elements.tsx
+++ b/frontend/src/toolbar/elements/Elements.tsx
@@ -2,7 +2,7 @@ import './Elements.scss'
 
 import { useActions, useValues } from 'kea'
 import { compactNumber } from 'lib/utils'
-import React from 'react'
+import { Fragment } from 'react'
 
 import { ElementInfoWindow } from '~/toolbar/elements/ElementInfoWindow'
 import { elementsLogic } from '~/toolbar/elements/elementsLogic'
@@ -75,7 +75,7 @@ export function Elements(): JSX.Element {
 
                 {heatmapElements.map(({ rect, count, clickCount, rageclickCount, element }, index) => {
                     return (
-                        <React.Fragment key={`heatmap-${index}`}>
+                        <Fragment key={`heatmap-${index}`}>
                             <HeatmapElement
                                 rect={rect}
                                 style={{
@@ -155,7 +155,7 @@ export function Elements(): JSX.Element {
                                     {compactNumber(rageclickCount)}&#128545;
                                 </HeatmapLabel>
                             )}
-                        </React.Fragment>
+                        </Fragment>
                     )
                 })}
 
diff --git a/frontend/src/toolbar/utils.ts b/frontend/src/toolbar/utils.ts
index 8bb0562c04be8..368e569bb84b5 100644
--- a/frontend/src/toolbar/utils.ts
+++ b/frontend/src/toolbar/utils.ts
@@ -2,7 +2,6 @@ import { finder } from '@medv/finder'
 import { CLICK_TARGET_SELECTOR, CLICK_TARGETS, escapeRegex, TAGS_TO_IGNORE } from 'lib/actionUtils'
 import { cssEscape } from 'lib/utils/cssEscape'
 import { querySelectorAllDeep } from 'query-selector-shadow-dom'
-import wildcardMatch from 'wildcard-match'
 
 import { ActionStepForm, BoxColor, ElementRect } from '~/toolbar/types'
 import { ActionStepType, StringMatching } from '~/types'
@@ -43,9 +42,13 @@ export function elementToQuery(element: HTMLElement, dataAttributes: string[]):
 
     try {
         return finder(element, {
-            attr: (name) => dataAttributes.some((dataAttribute) => wildcardMatch(dataAttribute)(name)),
             tagName: (name) => !TAGS_TO_IGNORE.includes(name),
             seedMinLength: 5, // include several selectors e.g. prefer .project-homepage > .project-header > .project-title over .project-title
+            attr: (name) => {
+                // preference to data attributes if they exist
+                // that aren't in the PostHog preferred list - they were returned early above
+                return name.startsWith('data-')
+            },
         })
     } catch (error) {
         console.warn('Error while trying to find a selector for element', element, error)
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index df110eb9807ee..5b4a051c99edc 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -3364,6 +3364,7 @@ export enum ActivityScope {
     SURVEY = 'Survey',
     EARLY_ACCESS_FEATURE = 'EarlyAccessFeature',
     COMMENT = 'Comment',
+    TEAM = 'Team',
 }
 
 export type CommentType = {
diff --git a/mypy-baseline.txt b/mypy-baseline.txt
index 2fbd39073f37e..e78bd53d6029f 100644
--- a/mypy-baseline.txt
+++ b/mypy-baseline.txt
@@ -21,11 +21,17 @@ posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incomp
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "JoinConstraint | None"; expected "AST"  [arg-type]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "JoinExpr | None"; expected "AST"  [arg-type]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "JoinExpr | None"; expected "AST"  [arg-type]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "CTE")  [assignment]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "CTE")  [assignment]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "Expr | None"; expected "AST"  [arg-type]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "Expr | None"; expected "AST"  [arg-type]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "Expr | None"; expected "AST"  [arg-type]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "CTE")  [assignment]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "OrderExpr", variable has type "CTE")  [assignment]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "CTE")  [assignment]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "Expr | None"; expected "AST"  [arg-type]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "Expr | None"; expected "AST"  [arg-type]
+posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "WindowExpr", variable has type "CTE")  [assignment]
 posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "FieldAliasType", variable has type "BaseTableType | SelectUnionQueryType | SelectQueryType | SelectQueryAliasType")  [assignment]
 posthog/hogql/visitor.py:0: error: Incompatible types in assignment (expression has type "Type", variable has type "BaseTableType | SelectUnionQueryType | SelectQueryType | SelectQueryAliasType")  [assignment]
 posthog/hogql/visitor.py:0: error: Argument 1 to "visit" of "Visitor" has incompatible type "WindowFrameExpr | None"; expected "AST"  [arg-type]
@@ -301,8 +307,6 @@ posthog/hogql/transforms/in_cohort.py:0: error: Item "None" of "JoinConstraint |
 posthog/hogql/transforms/in_cohort.py:0: error: Item "Expr" of "Expr | Any" has no attribute "right"  [union-attr]
 posthog/hogql/transforms/in_cohort.py:0: error: List item 0 has incompatible type "SelectQueryType | None"; expected "SelectQueryType"  [list-item]
 posthog/hogql/transforms/in_cohort.py:0: error: List item 0 has incompatible type "SelectQueryType | None"; expected "SelectQueryType"  [list-item]
-posthog/api/organization.py:0: error: Metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases  [misc]
-posthog/api/organization.py:0: error: Metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases  [misc]
 posthog/hogql/printer.py:0: error: Argument 1 to "create_hogql_database" has incompatible type "int | None"; expected "int"  [arg-type]
 posthog/hogql/printer.py:0: error: List comprehension has incompatible type List[SelectQueryType | None]; expected List[SelectQueryType]  [misc]
 posthog/hogql/printer.py:0: error: Argument "stack" to "_Printer" has incompatible type "list[SelectQuery]"; expected "list[AST] | None"  [arg-type]
@@ -333,6 +337,8 @@ posthog/hogql/printer.py:0: error: Non-overlapping equality check (left operand
 posthog/hogql/printer.py:0: error: Argument 2 to "_get_materialized_column" of "_Printer" has incompatible type "str | int"; expected "str"  [arg-type]
 posthog/hogql/printer.py:0: error: Statement is unreachable  [unreachable]
 posthog/hogql/printer.py:0: error: Argument 1 to "_print_identifier" of "_Printer" has incompatible type "str | None"; expected "str"  [arg-type]
+posthog/api/organization.py:0: error: Metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases  [misc]
+posthog/api/organization.py:0: error: Metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases  [misc]
 posthog/hogql/hogql.py:0: error: Item "None" of "JoinExpr | None" has no attribute "alias"  [union-attr]
 posthog/api/team.py:0: error: Metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases  [misc]
 posthog/models/property/util.py:0: error: Argument 3 to "format_filter_query" has incompatible type "HogQLContext | None"; expected "HogQLContext"  [arg-type]
@@ -358,11 +364,10 @@ posthog/hogql/query.py:0: error: Incompatible types in assignment (expression ha
 posthog/hogql/query.py:0: error: Argument 1 to "get_default_limit_for_context" has incompatible type "LimitContext | None"; expected "LimitContext"  [arg-type]
 posthog/hogql/query.py:0: error: "SelectQuery" has no attribute "select_queries"  [attr-defined]
 posthog/hogql/query.py:0: error: Subclass of "SelectQuery" and "SelectUnionQuery" cannot exist: would have incompatible method signatures  [unreachable]
+posthog/hogql/autocomplete.py:0: error: Unused "type: ignore" comment  [unused-ignore]
+posthog/hogql/autocomplete.py:0: error: Unused "type: ignore" comment  [unused-ignore]
 posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Item "SelectUnionQuery" of "SelectQuery | SelectUnionQuery" has no attribute "select"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Value of type "list[Any] | None" is not indexable  [index]
-posthog/hogql_queries/insights/funnels/base.py:0: error: Incompatible types in assignment (expression has type "FunnelExclusionEventsNode | FunnelExclusionActionsNode", variable has type "EventsNode | ActionsNode")  [assignment]
-posthog/hogql_queries/insights/funnels/base.py:0: error: Item "EventsNode" of "EventsNode | ActionsNode" has no attribute "funnelFromStep"  [union-attr]
-posthog/hogql_queries/insights/funnels/base.py:0: error: Item "ActionsNode" of "EventsNode | ActionsNode" has no attribute "funnelFromStep"  [union-attr]
 posthog/hogql_queries/sessions_timeline_query_runner.py:0: error: Statement is unreachable  [unreachable]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_histogram_bin_count"  [union-attr]
@@ -397,6 +402,9 @@ posthog/hogql_queries/events_query_runner.py:0: error: Statement is unreachable
 posthog/hogql/metadata.py:0: error: Argument "metadata_source" to "translate_hogql" has incompatible type "SelectQuery | SelectUnionQuery"; expected "SelectQuery | None"  [arg-type]
 posthog/hogql/metadata.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "SelectQuery | SelectUnionQuery")  [assignment]
 posthog/queries/breakdown_props.py:0: error: Argument 1 to "translate_hogql" has incompatible type "str | int"; expected "str"  [arg-type]
+posthog/hogql_queries/insights/funnels/base.py:0: error: Incompatible types in assignment (expression has type "FunnelExclusionEventsNode | FunnelExclusionActionsNode", variable has type "EventsNode | ActionsNode")  [assignment]
+posthog/hogql_queries/insights/funnels/base.py:0: error: Item "EventsNode" of "EventsNode | ActionsNode" has no attribute "funnelFromStep"  [union-attr]
+posthog/hogql_queries/insights/funnels/base.py:0: error: Item "ActionsNode" of "EventsNode | ActionsNode" has no attribute "funnelFromStep"  [union-attr]
 posthog/queries/funnels/base.py:0: error: "HogQLContext" has no attribute "person_on_events_mode"  [attr-defined]
 posthog/queries/funnels/base.py:0: error: Argument 1 to "translate_hogql" has incompatible type "str | int"; expected "str"  [arg-type]
 ee/clickhouse/queries/funnels/funnel_correlation.py:0: error: Statement is unreachable  [unreachable]
@@ -582,10 +590,6 @@ posthog/hogql_queries/insights/test/test_paginators.py:0: error: Argument 2 to "
 posthog/hogql_queries/insights/test/test_paginators.py:0: error: Value of type "object" is not indexable  [index]
 posthog/hogql_queries/insights/test/test_paginators.py:0: error: Value of type "object" is not indexable  [index]
 posthog/hogql_queries/insights/test/test_paginators.py:0: error: Value of type "object" is not indexable  [index]
-posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "Expr" of "Expr | None" has no attribute "exprs"  [union-attr]
-posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "None" of "Expr | None" has no attribute "exprs"  [union-attr]
-posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "Expr" of "Expr | None" has no attribute "exprs"  [union-attr]
-posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "None" of "Expr | None" has no attribute "exprs"  [union-attr]
 posthog/hogql/test/test_timings.py:0: error: No overload variant of "__setitem__" of "list" matches argument types "int", "float"  [call-overload]
 posthog/hogql/test/test_timings.py:0: note: Possible overload variants:
 posthog/hogql/test/test_timings.py:0: note: def __setitem__(self, SupportsIndex, int, /) -> None
@@ -817,70 +821,12 @@ posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py:0:
 posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py:0: error: Need type annotation for "_execute_async_calls" (hint: "_execute_async_calls: List[<type>] = ...")  [var-annotated]
 posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py:0: error: Need type annotation for "_cursors" (hint: "_cursors: List[<type>] = ...")  [var-annotated]
 posthog/temporal/tests/batch_exports/test_snowflake_batch_export_workflow.py:0: error: List item 0 has incompatible type "tuple[str, str, int, int, int, int, str, int]"; expected "tuple[str, str, int, int, str, str, str, str]"  [list-item]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 4 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "int"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "str | None"  [arg-type]
-posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: Argument 5 to "S3InsertInputs" has incompatible type "**dict[str, object]"; expected "list[str] | None"  [arg-type]
 posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: "tuple[Any, ...]" has no attribute "last_uploaded_part_timestamp"  [attr-defined]
 posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: "tuple[Any, ...]" has no attribute "upload_state"  [attr-defined]
 posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py:0: error: "tuple[Any, ...]" has no attribute "upload_state"  [attr-defined]
 posthog/temporal/tests/batch_exports/test_backfill_batch_export.py:0: error: Argument "name" to "acreate_batch_export" has incompatible type "object"; expected "str"  [arg-type]
 posthog/temporal/tests/batch_exports/test_backfill_batch_export.py:0: error: Argument "destination_data" to "acreate_batch_export" has incompatible type "object"; expected "dict[Any, Any]"  [arg-type]
 posthog/temporal/tests/batch_exports/test_backfill_batch_export.py:0: error: Argument "interval" to "acreate_batch_export" has incompatible type "object"; expected "str"  [arg-type]
-posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py:0: error: Unsupported left operand type for + ("None")  [operator]
-posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py:0: note: Left operand is of type "Any | None"
 posthog/temporal/tests/batch_exports/test_redshift_batch_export_workflow.py:0: error: Incompatible types in assignment (expression has type "str | int", variable has type "int")  [assignment]
 posthog/api/test/batch_exports/conftest.py:0: error: Argument "activities" to "ThreadedWorker" has incompatible type "list[function]"; expected "Sequence[Callable[..., Any]]"  [arg-type]
 posthog/management/commands/test/test_create_batch_export_from_app.py:0: error: Incompatible return value type (got "dict[str, Collection[str]]", expected "dict[str, str]")  [return-value]
diff --git a/package.json b/package.json
index 81b3c304e8d12..f8a661280fd52 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "@dnd-kit/utilities": "^3.2.1",
         "@floating-ui/react": "^0.16.0",
         "@lottiefiles/react-lottie-player": "^3.4.7",
-        "@medv/finder": "^2.1.0",
+        "@medv/finder": "^3.1.0",
         "@microlink/react-json-view": "^1.21.3",
         "@monaco-editor/react": "4.4.6",
         "@posthog/icons": "0.5.1",
@@ -141,7 +141,7 @@
         "pmtiles": "^2.11.0",
         "postcss": "^8.4.31",
         "postcss-preset-env": "^9.3.0",
-        "posthog-js": "1.105.6",
+        "posthog-js": "1.105.9",
         "posthog-js-lite": "2.5.0",
         "prettier": "^2.8.8",
         "prop-types": "^15.7.2",
@@ -173,7 +173,6 @@
         "tailwindcss": "^3.4.0",
         "use-debounce": "^9.0.3",
         "use-resize-observer": "^8.0.0",
-        "wildcard-match": "^5.1.2",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
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 9ef2888d431ea..9d7665bc60262 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,5 @@
 import { captureException } from '@sentry/node'
+import crypto from 'crypto'
 import { mkdirSync, rmSync } from 'node:fs'
 import { CODES, features, KafkaConsumer, librdkafkaVersion, Message, TopicPartition } from 'node-rdkafka'
 import { Counter, Gauge, Histogram } from 'prom-client'
@@ -149,14 +150,18 @@ export class SessionRecordingIngester {
 
         this.realtimeManager = new RealtimeManager(this.redisPool, this.config)
 
+        // We create a hash of the cluster to use as a unique identifier for the high water marks
+        // This enables us to swap clusters without having to worry about resetting the high water marks
+        const kafkaClusterIdentifier = crypto.createHash('md5').update(this.config.KAFKA_HOSTS).digest('hex')
+
         this.sessionHighWaterMarker = new OffsetHighWaterMarker(
             this.redisPool,
-            this.config.SESSION_RECORDING_REDIS_PREFIX
+            this.config.SESSION_RECORDING_REDIS_PREFIX + `kafka-${kafkaClusterIdentifier}/`
         )
 
         this.persistentHighWaterMarker = new OffsetHighWaterMarker(
             this.redisPool,
-            this.config.SESSION_RECORDING_REDIS_PREFIX + 'persistent/'
+            this.config.SESSION_RECORDING_REDIS_PREFIX + `kafka-${kafkaClusterIdentifier}/persistent/`
         )
 
         // NOTE: This is the only place where we need to use the shared server config
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 467a2cbe6da89..e780b94196750 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
@@ -145,6 +145,7 @@ describe('ingester', () => {
     it('can parse debug partition config', () => {
         const config = {
             SESSION_RECORDING_DEBUG_PARTITION: '103',
+            KAFKA_HOSTS: 'localhost:9092',
         } satisfies Partial<PluginsServerConfig> as PluginsServerConfig
 
         const ingester = new SessionRecordingIngester(config, hub.postgres, hub.objectStorage)
@@ -152,7 +153,9 @@ describe('ingester', () => {
     })
 
     it('can parse absence of debug partition config', () => {
-        const config = {} satisfies Partial<PluginsServerConfig> as PluginsServerConfig
+        const config = {
+            KAFKA_HOSTS: 'localhost:9092',
+        } satisfies Partial<PluginsServerConfig> as PluginsServerConfig
 
         const ingester = new SessionRecordingIngester(config, hub.postgres, hub.objectStorage)
         expect(ingester['debugPartition']).toBeUndefined()
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2d020524d3ae4..82ca93b26ba64 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,8 +35,8 @@ dependencies:
     specifier: ^3.4.7
     version: 3.4.7(react@18.2.0)
   '@medv/finder':
-    specifier: ^2.1.0
-    version: 2.1.0
+    specifier: ^3.1.0
+    version: 3.1.0
   '@microlink/react-json-view':
     specifier: ^1.21.3
     version: 1.22.2(@types/react@17.0.52)(react-dom@18.2.0)(react@18.2.0)
@@ -245,8 +245,8 @@ dependencies:
     specifier: ^9.3.0
     version: 9.3.0(postcss@8.4.31)
   posthog-js:
-    specifier: 1.105.6
-    version: 1.105.6
+    specifier: 1.105.9
+    version: 1.105.9
   posthog-js-lite:
     specifier: 2.5.0
     version: 2.5.0
@@ -340,9 +340,6 @@ dependencies:
   use-resize-observer:
     specifier: ^8.0.0
     version: 8.0.0(react-dom@18.2.0)(react@18.2.0)
-  wildcard-match:
-    specifier: ^5.1.2
-    version: 5.1.2
   zxcvbn:
     specifier: ^4.4.2
     version: 4.4.2
@@ -667,7 +664,7 @@ devDependencies:
     version: 7.6.4
   storybook-addon-pseudo-states:
     specifier: 2.1.2
-    version: 2.1.2(@storybook/components@7.6.4)(@storybook/core-events@7.6.4)(@storybook/manager-api@7.6.13)(@storybook/preview-api@7.6.13)(@storybook/theming@7.6.4)(react-dom@18.2.0)(react@18.2.0)
+    version: 2.1.2(@storybook/components@7.6.4)(@storybook/core-events@7.6.4)(@storybook/manager-api@7.6.15)(@storybook/preview-api@7.6.15)(@storybook/theming@7.6.4)(react-dom@18.2.0)(react@18.2.0)
   style-loader:
     specifier: ^2.0.0
     version: 2.0.0(webpack@5.88.2)
@@ -4921,8 +4918,8 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@medv/finder@2.1.0:
-    resolution: {integrity: sha512-Egrg5XO4kLol24b1Kv50HDfi5hW0yQ6aWSsO0Hea1eJ4rogKElIN0M86FdVnGF4XIGYyA7QWx0MgbOzVPA0qkA==}
+  /@medv/finder@3.1.0:
+    resolution: {integrity: sha512-ojkXjR3K0Zz3jnCR80tqPL+0yvbZk/lEodb6RIVjLz7W8RVA2wrw8ym/CzCpXO9SYVUIKHFUpc7jvf8UKfIM3w==}
     dev: false
 
   /@microlink/react-json-view@1.22.2(@types/react@17.0.52)(react-dom@18.2.0)(react@18.2.0):
@@ -6189,11 +6186,11 @@ packages:
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/channels@7.6.13:
-    resolution: {integrity: sha512-AiplFJXPjgHA62xqZFq7SwCS+o8bFrYLPM9I8yNY+8jhAi9N3Yig+h2P0jOXxLKicwrCXa5ZJ7PZK05M1r6YqA==}
+  /@storybook/channels@7.6.15:
+    resolution: {integrity: sha512-UPDYRzGkygYFa8QUpEiumWrvZm4u4RKVzgiBt9C4RmHORqkkZzL9LXhaZJp2SmIz1ND5gx6KR5ze8ZnAdwxxoQ==}
     dependencies:
-      '@storybook/client-logger': 7.6.13
-      '@storybook/core-events': 7.6.13
+      '@storybook/client-logger': 7.6.15
+      '@storybook/core-events': 7.6.15
       '@storybook/global': 5.0.0
       qs: 6.11.2
       telejson: 7.2.0
@@ -6280,8 +6277,8 @@ packages:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/client-logger@7.6.13:
-    resolution: {integrity: sha512-uo51MsUG1Fbi1IA+me9tewF1mFiaYuyR0IMeBmaU3Z3CtjEUdOekmvRQ9ckoFn+BbKtxSipTodiR4HmIZDta3g==}
+  /@storybook/client-logger@7.6.15:
+    resolution: {integrity: sha512-n+K8IqnombqiQNnywVovS+lK61tvv/XSfgPt0cgvoF/hJZB0VDOMRjWsV+v9qQpj1TQEl1lLWeJwZMthTWupJA==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
@@ -6417,8 +6414,8 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/core-events@7.6.13:
-    resolution: {integrity: sha512-hsL6JT273b1RcJBGHpNNLJ1ilzFMT4UCJwwtOpNNQVPBJt0Hn22vxC69/hpqSINrhHRLj3ak8CTtA0ynVjngaQ==}
+  /@storybook/core-events@7.6.15:
+    resolution: {integrity: sha512-i4YnjGecbpGyrFe0340sPhQ9QjZZEBqvMy6kF4XWt6DYLHxZmsTj1HEdvxVl4Ej7V49Vw0Dm8MepJ1d4Y8MKrQ==}
     dependencies:
       ts-dedent: 2.2.0
     dev: true
@@ -6575,17 +6572,17 @@ packages:
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
     dev: true
 
-  /@storybook/manager-api@7.6.13(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-D23lbJSmJnVGHwXzKEw3TeUbPZMDP03R5Pp4S73fWHHhSBqjadcGCGRxiFWOyCyGXi4kUg1q4TYSIMw0pHvnlg==}
+  /@storybook/manager-api@7.6.15(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-cPBsXcnJiaO3QyaEum2JgdihYea3cI03FeV35JdrBYLIelT4oqbYFnzjznsFg9+Ia9iAbz7aOBNyyRsWnC/UKw==}
     dependencies:
-      '@storybook/channels': 7.6.13
-      '@storybook/client-logger': 7.6.13
-      '@storybook/core-events': 7.6.13
+      '@storybook/channels': 7.6.15
+      '@storybook/client-logger': 7.6.15
+      '@storybook/core-events': 7.6.15
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.6.13
-      '@storybook/theming': 7.6.13(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.13
+      '@storybook/router': 7.6.15
+      '@storybook/theming': 7.6.15(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.15
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -6690,15 +6687,15 @@ packages:
       - webpack-plugin-serve
     dev: true
 
-  /@storybook/preview-api@7.6.13:
-    resolution: {integrity: sha512-BbRlVpxgOXSe4/hpf9cRtbvvCJoRrFbjMCnmaDh+krd8O4wLbVknKhqgSR46qLyW/VGud9Rb3upakz7tNP+mtg==}
+  /@storybook/preview-api@7.6.15:
+    resolution: {integrity: sha512-2KN9vlizF6sFlYsJEGnFqcQaJXs4TTdawC1VazVdtaMSHANDxxDu8F1cP+u7lpPH3DkNZUmTGQDBYfYY9xR0eQ==}
     dependencies:
-      '@storybook/channels': 7.6.13
-      '@storybook/client-logger': 7.6.13
-      '@storybook/core-events': 7.6.13
+      '@storybook/channels': 7.6.15
+      '@storybook/client-logger': 7.6.15
+      '@storybook/core-events': 7.6.15
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.6.13
+      '@storybook/types': 7.6.15
       '@types/qs': 6.9.11
       dequal: 2.0.3
       lodash: 4.17.21
@@ -6858,10 +6855,10 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/router@7.6.13:
-    resolution: {integrity: sha512-PE912SaViaq3SlheKMz0IW+/MIUmQpxf77YUOb3ZlMvu2KVhdZFsi9xC/3ym67nuVuF1yLELpz4Q/G1Jxlh/sg==}
+  /@storybook/router@7.6.15:
+    resolution: {integrity: sha512-5yhXXoVZ1iKUgeZoO8PGqBclrLgoJisxIYVK/Y1iJMXZ2ZvwUiTswLALT6lu97tSrcoBVxmqSghg0+U0YEU4Fg==}
     dependencies:
-      '@storybook/client-logger': 7.6.13
+      '@storybook/client-logger': 7.6.15
       memoizerific: 1.11.3
       qs: 6.11.2
     dev: true
@@ -6944,14 +6941,14 @@ packages:
       - ts-node
     dev: true
 
-  /@storybook/theming@7.6.13(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Dj+zVF2CVdTrynjSW3Iydajc8EKCQCYNYA3bpkid0LltAIe8mLTkuTBYiI5CgviWmQc55iBrNpF2MA5AzW5Q3Q==}
+  /@storybook/theming@7.6.15(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-9PpsHAbUf6o0w33/P3mnb7QheTmfGlTYCismj5HMM1O2/zY0kQK9XcG9W+Cyvu56D/lFC19fz9YHQY8W4AbfnQ==}
     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.6.13
+      '@storybook/client-logger': 7.6.15
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       react: 18.2.0
@@ -6981,10 +6978,10 @@ packages:
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/types@7.6.13:
-    resolution: {integrity: sha512-N8HfqhL5uaI69BZx+xLkKi1YIgDp34XeL3uhxii4NfThcY1KJA643Gqk3oLKefiBqBpIRGKN0nA41Fhdvhr7Hw==}
+  /@storybook/types@7.6.15:
+    resolution: {integrity: sha512-tLH0lK6SXECSfMpKin9bge+7XiHZII17n6jc9ZI1TfSBZJyq3M6VzWh2r1C2lC97FlkcKXjIwM3n8h1xNjnI+A==}
     dependencies:
-      '@storybook/channels': 7.6.13
+      '@storybook/channels': 7.6.15
       '@types/babel__core': 7.20.5
       '@types/express': 4.17.21
       file-system-cache: 2.3.0
@@ -17302,8 +17299,8 @@ packages:
     resolution: {integrity: sha512-Urvlp0Vu9h3td0BVFWt0QXFJDoOZcaAD83XM9d91NKMKTVPZtfU0ysoxstIf5mw/ce9ZfuMgpWPaagrZI4rmSg==}
     dev: false
 
-  /posthog-js@1.105.6:
-    resolution: {integrity: sha512-5ITXsh29XIuNohHLy21nawGnfFZDpyt+yfnWge9sJl5yv0nNuoUmLiDgw1tJafoqGrfd5CUasKyzSI21HxsSeQ==}
+  /posthog-js@1.105.9:
+    resolution: {integrity: sha512-i9DnfyXDktugF5E9x0ejihQ8Xdh1kdVnVh7GdL7+PvFtULGMoN/b4pDmWBCwmH+ciubmqTCImVuNrZYy8+eTbw==}
     dependencies:
       fflate: 0.4.8
       preact: 10.19.4
@@ -19660,7 +19657,7 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook-addon-pseudo-states@2.1.2(@storybook/components@7.6.4)(@storybook/core-events@7.6.4)(@storybook/manager-api@7.6.13)(@storybook/preview-api@7.6.13)(@storybook/theming@7.6.4)(react-dom@18.2.0)(react@18.2.0):
+  /storybook-addon-pseudo-states@2.1.2(@storybook/components@7.6.4)(@storybook/core-events@7.6.4)(@storybook/manager-api@7.6.15)(@storybook/preview-api@7.6.15)(@storybook/theming@7.6.4)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-AHv6q1JiQEUnMyZE3729iV6cNmBW7bueeytc4Lga4+8W1En8YNea5VjqAdrDNJhXVU0QEEIGtxkD3EoC9aVWLw==}
     peerDependencies:
       '@storybook/components': ^7.4.6
@@ -19678,8 +19675,8 @@ packages:
     dependencies:
       '@storybook/components': 7.6.4(@types/react-dom@18.2.14)(@types/react@17.0.52)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events': 7.6.4
-      '@storybook/manager-api': 7.6.13(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 7.6.13
+      '@storybook/manager-api': 7.6.15(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.6.15
       '@storybook/theming': 7.6.4(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -21383,10 +21380,6 @@ packages:
       isexe: 2.0.0
     dev: true
 
-  /wildcard-match@5.1.2:
-    resolution: {integrity: sha512-qNXwI591Z88c8bWxp+yjV60Ch4F8Riawe3iGxbzquhy8Xs9m+0+SLFBGb/0yCTIDElawtaImC37fYZ+dr32KqQ==}
-    dev: false
-
   /wildcard@2.0.0:
     resolution: {integrity: sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==}
     dev: true
diff --git a/posthog/api/__init__.py b/posthog/api/__init__.py
index 0953bb915a35c..5bf0e339080e2 100644
--- a/posthog/api/__init__.py
+++ b/posthog/api/__init__.py
@@ -31,7 +31,6 @@
     personal_api_key,
     plugin,
     plugin_log_entry,
-    prompt,
     property_definition,
     query,
     search,
@@ -64,7 +63,6 @@ def api_not_found(request):
 router.register(r"plugin_config", plugin.LegacyPluginConfigViewSet, "legacy_plugin_configs")
 
 router.register(r"feature_flag", feature_flag.LegacyFeatureFlagViewSet)  # Used for library side feature flag evaluation
-router.register(r"prompts", prompt.PromptSequenceViewSet, "user_prompts")  # User prompts
 
 # Nested endpoints shared
 projects_router = router.register(r"projects", team.TeamViewSet)
diff --git a/posthog/api/action.py b/posthog/api/action.py
index c68796013af63..bcda749bc61d5 100644
--- a/posthog/api/action.py
+++ b/posthog/api/action.py
@@ -3,19 +3,16 @@
 from dateutil.relativedelta import relativedelta
 from django.db.models import Count, Prefetch
 from django.utils.timezone import now
-from rest_framework import authentication, request, serializers, viewsets
+from rest_framework import request, serializers, viewsets
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework_csv import renderers as csvrenderers
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.utils import get_target_entity
 from posthog.auth import (
-    JwtAuthentication,
-    PersonalAPIKeyAuthentication,
     TemporaryTokenAuthentication,
 )
 from posthog.client import sync_execute
@@ -24,9 +21,6 @@
 from posthog.hogql.hogql import HogQLContext
 from posthog.models import Action, ActionStep, Filter, Person
 from posthog.models.action.util import format_action_filter
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from posthog.queries.trends.trends_actors import TrendsActors
 
 from .forbid_destroy_model import ForbidDestroyModel
@@ -175,21 +169,14 @@ def update(self, instance: Any, validated_data: Dict[str, Any]) -> Any:
 
 class ActionViewSet(
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     ForbidDestroyModel,
     viewsets.ModelViewSet,
 ):
     renderer_classes = tuple(api_settings.DEFAULT_RENDERER_CLASSES) + (csvrenderers.PaginatedCSVRenderer,)
     queryset = Action.objects.all()
     serializer_class = ActionSerializer
-    authentication_classes = [
-        TemporaryTokenAuthentication,
-        JwtAuthentication,
-        PersonalAPIKeyAuthentication,
-        authentication.SessionAuthentication,
-        authentication.BasicAuthentication,
-    ]
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
+    authentication_classes = [TemporaryTokenAuthentication]
     ordering = ["-last_calculated_at", "name"]
 
     def get_queryset(self):
diff --git a/posthog/api/activity_log.py b/posthog/api/activity_log.py
index 5408b0b6fbfc2..fcfe14fee754a 100644
--- a/posthog/api/activity_log.py
+++ b/posthog/api/activity_log.py
@@ -9,7 +9,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.models import ActivityLog, FeatureFlag, Insight, NotificationViewed, User
 from posthog.models.comment import Comment
@@ -71,14 +71,13 @@ def get_all_timings(cls):
         return cls.timings_dict
 
 
-class ActivityLogViewSet(StructuredViewSetMixin, viewsets.GenericViewSet, mixins.ListModelMixin):
+class ActivityLogViewSet(TeamAndOrgViewSetMixin, viewsets.GenericViewSet, mixins.ListModelMixin):
     queryset = ActivityLog.objects.all()
     serializer_class = ActivityLogSerializer
     pagination_class = ActivityLogPagination
 
     def filter_queryset_by_parents_lookups(self, queryset) -> QuerySet:
-        team = self.team
-        return queryset.filter(Q(organization_id=team.organization_id) | Q(team_id=team.id))
+        return queryset.filter(team_id=self.team.id)
 
     def get_queryset(self) -> QuerySet:
         queryset = super().get_queryset()
diff --git a/posthog/api/annotation.py b/posthog/api/annotation.py
index 300e75de73e11..c98a13cefd0f7 100644
--- a/posthog/api/annotation.py
+++ b/posthog/api/annotation.py
@@ -4,16 +4,12 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from rest_framework import filters, serializers, viewsets, pagination
-from rest_framework.permissions import IsAuthenticated
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.event_usage import report_user_action
 from posthog.models import Annotation
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 
 
 class AnnotationSerializer(serializers.ModelSerializer):
@@ -64,14 +60,13 @@ class AnnotationsLimitOffsetPagination(pagination.LimitOffsetPagination):
     default_limit = 1000
 
 
-class AnnotationsViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class AnnotationsViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     """
     Create, Read, Update and Delete annotations. [See docs](https://posthog.com/docs/user-guides/annotations) for more information on annotations.
     """
 
     queryset = Annotation.objects.select_related("dashboard_item")
     serializer_class = AnnotationSerializer
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     filter_backends = [filters.SearchFilter]
     pagination_class = AnnotationsLimitOffsetPagination
     search_fields = ["content"]
diff --git a/posthog/api/app_metrics.py b/posthog/api/app_metrics.py
index a92cc6a6efbd2..b91de61540535 100644
--- a/posthog/api/app_metrics.py
+++ b/posthog/api/app_metrics.py
@@ -4,7 +4,7 @@
 from rest_framework import mixins, request, response, viewsets
 from rest_framework.decorators import action
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models.plugin import PluginConfig
 from posthog.queries.app_metrics.app_metrics import (
     AppMetricsErrorDetailsQuery,
@@ -21,7 +21,7 @@
 )
 
 
-class AppMetricsViewSet(StructuredViewSetMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+class AppMetricsViewSet(TeamAndOrgViewSetMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet):
     queryset = PluginConfig.objects.all()
 
     def retrieve(self, request: request.Request, *args: Any, **kwargs: Any) -> response.Response:
@@ -75,7 +75,7 @@ def error_details(self, request: request.Request, *args: Any, **kwargs: Any) ->
 
 
 class HistoricalExportsAppMetricsViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.RetrieveModelMixin,
     viewsets.ViewSet,
diff --git a/posthog/api/async_migration.py b/posthog/api/async_migration.py
index 5892151ca98a3..11a8daaf96a01 100644
--- a/posthog/api/async_migration.py
+++ b/posthog/api/async_migration.py
@@ -1,9 +1,8 @@
 import structlog
-from rest_framework import permissions, response, serializers, viewsets
+from rest_framework import response, serializers, viewsets
 from rest_framework.decorators import action
 from semantic_version.base import Version
 
-from posthog.api.routing import StructuredViewSetMixin
 from posthog.async_migrations.runner import (
     MAX_CONCURRENT_ASYNC_MIGRATIONS,
     is_posthog_version_compatible,
@@ -23,6 +22,7 @@
 )
 from posthog.models.instance_setting import get_instance_setting
 from posthog.permissions import IsStaffUser
+from rest_framework.permissions import IsAuthenticated
 
 logger = structlog.get_logger(__name__)
 
@@ -96,9 +96,9 @@ def get_is_available(self, async_migration: AsyncMigration):
         )
 
 
-class AsyncMigrationsViewset(StructuredViewSetMixin, viewsets.ModelViewSet):
+class AsyncMigrationsViewset(viewsets.ModelViewSet):
     queryset = AsyncMigration.objects.all().order_by("name")
-    permission_classes = [permissions.IsAuthenticated, IsStaffUser]
+    permission_classes = [IsAuthenticated, IsStaffUser]
     serializer_class = AsyncMigrationSerializer
     include_in_docs = False
 
diff --git a/posthog/api/cohort.py b/posthog/api/cohort.py
index 8be3c0e528cce..86abf8c4f37a0 100644
--- a/posthog/api/cohort.py
+++ b/posthog/api/cohort.py
@@ -27,7 +27,6 @@
 from rest_framework import serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
@@ -36,7 +35,7 @@
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
 from posthog.api.person import get_funnel_actor_class
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.utils import get_target_entity
 from posthog.client import sync_execute
@@ -65,7 +64,6 @@
     INSERT_COHORT_ALL_PEOPLE_THROUGH_PERSON_ID,
     PERSON_STATIC_COHORT_TABLE,
 )
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.queries.actor_base_query import (
     ActorBaseQuery,
     get_people,
@@ -284,10 +282,9 @@ def to_representation(self, instance):
         return representation
 
 
-class CohortViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class CohortViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     queryset = Cohort.objects.all()
     serializer_class = CohortSerializer
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
 
     def get_queryset(self) -> QuerySet:
         queryset = super().get_queryset()
@@ -436,7 +433,7 @@ def persons(self, request: Request, **kwargs) -> Response:
 
 
 class LegacyCohortViewSet(CohortViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
 
 
 def will_create_loops(cohort: Cohort) -> bool:
diff --git a/posthog/api/comments.py b/posthog/api/comments.py
index 9b8a4f280142c..977dfdd9101cf 100644
--- a/posthog/api/comments.py
+++ b/posthog/api/comments.py
@@ -9,7 +9,7 @@
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.models.comment import Comment
 
@@ -64,7 +64,7 @@ class CommentPagination(pagination.CursorPagination):
     page_size = 100
 
 
-class CommentViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class CommentViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     queryset = Comment.objects.all()
     serializer_class = CommentSerializer
     pagination_class = CommentPagination
diff --git a/posthog/api/dashboards/dashboard.py b/posthog/api/dashboards/dashboard.py
index 4101ce3559d7f..70b4b9c6a60ca 100644
--- a/posthog/api/dashboards/dashboard.py
+++ b/posthog/api/dashboards/dashboard.py
@@ -9,7 +9,7 @@
 from rest_framework import exceptions, serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.utils.serializer_helpers import ReturnDict
@@ -19,7 +19,7 @@
 )
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
 from posthog.api.insight import InsightSerializer, InsightViewSet
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.tagged_item import TaggedItemSerializerMixin, TaggedItemViewSetMixin
 from posthog.constants import AvailableFeature
@@ -31,7 +31,6 @@
 from posthog.models.tagged_item import TaggedItem
 from posthog.models.team.team import check_is_feature_available_for_team
 from posthog.models.user import User
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.user_permissions import UserPermissionsSerializerMixin
 
 logger = structlog.get_logger(__name__)
@@ -404,16 +403,12 @@ def _update_creation_mode(self, validated_data, use_template: str, use_dashboard
 
 class DashboardsViewSet(
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     ForbidDestroyModel,
     viewsets.ModelViewSet,
 ):
     queryset = Dashboard.objects.order_by("name")
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-        CanEditDashboard,
-    ]
+    permission_classes = [CanEditDashboard]
 
     def get_serializer_class(self) -> Type[BaseSerializer]:
         return DashboardBasicSerializer if self.action == "list" else DashboardSerializer
@@ -522,7 +517,7 @@ def create_from_template_json(self, request: Request, *args: Any, **kwargs: Any)
 
 
 class LegacyDashboardsViewSet(DashboardsViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
 
     def get_parents_query_dict(self) -> Dict[str, Any]:
         if not self.request.user.is_authenticated or "share_token" in self.request.GET:
@@ -531,4 +526,4 @@ def get_parents_query_dict(self) -> Dict[str, Any]:
 
 
 class LegacyInsightViewSet(InsightViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/dashboards/dashboard_templates.py b/posthog/api/dashboards/dashboard_templates.py
index 70f8985e41cc4..330fb10565171 100644
--- a/posthog/api/dashboards/dashboard_templates.py
+++ b/posthog/api/dashboards/dashboard_templates.py
@@ -9,13 +9,12 @@
 from rest_framework import request, response, serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models.dashboard_templates import DashboardTemplate
-from posthog.permissions import TeamMemberAccessPermission
 
 logger = structlog.get_logger(__name__)
 
@@ -70,12 +69,8 @@ def update(self, instance: DashboardTemplate, validated_data: Dict, *args, **kwa
         return super().update(instance, validated_data, *args, **kwargs)
 
 
-class DashboardTemplateViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-        OnlyStaffCanEditDashboardTemplate,
-    ]
+class DashboardTemplateViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+    permission_classes = [OnlyStaffCanEditDashboardTemplate]
     serializer_class = DashboardTemplateSerializer
 
     @method_decorator(cache_page(60 * 2))  # cache for 2 minutes
diff --git a/posthog/api/data_management.py b/posthog/api/data_management.py
index 186f2f83021f7..b2782a985ab1c 100644
--- a/posthog/api/data_management.py
+++ b/posthog/api/data_management.py
@@ -1,7 +1,7 @@
 from rest_framework import viewsets
 from rest_framework.decorators import action
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models.activity_logging.activity_page import activity_page_response
 from posthog.models.activity_logging.activity_log import (
     load_all_activity,
@@ -9,7 +9,7 @@
 from rest_framework import request
 
 
-class DataManagementViewSet(StructuredViewSetMixin, viewsets.GenericViewSet):
+class DataManagementViewSet(TeamAndOrgViewSetMixin, viewsets.GenericViewSet):
     @action(methods=["GET"], url_path="activity", detail=False)
     def all_activity(self, request: request.Request, **kwargs):
         limit = int(request.query_params.get("limit", "10"))
diff --git a/posthog/api/documentation.py b/posthog/api/documentation.py
index 8bb076235cdb3..b221fa18936c8 100644
--- a/posthog/api/documentation.py
+++ b/posthog/api/documentation.py
@@ -170,7 +170,10 @@ def preprocess_exclude_path_format(endpoints, **kwargs):
     """
     result = []
     for path, path_regex, method, callback in endpoints:
-        if hasattr(callback.cls, "legacy_team_compatibility") and callback.cls.legacy_team_compatibility:
+        if (
+            hasattr(callback.cls, "derive_current_team_from_user_only")
+            and callback.cls.derive_current_team_from_user_only
+        ):
             pass
         elif hasattr(callback.cls, "include_in_docs") and callback.cls.include_in_docs:
             path = path.replace("{parent_lookup_team_id}", "{project_id}")
diff --git a/posthog/api/early_access_feature.py b/posthog/api/early_access_feature.py
index 2827243b9029c..9886e2e534cac 100644
--- a/posthog/api/early_access_feature.py
+++ b/posthog/api/early_access_feature.py
@@ -3,21 +3,17 @@
 from django.http import JsonResponse
 from rest_framework.response import Response
 from posthog.api.feature_flag import FeatureFlagSerializer, MinimalFeatureFlagSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.utils import get_token
 from posthog.exceptions import generate_exception_response
 from posthog.models.early_access_feature import EarlyAccessFeature
 from rest_framework import serializers, viewsets
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework import status
 
 
 from posthog.models.feature_flag.feature_flag import FeatureFlag
 from posthog.models.team.team import Team
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from django.utils.text import slugify
 from django.views.decorators.csrf import csrf_exempt
 
@@ -221,9 +217,8 @@ def create(self, validated_data):
         return feature
 
 
-class EarlyAccessFeatureViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class EarlyAccessFeatureViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = EarlyAccessFeature.objects.select_related("feature_flag").all()
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
 
     def get_serializer_class(self) -> Type[serializers.Serializer]:
         if self.request.method == "POST":
diff --git a/posthog/api/element.py b/posthog/api/element.py
index be87cb90f51dc..32155b24c4264 100644
--- a/posthog/api/element.py
+++ b/posthog/api/element.py
@@ -1,20 +1,18 @@
 from typing import Literal, Tuple
 
-from rest_framework import authentication, request, response, serializers, viewsets
+from rest_framework import request, response, serializers, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 from statshog.defaults.django import statsd
 
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.auth import PersonalAPIKeyAuthentication, TemporaryTokenAuthentication
+from posthog.api.routing import TeamAndOrgViewSetMixin
+from posthog.auth import TemporaryTokenAuthentication
 from posthog.client import sync_execute
 from posthog.models import Element, Filter
 from posthog.models.element.element import chain_to_elements
 from posthog.models.element.sql import GET_ELEMENTS, GET_VALUES
 from posthog.models.instance_setting import get_instance_setting
 from posthog.models.property.util import parse_prop_grouped_clauses
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.queries.query_date_range import QueryDateRange
 from posthog.utils import format_query_params_absolute_url
 
@@ -35,18 +33,12 @@ class Meta:
         ]
 
 
-class ElementViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ElementViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     filter_rewrite_rules = {"team_id": "group__team_id"}
 
     queryset = Element.objects.all()
     serializer_class = ElementSerializer
-    authentication_classes = [
-        TemporaryTokenAuthentication,
-        PersonalAPIKeyAuthentication,
-        authentication.SessionAuthentication,
-        authentication.BasicAuthentication,
-    ]
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
+    authentication_classes = [TemporaryTokenAuthentication]
     include_in_docs = False
 
     @action(methods=["GET"], detail=False)
@@ -187,4 +179,4 @@ def values(self, request: request.Request, **kwargs) -> response.Response:
 
 
 class LegacyElementViewSet(ElementViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/event.py b/posthog/api/event.py
index 323229a64af22..e6aeabc6a4678 100644
--- a/posthog/api/event.py
+++ b/posthog/api/event.py
@@ -10,13 +10,12 @@
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
 from rest_framework.pagination import LimitOffsetPagination
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.settings import api_settings
 from rest_framework_csv import renderers as csvrenderers
 from sentry_sdk import capture_exception
 
 from posthog.api.documentation import PropertiesSerializer, extend_schema
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.client import query_with_columns, sync_execute
 from posthog.hogql.constants import DEFAULT_RETURNED_ROWS, MAX_SELECT_RETURNED_ROWS
 from posthog.models import Element, Filter, Person
@@ -26,9 +25,6 @@
 from posthog.models.person.util import get_persons_by_distinct_ids
 from posthog.models.team import Team
 from posthog.models.utils import UUIDT
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from posthog.queries.property_values import get_property_values_for_key
 from posthog.rate_limit import (
     ClickHouseBurstRateThrottle,
@@ -83,14 +79,13 @@ def get_paginated_response_schema(self, schema):
 
 
 class EventViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.RetrieveModelMixin,
     mixins.ListModelMixin,
     viewsets.GenericViewSet,
 ):
     renderer_classes = tuple(api_settings.DEFAULT_RENDERER_CLASSES) + (csvrenderers.PaginatedCSVRenderer,)
     serializer_class = ClickhouseEventSerializer
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     throttle_classes = [ClickHouseBurstRateThrottle, ClickHouseSustainedRateThrottle]
     pagination_class = UncountedLimitOffsetPagination
 
@@ -286,4 +281,4 @@ def values(self, request: request.Request, **kwargs) -> response.Response:
 
 
 class LegacyEventViewSet(EventViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/event_definition.py b/posthog/api/event_definition.py
index c1c8bcfe5b808..a5510d0d02abc 100644
--- a/posthog/api/event_definition.py
+++ b/posthog/api/event_definition.py
@@ -3,7 +3,6 @@
 from django.db.models import Manager, Prefetch
 from rest_framework import (
     mixins,
-    permissions,
     serializers,
     viewsets,
     request,
@@ -11,7 +10,7 @@
     response,
 )
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.tagged_item import TaggedItemSerializerMixin, TaggedItemViewSetMixin
 from posthog.api.utils import create_event_definitions_sql
@@ -23,10 +22,6 @@
 from posthog.models.activity_logging.activity_log import Detail, log_activity
 from posthog.models.user import User
 from posthog.models.utils import UUIDT
-from posthog.permissions import (
-    OrganizationMemberPermissions,
-    TeamMemberAccessPermission,
-)
 from posthog.settings import EE_AVAILABLE
 from loginas.utils import is_impersonated_session
 
@@ -69,7 +64,7 @@ def get_is_action(self, obj):
 
 class EventDefinitionViewSet(
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.ListModelMixin,
     mixins.RetrieveModelMixin,
     mixins.UpdateModelMixin,
@@ -77,11 +72,6 @@ class EventDefinitionViewSet(
     viewsets.GenericViewSet,
 ):
     serializer_class = EventDefinitionSerializer
-    permission_classes = [
-        permissions.IsAuthenticated,
-        OrganizationMemberPermissions,
-        TeamMemberAccessPermission,
-    ]
     lookup_field = "id"
     filter_backends = [TermSearchFilterBackend]
 
diff --git a/posthog/api/exports.py b/posthog/api/exports.py
index e5fbc85fbb219..ee6d96ab09d14 100644
--- a/posthog/api/exports.py
+++ b/posthog/api/exports.py
@@ -5,21 +5,15 @@
 from django.http import HttpResponse
 from django.utils.timezone import now
 from rest_framework import mixins, serializers, viewsets
-from rest_framework.authentication import BasicAuthentication, SessionAuthentication
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.auth import PersonalAPIKeyAuthentication
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.event_usage import report_user_action
 from posthog.models import Insight, User
 from posthog.models.activity_logging.activity_log import Change, Detail, log_activity
 from posthog.models.exported_asset import ExportedAsset, get_content_response
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from posthog.tasks import exporter
 from loginas.utils import is_impersonated_session
 
@@ -132,21 +126,14 @@ def _create_asset(
 
 
 class ExportedAssetViewSet(
+    TeamAndOrgViewSetMixin,
     mixins.RetrieveModelMixin,
     mixins.CreateModelMixin,
-    StructuredViewSetMixin,
     viewsets.GenericViewSet,
 ):
     queryset = ExportedAsset.objects.order_by("-created_at")
     serializer_class = ExportedAssetSerializer
 
-    authentication_classes = [
-        PersonalAPIKeyAuthentication,
-        SessionAuthentication,
-        BasicAuthentication,
-    ]
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
-
     # TODO: This should be removed as it is only used by frontend exporter and can instead use the api/sharing.py endpoint
     @action(methods=["GET"], detail=True)
     def content(self, request: Request, *args: Any, **kwargs: Any) -> HttpResponse:
diff --git a/posthog/api/feature_flag.py b/posthog/api/feature_flag.py
index dc97ed65980bc..b48015b7281fc 100644
--- a/posthog/api/feature_flag.py
+++ b/posthog/api/feature_flag.py
@@ -1,11 +1,10 @@
 import json
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, Dict, Optional, cast
 from datetime import datetime
 
 from django.db.models import QuerySet, Q, deletion
 from django.conf import settings
 from rest_framework import (
-    authentication,
     exceptions,
     request,
     serializers,
@@ -13,18 +12,18 @@
     viewsets,
 )
 from rest_framework.decorators import action
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
 from rest_framework.response import Response
 from sentry_sdk import capture_exception
 from posthog.api.cohort import CohortSerializer
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.tagged_item import TaggedItemSerializerMixin, TaggedItemViewSetMixin
 from posthog.api.dashboards.dashboard import Dashboard
-from posthog.auth import PersonalAPIKeyAuthentication, TemporaryTokenAuthentication
+from posthog.auth import TemporaryTokenAuthentication
 from posthog.constants import FlagRequestType
 from posthog.event_usage import report_user_action
 from posthog.helpers.dashboard_templates import (
@@ -50,9 +49,6 @@
 from posthog.models.feedback.survey import Survey
 from posthog.models.group_type_mapping import GroupTypeMapping
 from posthog.models.property import Property
-from posthog.permissions import (
-    TeamMemberAccessPermission,
-)
 from posthog.queries.base import (
     determine_parsed_date_for_property_matching,
 )
@@ -362,8 +358,8 @@ class Meta:
 
 
 class FeatureFlagViewSet(
+    TeamAndOrgViewSetMixin,
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
     ForbidDestroyModel,
     viewsets.ModelViewSet,
 ):
@@ -375,16 +371,9 @@ class FeatureFlagViewSet(
 
     queryset = FeatureFlag.objects.all()
     serializer_class = FeatureFlagSerializer
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-        CanEditFeatureFlag,
-    ]
+    permission_classes = [CanEditFeatureFlag]
     authentication_classes = [
-        PersonalAPIKeyAuthentication,
         TemporaryTokenAuthentication,  # Allows endpoint to be called from the Toolbar
-        authentication.SessionAuthentication,
-        authentication.BasicAuthentication,
     ]
 
     def get_queryset(self) -> QuerySet:
@@ -484,33 +473,26 @@ def my_flags(self, request: request.Request, **kwargs):
         if not request.user.is_authenticated:  # for mypy
             raise exceptions.NotAuthenticated()
 
-        feature_flags = (
-            FeatureFlag.objects.filter(team=self.team, deleted=False)
-            .prefetch_related("experiment_set")
-            .prefetch_related("features")
-            .prefetch_related("analytics_dashboards")
-            .prefetch_related("surveys_linked_flag")
-            .select_related("created_by")
-            .order_by("-created_at")
-        )
-        groups = json.loads(request.GET.get("groups", "{}"))
-        flags: List[dict] = []
+        feature_flags = list(FeatureFlag.objects.filter(team=self.team, deleted=False).order_by("-created_at"))
 
-        feature_flag_list = list(feature_flags)
+        if not feature_flags:
+            return Response([])
 
-        if not feature_flag_list:
-            return Response(flags)
+        groups = json.loads(request.GET.get("groups", "{}"))
+        matches, *_ = get_all_feature_flags(self.team_id, request.user.distinct_id, groups)
 
-        matches, _, _, _ = get_all_feature_flags(self.team_id, request.user.distinct_id, groups)
-        for feature_flag in feature_flags:
-            flags.append(
+        all_serialized_flags = MinimalFeatureFlagSerializer(
+            feature_flags, many=True, context=self.get_serializer_context()
+        ).data
+        return Response(
+            (
                 {
-                    "feature_flag": FeatureFlagSerializer(feature_flag, context=self.get_serializer_context()).data,
-                    "value": matches.get(feature_flag.key, False),
+                    "feature_flag": feature_flag,
+                    "value": matches.get(feature_flag["key"], False),
                 }
+                for feature_flag in all_serialized_flags
             )
-
-        return Response(flags)
+        )
 
     @action(methods=["GET"], detail=False, throttle_classes=[FeatureFlagThrottle])
     def local_evaluation(self, request: request.Request, **kwargs):
@@ -736,4 +718,4 @@ def perform_update(self, serializer):
 
 
 class LegacyFeatureFlagViewSet(FeatureFlagViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/ingestion_warnings.py b/posthog/api/ingestion_warnings.py
index 827567e5c8cb8..dc82c0b941812 100644
--- a/posthog/api/ingestion_warnings.py
+++ b/posthog/api/ingestion_warnings.py
@@ -6,11 +6,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.client import sync_execute
 
 
-class IngestionWarningsViewSet(StructuredViewSetMixin, viewsets.ViewSet):
+class IngestionWarningsViewSet(TeamAndOrgViewSetMixin, viewsets.ViewSet):
     def list(self, request: Request, **kw) -> Response:
         start_date = now() - timedelta(days=30)
         warning_events = sync_execute(
diff --git a/posthog/api/insight.py b/posthog/api/insight.py
index 8b28bab7b3fce..8f4c6f9963a12 100644
--- a/posthog/api/insight.py
+++ b/posthog/api/insight.py
@@ -16,11 +16,9 @@
 from rest_framework.decorators import action
 from rest_framework.exceptions import ParseError, PermissionDenied, ValidationError
 from rest_framework.parsers import JSONParser
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework_csv import renderers as csvrenderers
-from sentry_sdk import capture_exception
 
 from posthog import schema
 from posthog.api.documentation import extend_schema
@@ -32,7 +30,7 @@
     TrendSerializer,
 )
 from posthog.clickhouse.cancel import cancel_query_on_cluster
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.api.tagged_item import TaggedItemSerializerMixin, TaggedItemViewSetMixin
 from posthog.api.utils import format_paginated_url
@@ -78,7 +76,6 @@
 from posthog.models.filters.stickiness_filter import StickinessFilter
 from posthog.models.insight import InsightViewed
 from posthog.models.utils import UUIDT
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.queries.funnels import (
     ClickhouseFunnelTimeToConvert,
     ClickhouseFunnelTrends,
@@ -564,12 +561,11 @@ def dashboard_tile_from_context(self, insight: Insight, dashboard: Optional[Dash
 
 class InsightViewSet(
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     ForbidDestroyModel,
     viewsets.ModelViewSet,
 ):
     serializer_class = InsightSerializer
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     throttle_classes = [
         ClickHouseBurstRateThrottle,
         ClickHouseSustainedRateThrottle,
@@ -578,6 +574,7 @@ class InsightViewSet(
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ["short_id", "created_by"]
     include_in_docs = True
+    sharing_enabled_actions = ["retrieve", "list"]
 
     retention_query_class = Retention
     stickiness_query_class = Stickiness
@@ -592,23 +589,11 @@ def get_serializer_class(self) -> Type[serializers.BaseSerializer]:
             return InsightBasicSerializer
         return super().get_serializer_class()
 
-    def get_authenticators(self):
-        return [SharingAccessTokenAuthentication(), *super().get_authenticators()]
-
     def get_serializer_context(self) -> Dict[str, Any]:
         context = super().get_serializer_context()
         context["is_shared"] = isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication)
         return context
 
-    def get_permissions(self):
-        if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication) and self.action in (
-            "retrieve",
-            "list",
-        ):
-            # Anonymous users authenticated via SharingAccessTokenAuthentication get read-only access to insights
-            return []
-        return super().get_permissions()
-
     def get_queryset(self) -> QuerySet:
         queryset: QuerySet
         if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication):
@@ -816,12 +801,6 @@ def retrieve(self, request, *args, **kwargs):
     @action(methods=["GET", "POST"], detail=False)
     def trend(self, request: request.Request, *args: Any, **kwargs: Any):
         timings = HogQLTimings()
-
-        try:
-            serializer = TrendSerializer(request=request)
-            serializer.is_valid(raise_exception=True)
-        except Exception as e:
-            capture_exception(e)
         try:
             with timings.measure("calculate"):
                 result = self.calculate_trends(request)
@@ -908,11 +887,6 @@ def calculate_trends(self, request: request.Request) -> Dict[str, Any]:
     @action(methods=["GET", "POST"], detail=False)
     def funnel(self, request: request.Request, *args: Any, **kwargs: Any) -> Response:
         timings = HogQLTimings()
-        try:
-            serializer = FunnelSerializer(request=request)
-            serializer.is_valid(raise_exception=True)
-        except Exception as e:
-            capture_exception(e)
         try:
             with timings.measure("calculate"):
                 funnel = self.calculate_funnel(request)
@@ -952,7 +926,7 @@ def calculate_funnel(self, request: request.Request) -> Dict[str, Any]:
     # - start_entity: (dict) specifies id and type of the entity to focus retention on
     # - **shared filter types
     # ******************************************
-    @action(methods=["GET"], detail=False)
+    @action(methods=["GET", "POST"], detail=False)
     def retention(self, request: request.Request, *args: Any, **kwargs: Any) -> Response:
         timings = HogQLTimings()
         try:
@@ -968,7 +942,7 @@ def retention(self, request: request.Request, *args: Any, **kwargs: Any) -> Resp
     def calculate_retention(self, request: request.Request) -> Dict[str, Any]:
         team = self.team
         data = {}
-        if not request.GET.get("date_from"):
+        if not request.GET.get("date_from") and not request.data.get("date_from"):
             data.update({"date_from": "-11d"})
         filter = RetentionFilter(data=data, request=request, team=self.team)
         base_uri = request.build_absolute_uri("/")
@@ -1083,4 +1057,4 @@ def timing(self, request: request.Request, **kwargs):
 
 
 class LegacyInsightViewSet(InsightViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/integration.py b/posthog/api/integration.py
index 5d513b82bbd84..a6319eed10312 100644
--- a/posthog/api/integration.py
+++ b/posthog/api/integration.py
@@ -1,18 +1,14 @@
 from typing import Any
 
 from rest_framework import mixins, serializers, viewsets
-from rest_framework.authentication import BasicAuthentication, SessionAuthentication
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
-from posthog.auth import PersonalAPIKeyAuthentication
 from posthog.models.integration import Integration, SlackIntegration
-from posthog.permissions import TeamMemberAccessPermission
 
 
 class IntegrationSerializer(serializers.ModelSerializer):
@@ -49,19 +45,12 @@ class IntegrationViewSet(
     mixins.RetrieveModelMixin,
     mixins.ListModelMixin,
     mixins.DestroyModelMixin,
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     viewsets.GenericViewSet,
 ):
     queryset = Integration.objects.all()
     serializer_class = IntegrationSerializer
 
-    authentication_classes = [
-        PersonalAPIKeyAuthentication,
-        SessionAuthentication,
-        BasicAuthentication,
-    ]
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
-
     @action(methods=["GET"], detail=True, url_path="channels")
     def content(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         instance = self.get_object()
diff --git a/posthog/api/notebook.py b/posthog/api/notebook.py
index 1b0a5045a6728..3bc04cf46aa00 100644
--- a/posthog/api/notebook.py
+++ b/posthog/api/notebook.py
@@ -16,11 +16,10 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.serializers import BaseSerializer
 
 from posthog.api.forbid_destroy_model import ForbidDestroyModel
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.exceptions import Conflict
 from posthog.models import User
@@ -34,7 +33,6 @@
 from posthog.models.activity_logging.activity_page import activity_page_response
 from posthog.models.notebook.notebook import Notebook
 from posthog.models.utils import UUIDT
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.settings import DEBUG
 from posthog.utils import relative_date_parse
 from loginas.utils import is_impersonated_session
@@ -236,9 +234,8 @@ def update(self, instance: Notebook, validated_data: Dict, **kwargs) -> Notebook
         ],
     )
 )
-class NotebookViewSet(StructuredViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class NotebookViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     queryset = Notebook.objects.all()
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ["short_id"]
     # TODO: Remove this once we have released notebooks
diff --git a/posthog/api/organization.py b/posthog/api/organization.py
index 38e387e1eee2f..753969de61e69 100644
--- a/posthog/api/organization.py
+++ b/posthog/api/organization.py
@@ -6,6 +6,7 @@
 from rest_framework.request import Request
 
 from posthog import settings
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import TeamBasicSerializer
 from posthog.cloud_utils import is_cloud
 from posthog.constants import AvailableFeature
@@ -18,7 +19,6 @@
 from posthog.permissions import (
     CREATE_METHODS,
     OrganizationAdminWritePermissions,
-    OrganizationMemberPermissions,
     extract_organization,
 )
 from posthog.user_permissions import UserPermissions, UserPermissionsSerializerMixin
@@ -123,13 +123,9 @@ def get_metadata(self, instance: Organization) -> Dict[str, Union[str, int, obje
         }
 
 
-class OrganizationViewSet(viewsets.ModelViewSet):
+class OrganizationViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     serializer_class = OrganizationSerializer
-    permission_classes = [
-        permissions.IsAuthenticated,
-        OrganizationMemberPermissions,
-        OrganizationPermissionsWithDelete,
-    ]
+    permission_classes = [OrganizationPermissionsWithDelete]
     queryset = Organization.objects.none()
     lookup_field = "id"
     ordering = "-created_by"
@@ -137,7 +133,7 @@ class OrganizationViewSet(viewsets.ModelViewSet):
     def get_permissions(self):
         if self.request.method == "POST":
             # Cannot use `OrganizationMemberPermissions` or `OrganizationAdminWritePermissions`
-            # because they require an existing org, unneded anyways because permissions are organization-based
+            # because they require an existing org, unneeded anyways because permissions are organization-based
             return [
                 permission()
                 for permission in [
diff --git a/posthog/api/organization_domain.py b/posthog/api/organization_domain.py
index bcf30b4eac798..c67c0317c7922 100644
--- a/posthog/api/organization_domain.py
+++ b/posthog/api/organization_domain.py
@@ -3,16 +3,12 @@
 
 from rest_framework import exceptions, request, response, serializers
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.viewsets import ModelViewSet
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.cloud_utils import is_cloud
 from posthog.models import OrganizationDomain
-from posthog.permissions import (
-    OrganizationAdminWritePermissions,
-    OrganizationMemberPermissions,
-)
+from posthog.permissions import OrganizationAdminWritePermissions
 
 DOMAIN_REGEX = r"^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$"
 
@@ -74,13 +70,9 @@ def validate(self, attrs: Dict[str, Any]) -> Dict[str, Any]:
         return attrs
 
 
-class OrganizationDomainViewset(StructuredViewSetMixin, ModelViewSet):
+class OrganizationDomainViewset(TeamAndOrgViewSetMixin, ModelViewSet):
     serializer_class = OrganizationDomainSerializer
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        OrganizationAdminWritePermissions,
-    ]
+    permission_classes = [OrganizationAdminWritePermissions]
     queryset = OrganizationDomain.objects.all()
 
     def get_queryset(self):
diff --git a/posthog/api/organization_feature_flag.py b/posthog/api/organization_feature_flag.py
index f2cdf2098620e..543ed6c692c27 100644
--- a/posthog/api/organization_feature_flag.py
+++ b/posthog/api/organization_feature_flag.py
@@ -1,7 +1,6 @@
 from typing import Dict
 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,
@@ -9,26 +8,24 @@
     status,
 )
 from posthog.api.cohort import CohortSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.feature_flag import FeatureFlagSerializer
 from posthog.api.feature_flag import CanEditFeatureFlag
 from posthog.api.shared import UserBasicSerializer
 from posthog.models import FeatureFlag, Team
 from posthog.models.cohort import Cohort, CohortOrEmpty
 from posthog.models.filters.filter import Filter
-from posthog.permissions import OrganizationMemberPermissions
 
 
 class OrganizationFeatureFlagView(
+    TeamAndOrgViewSetMixin,
     viewsets.ViewSet,
-    StructuredViewSetMixin,
     mixins.RetrieveModelMixin,
 ):
     """
     Retrieves all feature flags for a given organization and key.
     """
 
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     lookup_field = "feature_flag_key"
 
     def retrieve(self, request, *args, **kwargs):
diff --git a/posthog/api/organization_invite.py b/posthog/api/organization_invite.py
index 17452b3e994e3..6860c5f875104 100644
--- a/posthog/api/organization_invite.py
+++ b/posthog/api/organization_invite.py
@@ -10,16 +10,14 @@
     viewsets,
 )
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.email import is_email_available
 from posthog.event_usage import report_bulk_invited, report_team_member_invited
 from posthog.models import OrganizationInvite, OrganizationMembership
 from posthog.models.organization import Organization
 from posthog.models.user import User
-from posthog.permissions import OrganizationMemberPermissions
 from posthog.tasks.email import send_invite
 
 
@@ -79,14 +77,13 @@ def create(self, validated_data: Dict[str, Any], *args: Any, **kwargs: Any) -> O
 
 
 class OrganizationInviteViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.DestroyModelMixin,
     mixins.CreateModelMixin,
     mixins.ListModelMixin,
     viewsets.GenericViewSet,
 ):
     serializer_class = OrganizationInviteSerializer
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     queryset = OrganizationInvite.objects.all()
     lookup_field = "id"
     ordering = "-created_at"
diff --git a/posthog/api/organization_member.py b/posthog/api/organization_member.py
index 11f3c08e30411..94fd64aa73d60 100644
--- a/posthog/api/organization_member.py
+++ b/posthog/api/organization_member.py
@@ -4,17 +4,17 @@
 from django.shortcuts import get_object_or_404
 from django_otp.plugins.otp_totp.models import TOTPDevice
 from rest_framework import exceptions, mixins, serializers, viewsets
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
 from rest_framework.serializers import raise_errors_on_nested_writes
 from social_django.admin import UserSocialAuth
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.constants import INTERNAL_BOT_EMAIL_SUFFIX
 from posthog.models import OrganizationMembership
 from posthog.models.user import User
-from posthog.permissions import OrganizationMemberPermissions, extract_organization
+from posthog.permissions import extract_organization
 
 
 class OrganizationMemberObjectPermissions(BasePermission):
@@ -79,18 +79,14 @@ def update(self, updated_membership, validated_data, **kwargs):
 
 
 class OrganizationMemberViewSet(
-    StructuredViewSetMixin,
+    TeamAndOrgViewSetMixin,
     mixins.DestroyModelMixin,
     mixins.UpdateModelMixin,
     mixins.ListModelMixin,
     viewsets.GenericViewSet,
 ):
     serializer_class = OrganizationMemberSerializer
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        OrganizationMemberObjectPermissions,
-    ]
+    permission_classes = [OrganizationMemberObjectPermissions]
     queryset = (
         OrganizationMembership.objects.order_by("user__first_name", "-joined_at")
         .exclude(user__email__endswith=INTERNAL_BOT_EMAIL_SUFFIX)
diff --git a/posthog/api/person.py b/posthog/api/person.py
index 7ced939f0f621..1e02714d90dbf 100644
--- a/posthog/api/person.py
+++ b/posthog/api/person.py
@@ -22,7 +22,6 @@
 from rest_framework.decorators import action
 from rest_framework.exceptions import MethodNotAllowed, NotFound, ValidationError
 from rest_framework.pagination import LimitOffsetPagination
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework_csv import renderers as csvrenderers
@@ -30,7 +29,7 @@
 
 from posthog.api.capture import capture_internal
 from posthog.api.documentation import PersonPropertiesSerializer, extend_schema
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.utils import format_paginated_url, get_pk_or_uuid, get_target_entity
 from posthog.constants import (
     CSV_EXPORT_LIMIT,
@@ -58,7 +57,6 @@
 from posthog.models.filters.retention_filter import RetentionFilter
 from posthog.models.filters.stickiness_filter import StickinessFilter
 from posthog.models.person.util import delete_person
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.queries.actor_base_query import (
     ActorBaseQuery,
     get_people,
@@ -220,7 +218,7 @@ def get_funnel_actor_class(filter: Filter) -> Callable:
     return funnel_actor_class
 
 
-class PersonViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class PersonViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     To create or update persons, use a PostHog library of your choice and [use an identify call](/docs/integrate/identifying-users). This API endpoint is only for reading and deleting.
     """
@@ -229,7 +227,6 @@ class PersonViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
     queryset = Person.objects.all()
     serializer_class = PersonSerializer
     pagination_class = PersonLimitOffsetPagination
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     throttle_classes = [ClickHouseBurstRateThrottle, PersonsThrottle]
     lifecycle_class = Lifecycle
     retention_class = Retention
@@ -960,4 +957,4 @@ def prepare_actor_query_filter(filter: T) -> T:
 
 
 class LegacyPersonViewSet(PersonViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
diff --git a/posthog/api/plugin.py b/posthog/api/plugin.py
index 3eabe8ee187a8..f299091562b71 100644
--- a/posthog/api/plugin.py
+++ b/posthog/api/plugin.py
@@ -17,10 +17,10 @@
 from rest_framework import renderers, request, serializers, status, viewsets
 from rest_framework.decorators import action, renderer_classes
 from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError
-from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import Plugin, PluginAttachment, PluginConfig, User
 from posthog.models.activity_logging.activity_log import (
     ActivityPage,
@@ -40,10 +40,6 @@
     validate_plugin_job_payload,
 )
 from posthog.models.utils import UUIDT, generate_random_token
-from posthog.permissions import (
-    OrganizationMemberPermissions,
-    TeamMemberAccessPermission,
-)
 from posthog.plugins import can_configure_plugins, can_install_plugins, parse_url
 from posthog.plugins.access import can_globally_manage_plugins
 from posthog.queries.app_metrics.app_metrics import TeamPluginsDeliveryRateQuery
@@ -300,12 +296,10 @@ def update(self, plugin: Plugin, validated_data: Dict, *args: Any, **kwargs: Any
         return super().update(plugin, validated_data)
 
 
-class PluginViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class PluginViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = Plugin.objects.all()
     serializer_class = PluginSerializer
     permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
         PluginsAccessLevelPermission,
         PluginOwnershipPermission,
     ]
@@ -713,14 +707,9 @@ def update(  # type: ignore
         return response
 
 
-class PluginConfigViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class PluginConfigViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = PluginConfig.objects.all()
     serializer_class = PluginConfigSerializer
-    permission_classes = [
-        IsAuthenticated,
-        OrganizationMemberPermissions,
-        TeamMemberAccessPermission,
-    ]
 
     def get_queryset(self):
         if not can_configure_plugins(self.team.organization_id):
@@ -874,7 +863,7 @@ def _get_secret_fields_for_plugin(plugin: Plugin) -> Set[str]:
 
 
 class LegacyPluginConfigViewSet(PluginConfigViewSet):
-    legacy_team_compatibility = True
+    derive_current_team_from_user_only = True
 
 
 class PipelineTransformationsViewSet(PluginViewSet):
diff --git a/posthog/api/plugin_log_entry.py b/posthog/api/plugin_log_entry.py
index 4497f75c3f0f2..a25be40ea56ae 100644
--- a/posthog/api/plugin_log_entry.py
+++ b/posthog/api/plugin_log_entry.py
@@ -2,17 +2,15 @@
 
 from django.utils import timezone
 from rest_framework import exceptions, mixins, viewsets
-from rest_framework.permissions import IsAuthenticated
 from rest_framework_dataclasses.serializers import DataclassSerializer
 
 from posthog.api.plugin import PluginOwnershipPermission, PluginsAccessLevelPermission
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models.plugin import (
     PluginLogEntry,
     PluginLogEntryType,
     fetch_plugin_log_entries,
 )
-from posthog.permissions import TeamMemberAccessPermission
 
 
 class PluginLogEntrySerializer(DataclassSerializer):
@@ -20,14 +18,9 @@ class Meta:
         dataclass = PluginLogEntry
 
 
-class PluginLogEntryViewSet(StructuredViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
+class PluginLogEntryViewSet(TeamAndOrgViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = PluginLogEntrySerializer
-    permission_classes = [
-        IsAuthenticated,
-        PluginsAccessLevelPermission,
-        PluginOwnershipPermission,
-        TeamMemberAccessPermission,
-    ]
+    permission_classes = [PluginsAccessLevelPermission, PluginOwnershipPermission]
 
     def get_queryset(self):
         limit_raw = self.request.GET.get("limit")
diff --git a/posthog/api/prompt.py b/posthog/api/prompt.py
deleted file mode 100644
index 8c6f1633016ab..0000000000000
--- a/posthog/api/prompt.py
+++ /dev/null
@@ -1,245 +0,0 @@
-import json
-from typing import Any, Dict, List
-
-from dateutil import parser
-from django.http import JsonResponse
-from django.views.decorators.csrf import csrf_exempt
-from rest_framework import exceptions, request, serializers, status, viewsets
-from rest_framework.decorators import action
-from rest_framework.response import Response
-
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.api.utils import get_token
-from posthog.exceptions import generate_exception_response
-from posthog.models.prompt import Prompt, PromptSequence, UserPromptState
-from posthog.tasks.prompts import trigger_prompt_for_user
-from posthog.utils_cors import cors_response
-
-
-class PromptButtonSerializer(serializers.Serializer):
-    label = serializers.CharField()  # type: ignore
-    url = serializers.CharField(required=False)
-    action = serializers.CharField(required=False)
-
-
-class PromptSerializer(serializers.ModelSerializer):
-    buttons = PromptButtonSerializer(many=True, required=False, default=[])
-    reference = serializers.CharField(default=None)
-    placement = serializers.CharField(default="top")
-    type = serializers.CharField(default="tooltip")
-
-    class Meta:
-        model = Prompt
-        fields = ["step", "type", "title", "text", "placement", "reference", "buttons"]
-
-
-class PromptSequenceSerializer(serializers.ModelSerializer):
-    prompts = PromptSerializer(many=True)
-    path_match = serializers.ListField(child=serializers.CharField(), default=["/*"])
-    path_exclude = serializers.ListField(child=serializers.CharField(), default=[])
-    status = serializers.CharField(default="active")
-    requires_opt_in = serializers.BooleanField(default=False)
-    type = serializers.CharField(default="one-off")
-    autorun = serializers.BooleanField(default=False)
-
-    class Meta:
-        model = PromptSequence
-        fields = [
-            "key",
-            "path_match",
-            "path_exclude",
-            "requires_opt_in",
-            "type",
-            "status",
-            "prompts",
-            "autorun",
-        ]
-
-
-class UserPromptStateSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = UserPromptState
-        fields = ["last_updated_at", "step", "completed", "dismissed"]
-
-
-class PromptSequenceViewSet(StructuredViewSetMixin, viewsets.ViewSet):
-    """
-    Create, read, update and delete prompt sequences state for a person.
-    """
-
-    @action(methods=["PATCH"], detail=False)
-    def my_prompts(self, request: request.Request, **kwargs):
-        if not request.user.is_authenticated:  # for mypy otherwise check on distict_id below fails
-            raise exceptions.NotAuthenticated()
-        local_states: List[UserPromptState] = []
-        local_state_keys = set()
-        all_sequences = PromptSequence.objects.filter(status="active")
-        # get the local state (sent from localstorage), and filter it based on active sequences
-        for key in request.data:
-            if key not in local_state_keys:
-                try:
-                    sequence = all_sequences.get(key=key)
-                    parsed_state: Dict[str, Any] = dict(
-                        request.data[key],
-                        last_updated_at=parser.isoparse(request.data[key]["last_updated_at"]),
-                        sequence=sequence,
-                    )
-                    local_states.append(
-                        UserPromptState(
-                            user=request.user,
-                            **parsed_state,
-                        )
-                    )
-                    local_state_keys.add(key)  # prevent duplicates
-                except:
-                    continue
-
-        states_to_update: List[UserPromptState] = []
-        states_to_create: List[UserPromptState] = []
-
-        saved_states = UserPromptState.objects.filter(user=request.user)
-        up_to_date_states: List[UserPromptState] = []
-
-        # for each sequence, we check if either the local state, or the one saved in the db is more up to date
-        # if the local state is more up to date, we update the db state
-        # if the db state is more up to date, we send it back to the frontend
-        for sequence in all_sequences:
-            local_state = next((s for s in local_states if sequence == s.sequence), None)
-            saved_state = next((s for s in saved_states if sequence == s.sequence), None)
-
-            state = None
-            # check if the local state is more recent than the one in the db, then update accordingly
-            if local_state:
-                if saved_state and local_state.last_updated_at > saved_state.last_updated_at:
-                    saved_state.last_updated_at = local_state.last_updated_at
-                    saved_state.step = local_state.step
-                    saved_state.completed = local_state.completed
-                    saved_state.dismissed = local_state.dismissed
-                    states_to_update.append(saved_state)
-                    state = saved_state
-                elif saved_state is not None:
-                    state = saved_state
-                else:
-                    states_to_create.append(local_state)
-                    state = local_state
-            else:
-                if saved_state:
-                    state = saved_state
-                # if the sequence should autorun for all users, we create a state with no step, meaning the user has not seen it but should start seeing it
-                elif sequence.autorun:
-                    state = UserPromptState(user=request.user, sequence=sequence, step=None)
-
-            if state:
-                up_to_date_states.append(state)
-
-        my_prompts: Dict[str, Any] = {"state": {}, "sequences": []}
-        # filter only the sequences where `must_be_completed` rule passes
-        # this allows to run certain sequences only if other have been completed first
-        for state in up_to_date_states:
-            sequence = state.sequence
-            must_have_completed = sequence.must_have_completed.all()
-            if len(must_have_completed) > 0:
-                current_state = next(
-                    (s for s in up_to_date_states if s.sequence in must_have_completed),
-                    None,
-                )
-                if not current_state or (current_state and not current_state.completed):
-                    continue
-            my_prompts["state"][sequence.key] = UserPromptStateSerializer(state).data
-            my_prompts["sequences"].append(PromptSequenceSerializer(sequence).data)
-
-        # update or create any state to db
-        if states_to_create:
-            UserPromptState.objects.bulk_create(states_to_create)
-        if states_to_update:
-            UserPromptState.objects.bulk_update(states_to_update, ["last_updated_at", "step", "completed", "dismissed"])
-
-        return Response(my_prompts)
-
-
-class WebhookSerializer(serializers.Serializer):
-    sequence = PromptSequenceSerializer()
-    emails = serializers.ListField(child=serializers.EmailField(), required=False)
-
-
-class WebhookSequenceSerializer(serializers.ModelSerializer):
-    path_match = serializers.ListField(child=serializers.CharField(), default=["/*"])
-    path_exclude = serializers.ListField(child=serializers.CharField(), default=[])
-    requires_opt_in = serializers.BooleanField(default=False)
-    status = serializers.CharField(default="active")
-    autorun = serializers.BooleanField(default=False)
-    type = serializers.CharField(default="one-off")
-
-    class Meta:
-        model = PromptSequence
-        fields = [
-            "key",
-            "path_match",
-            "path_exclude",
-            "type",
-            "status",
-            "requires_opt_in",
-            "autorun",
-        ]
-
-
-@csrf_exempt
-def prompt_webhook(request: request.Request):
-    if request.method == "POST":
-        data = json.loads(request.body)
-    else:
-        return cors_response(
-            request,
-            generate_exception_response(
-                "prompts_webhook",
-                "No data found. Make sure to use a POST request when sending the payload in the body of the request.",
-                code="no_data",
-            ),
-        )
-
-    token = get_token(data, request)
-
-    if not token:
-        return cors_response(
-            request,
-            generate_exception_response(
-                "prompts_webhook",
-                "API key not provided. You can find your project API key in PostHog project settings.",
-                type="authentication_error",
-                code="missing_api_key",
-                status_code=status.HTTP_401_UNAUTHORIZED,
-            ),
-        )
-
-    serializer = WebhookSerializer(data=data)
-    if not serializer.is_valid():
-        return cors_response(
-            request,
-            generate_exception_response(
-                "prompts_webhook",
-                serializer.errors,
-                status_code=status.HTTP_400_BAD_REQUEST,
-            ),
-        )
-    serialized_data = serializer.validated_data
-
-    prompt_data = []
-    for prompt in serialized_data["sequence"]["prompts"]:
-        prompt_data.append(PromptSerializer(prompt).data)
-
-    # get or create sequence from webhook
-    sequence_data = WebhookSequenceSerializer(serialized_data["sequence"]).data
-    try:
-        sequence = PromptSequence.objects.get(key=sequence_data["key"])
-    except PromptSequence.DoesNotExist:
-        sequence = PromptSequence.objects.create(**sequence_data)
-        for prompt in prompt_data:
-            new_prompt = Prompt.objects.create(**prompt)
-            sequence.prompts.add(new_prompt)
-
-    # trigger the sequence for users matching the emails, by creating empty states for them
-    if serialized_data.get("emails"):
-        for email in serialized_data["emails"]:
-            trigger_prompt_for_user.delay(email, sequence.id)
-
-    return cors_response(request, JsonResponse(status=status.HTTP_202_ACCEPTED, data={"success": True}))
diff --git a/posthog/api/property_definition.py b/posthog/api/property_definition.py
index d720f28917402..1e8678fd79317 100644
--- a/posthog/api/property_definition.py
+++ b/posthog/api/property_definition.py
@@ -6,7 +6,6 @@
 from django.db.models import Prefetch
 from rest_framework import (
     mixins,
-    permissions,
     serializers,
     viewsets,
     status,
@@ -18,7 +17,7 @@
 from rest_framework.pagination import LimitOffsetPagination
 
 from posthog.api.documentation import extend_schema
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.tagged_item import TaggedItemSerializerMixin, TaggedItemViewSetMixin
 from posthog.constants import GROUP_TYPES_LIMIT, AvailableFeature
 from posthog.event_usage import report_user_action
@@ -27,10 +26,6 @@
 from posthog.models import PropertyDefinition, TaggedItem, User, EventProperty
 from posthog.models.activity_logging.activity_log import log_activity, Detail
 from posthog.models.utils import UUIDT
-from posthog.permissions import (
-    OrganizationMemberPermissions,
-    TeamMemberAccessPermission,
-)
 from loginas.utils import is_impersonated_session
 
 
@@ -444,8 +439,8 @@ def paginate_queryset(self, queryset, request, view=None) -> Optional[List[Any]]
 
 
 class PropertyDefinitionViewSet(
+    TeamAndOrgViewSetMixin,
     TaggedItemViewSetMixin,
-    StructuredViewSetMixin,
     mixins.ListModelMixin,
     mixins.RetrieveModelMixin,
     mixins.UpdateModelMixin,
@@ -453,11 +448,6 @@ class PropertyDefinitionViewSet(
     viewsets.GenericViewSet,
 ):
     serializer_class = PropertyDefinitionSerializer
-    permission_classes = [
-        permissions.IsAuthenticated,
-        OrganizationMemberPermissions,
-        TeamMemberAccessPermission,
-    ]
     lookup_field = "id"
     filter_backends = [TermSearchFilterBackend]
     ordering = "name"
diff --git a/posthog/api/query.py b/posthog/api/query.py
index 89dfb77b3f4ce..58309b111a07f 100644
--- a/posthog/api/query.py
+++ b/posthog/api/query.py
@@ -7,14 +7,13 @@
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError, NotAuthenticated
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
 from posthog.api.documentation import extend_schema
 from posthog.api.mixins import PydanticModelMixin
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.services.query import process_query_model
 from posthog.clickhouse.client.execute_async import (
     cancel_query,
@@ -26,7 +25,6 @@
 from posthog.hogql.ai import PromptUnclear, write_sql_from_prompt
 from posthog.hogql.errors import HogQLException
 from posthog.models.user import User
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.rate_limit import (
     AIBurstRateThrottle,
     AISustainedRateThrottle,
@@ -40,12 +38,7 @@ class QueryThrottle(TeamRateThrottle):
     rate = "120/hour"
 
 
-class QueryViewSet(PydanticModelMixin, StructuredViewSetMixin, viewsets.ViewSet):
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-    ]
-
+class QueryViewSet(PydanticModelMixin, TeamAndOrgViewSetMixin, viewsets.ViewSet):
     def get_throttles(self):
         if self.action == "draft_sql":
             return [AIBurstRateThrottle(), AISustainedRateThrottle()]
diff --git a/posthog/api/routing.py b/posthog/api/routing.py
index 0f61d093a03a7..35b9f10aeb352 100644
--- a/posthog/api/routing.py
+++ b/posthog/api/routing.py
@@ -3,15 +3,17 @@
 
 from rest_framework import authentication
 from rest_framework.exceptions import AuthenticationFailed, NotFound, ValidationError
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.viewsets import GenericViewSet
 from rest_framework_extensions.routers import ExtendedDefaultRouter
 from rest_framework_extensions.settings import extensions_api_settings
 
 from posthog.api.utils import get_token
-from posthog.auth import JwtAuthentication, PersonalAPIKeyAuthentication
+from posthog.auth import JwtAuthentication, PersonalAPIKeyAuthentication, SharingAccessTokenAuthentication
 from posthog.models.organization import Organization
 from posthog.models.team import Team
 from posthog.models.user import User
+from posthog.permissions import OrganizationMemberPermissions, SharingTokenPermission, TeamMemberAccessPermission
 from posthog.user_permissions import UserPermissions
 
 if TYPE_CHECKING:
@@ -28,10 +30,11 @@ def __init__(self, *args, **kwargs):
         self.trailing_slash = r"/?"
 
 
-class StructuredViewSetMixin(_GenericViewSet):
+# NOTE: Previously known as the StructuredViewSetMixin
+class TeamAndOrgViewSetMixin(_GenericViewSet):
     # This flag disables nested routing handling, reverting to the old request.user.team behavior
     # Allows for a smoother transition from the old flat API structure to the newer nested one
-    legacy_team_compatibility: bool = False
+    derive_current_team_from_user_only: bool = False
 
     # Rewrite filter queries, so that for example foreign keys can be accessed
     # Example: {"team_id": "foo__team_id"} will make the viewset filtered by obj.foo.team_id instead of obj.team_id
@@ -39,24 +42,64 @@ class StructuredViewSetMixin(_GenericViewSet):
 
     include_in_docs = True
 
-    authentication_classes = [
-        JwtAuthentication,
-        PersonalAPIKeyAuthentication,
-        authentication.SessionAuthentication,
-        authentication.BasicAuthentication,
-    ]
+    authentication_classes = []
+    permission_classes = []
+
+    sharing_enabled_actions: list[str] = []
+
+    # We want to try and ensure that the base permission and authentication are always used
+    # so we offer a way to add additional classes
+    def get_permissions(self):
+        if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication):
+            return [SharingTokenPermission()]
+
+        # NOTE: We define these here to make it hard _not_ to use them. If you want to override them, you have to
+        # override the entire method.
+        permission_classes: list = [IsAuthenticated]
+
+        if self.is_team_view:
+            permission_classes.append(TeamMemberAccessPermission)
+        else:
+            permission_classes.append(OrganizationMemberPermissions)
+
+        permission_classes.extend(self.permission_classes)
+        return [permission() for permission in permission_classes]
+
+    def get_authenticators(self):
+        # NOTE: Custom authentication_classes go first as these typically have extra initial checks
+        authentication_classes: list = [
+            *self.authentication_classes,
+        ]
+
+        if self.sharing_enabled_actions:
+            authentication_classes.append(SharingAccessTokenAuthentication)
+
+        authentication_classes.extend(
+            [
+                JwtAuthentication,
+                PersonalAPIKeyAuthentication,
+                authentication.SessionAuthentication,
+            ]
+        )
+
+        return [auth() for auth in authentication_classes]
 
     def get_queryset(self):
         queryset = super().get_queryset()
         return self.filter_queryset_by_parents_lookups(queryset)
 
+    @property
+    def is_team_view(self):
+        # NOTE: We check the property first as it avoids any potential DB lookups via the parents_query_dict
+        return self.derive_current_team_from_user_only or "team_id" in self.parents_query_dict
+
     @property
     def team_id(self) -> int:
         team_from_token = self._get_team_from_request()
         if team_from_token:
             return team_from_token.id
 
-        if self.legacy_team_compatibility:
+        if self.derive_current_team_from_user_only:
             user = cast(User, self.request.user)
             team = user.team
             assert team is not None
@@ -69,7 +112,7 @@ def team(self) -> Team:
         if team_from_token:
             return team_from_token
 
-        if self.legacy_team_compatibility:
+        if self.derive_current_team_from_user_only:
             user = cast(User, self.request.user)
             team = user.team
             assert team is not None
@@ -112,7 +155,7 @@ def parents_query_dict(self) -> Dict[str, Any]:
         # used to override the last visited project if there's a token in the request
         team_from_request = self._get_team_from_request()
 
-        if self.legacy_team_compatibility:
+        if self.derive_current_team_from_user_only:
             if not self.request.user.is_authenticated:
                 raise AuthenticationFailed()
             project = team_from_request or self.request.user.team
@@ -120,7 +163,7 @@ def parents_query_dict(self) -> Dict[str, Any]:
                 raise ValidationError("This endpoint requires a project.")
             return {"team_id": project.id}
         result = {}
-        # process URL paremetrs (here called kwargs), such as organization_id in /api/organizations/:organization_id/
+        # process URL parameters (here called kwargs), such as organization_id in /api/organizations/:organization_id/
         for kwarg_name, kwarg_value in self.kwargs.items():
             # drf-extensions nested parameters are prefixed
             if kwarg_name.startswith(extensions_api_settings.DEFAULT_PARENT_LOOKUP_KWARG_NAME_PREFIX):
@@ -182,30 +225,30 @@ def user_permissions(self) -> "UserPermissions":
 
     # def create(self, *args, **kwargs):
     #     super_cls = super()
-    #     if self.legacy_team_compatibility:
+    #     if self.derive_current_team_from_user_only:
     #         print(f"Legacy endpoint called – {super_cls.get_view_name()} (create)")
     #     return super_cls.create(*args, **kwargs)
 
     # def retrieve(self, *args, **kwargs):
     #     super_cls = super()
-    #     if self.legacy_team_compatibility:
+    #     if self.derive_current_team_from_user_only:
     #         print(f"Legacy endpoint called – {super_cls.get_view_name()} (retrieve)")
     #     return super_cls.retrieve(*args, **kwargs)
 
     # def list(self, *args, **kwargs):
     #     super_cls = super()
-    #     if self.legacy_team_compatibility:
+    #     if self.derive_current_team_from_user_only:
     #         print(f"Legacy endpoint called – {super_cls.get_view_name()} (list)")
     #     return super_cls.list(*args, **kwargs)
 
     # def update(self, *args, **kwargs):
     #     super_cls = super()
-    #     if self.legacy_team_compatibility:
+    #     if self.derive_current_team_from_user_only:
     #         print(f"Legacy endpoint called – {super_cls.get_view_name()} (update)")
     #     return super_cls.update(*args, **kwargs)
 
     # def delete(self, *args, **kwargs):
     #     super_cls = super()
-    #     if self.legacy_team_compatibility:
+    #     if self.derive_current_team_from_user_only:
     #         print(f"Legacy endpoint called – {super_cls.get_view_name()} (delete)")
     #     return super_cls.delete(*args, **kwargs)
diff --git a/posthog/api/scheduled_change.py b/posthog/api/scheduled_change.py
index c2214970887f1..1b48c28ae7e71 100644
--- a/posthog/api/scheduled_change.py
+++ b/posthog/api/scheduled_change.py
@@ -1,16 +1,12 @@
 from typing import Any, Dict
 from rest_framework import (
-    authentication,
     serializers,
     viewsets,
 )
 
-from rest_framework.permissions import IsAuthenticated
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
-from posthog.auth import PersonalAPIKeyAuthentication
 from posthog.models import ScheduledChange
-from posthog.permissions import TeamMemberAccessPermission
 
 
 class ScheduledChangeSerializer(serializers.ModelSerializer):
@@ -41,11 +37,12 @@ def create(self, validated_data: Dict, *args: Any, **kwargs: Any) -> ScheduledCh
         return super().create(validated_data)
 
 
-class ScheduledChangeViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ScheduledChangeViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Create, read, update and delete scheduled changes.
     """
 
+    serializer_class = ScheduledChangeSerializer
     queryset = ScheduledChange.objects.all()
 
     def get_queryset(self):
@@ -60,14 +57,3 @@ def get_queryset(self):
             queryset = queryset.filter(record_id=record_id)
 
         return queryset
-
-    serializer_class = ScheduledChangeSerializer
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-    ]
-    authentication_classes = [
-        PersonalAPIKeyAuthentication,
-        authentication.SessionAuthentication,
-        authentication.BasicAuthentication,
-    ]
diff --git a/posthog/api/search.py b/posthog/api/search.py
index 521536c728c36..a66432e022f39 100644
--- a/posthog/api/search.py
+++ b/posthog/api/search.py
@@ -6,12 +6,10 @@
 from django.db.models.functions import Cast, JSONObject  # type: ignore
 from django.http import HttpResponse
 from rest_framework import viewsets, serializers
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
-from posthog.permissions import TeamMemberAccessPermission
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import Action, Cohort, Insight, Dashboard, FeatureFlag, Experiment, Team, EventDefinition, Survey
 from posthog.models.notebook.notebook import Notebook
 
@@ -78,9 +76,7 @@ def validate_q(self, value: str):
         return process_query(value)
 
 
-class SearchViewSet(StructuredViewSetMixin, viewsets.ViewSet):
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
-
+class SearchViewSet(TeamAndOrgViewSetMixin, viewsets.ViewSet):
     def list(self, request: Request, **kw) -> HttpResponse:
         # parse query params
         query_serializer = QuerySerializer(data=self.request.query_params)
diff --git a/posthog/api/sharing.py b/posthog/api/sharing.py
index 6ece14d0e6dd1..d0909ec2d9029 100644
--- a/posthog/api/sharing.py
+++ b/posthog/api/sharing.py
@@ -8,13 +8,13 @@
 from django.views.decorators.clickjacking import xframe_options_exempt
 from rest_framework import mixins, response, serializers, viewsets
 from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError
-from rest_framework.permissions import SAFE_METHODS, IsAuthenticated
+from rest_framework.permissions import SAFE_METHODS
 from rest_framework.request import Request
 
 from posthog.api.dashboards.dashboard import DashboardSerializer
 from posthog.api.exports import ExportedAssetSerializer
 from posthog.api.insight import InsightSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import SharingConfiguration, Team
 from posthog.models.activity_logging.activity_log import log_activity, Detail, Change
 from posthog.models.dashboard import Dashboard
@@ -26,7 +26,6 @@
 from posthog.models.insight import Insight
 from posthog.models import SessionRecording
 from posthog.models.user import User
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.session_recordings.session_recording_api import SessionRecordingSerializer
 from posthog.user_permissions import UserPermissions
 from posthog.utils import render_template
@@ -80,11 +79,7 @@ class Meta:
         read_only_fields = ["created_at", "access_token"]
 
 
-class SharingConfigurationViewSet(StructuredViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-    ]
+class SharingConfigurationViewSet(TeamAndOrgViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
     pagination_class = None
     queryset = SharingConfiguration.objects.select_related("dashboard", "insight", "recording")
     serializer_class = SharingConfigurationSerializer
@@ -202,7 +197,7 @@ def patch(self, request: Request, *args: Any, **kwargs: Any) -> response.Respons
         return response.Response(serializer.data)
 
 
-class SharingViewerPageViewSet(mixins.RetrieveModelMixin, StructuredViewSetMixin, viewsets.GenericViewSet):
+class SharingViewerPageViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
     """
     NOTE: This ViewSet takes care of multiple rendering cases:
     1. Shared Resources like Shared Dashboard or Insight
diff --git a/posthog/api/survey.py b/posthog/api/survey.py
index 22e9f6aa9cb99..db07f6db2dba7 100644
--- a/posthog/api/survey.py
+++ b/posthog/api/survey.py
@@ -10,15 +10,13 @@
 from rest_framework.response import Response
 from rest_framework.decorators import action
 from posthog.api.feature_flag import FeatureFlagSerializer, MinimalFeatureFlagSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from rest_framework import serializers, viewsets, request
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework import status
 
 from posthog.models.feature_flag.feature_flag import FeatureFlag
 from posthog.models.team.team import Team
-from posthog.permissions import TeamMemberAccessPermission
 from django.utils.text import slugify
 from django.views.decorators.csrf import csrf_exempt
 
@@ -254,12 +252,8 @@ def _create_new_targeting_flag(self, name, filters, active=False):
         return targeting_feature_flag
 
 
-class SurveyViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class SurveyViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = Survey.objects.select_related("linked_flag", "targeting_flag").all()
-    permission_classes = [
-        IsAuthenticated,
-        TeamMemberAccessPermission,
-    ]
 
     def get_serializer_class(self) -> Type[serializers.Serializer]:
         if self.request.method == "POST" or self.request.method == "PATCH":
diff --git a/posthog/api/tagged_item.py b/posthog/api/tagged_item.py
index d756b3411655e..bec8cfef025e5 100644
--- a/posthog/api/tagged_item.py
+++ b/posthog/api/tagged_item.py
@@ -2,7 +2,7 @@
 from rest_framework import response, serializers, status, viewsets
 from rest_framework.viewsets import GenericViewSet
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.constants import AvailableFeature
 from posthog.models import Tag, TaggedItem, User
 from posthog.models.tag import tagify
@@ -107,7 +107,7 @@ def get_tag(self, obj: TaggedItem) -> str:
         return obj.tag.name
 
 
-class TaggedItemViewSet(StructuredViewSetMixin, GenericViewSet):
+class TaggedItemViewSet(TeamAndOrgViewSetMixin, GenericViewSet):
     serializer_class = TaggedItemSerializer
     queryset = Tag.objects.none()
 
diff --git a/posthog/api/team.py b/posthog/api/team.py
index 79529c23052c4..75bd46e7d486a 100644
--- a/posthog/api/team.py
+++ b/posthog/api/team.py
@@ -4,31 +4,38 @@
 
 from django.core.cache import cache
 from django.shortcuts import get_object_or_404
+from loginas.utils import is_impersonated_session
 from rest_framework import (
     exceptions,
-    permissions,
     request,
     response,
     serializers,
     viewsets,
 )
+from rest_framework.permissions import BasePermission, IsAuthenticated
 from rest_framework.decorators import action
 from posthog.api.geoip import get_geoip_properties
+from posthog.api.routing import TeamAndOrgViewSetMixin
 
 from posthog.api.shared import TeamBasicSerializer
 from posthog.constants import AvailableFeature
 from posthog.event_usage import report_user_action
-from posthog.models import InsightCachingState, Organization, Team, User
+from posthog.models import InsightCachingState, Team, User
+from posthog.models.activity_logging.activity_log import (
+    log_activity,
+    Detail,
+    Change,
+    load_activity,
+    dict_changes_between,
+)
+from posthog.models.activity_logging.activity_page import activity_page_response
 from posthog.models.async_deletion import AsyncDeletion, DeletionType
 from posthog.models.group_type_mapping import GroupTypeMapping
 from posthog.models.organization import OrganizationMembership
 from posthog.models.signals import mute_selected_signals
-from posthog.models.team.team import (
-    groups_on_events_querying_enabled,
-    set_team_in_cache,
-)
+from posthog.models.team.team import groups_on_events_querying_enabled, set_team_in_cache
 from posthog.models.team.util import delete_batch_exports, delete_bulky_postgres_data
-from posthog.models.utils import generate_random_token_project
+from posthog.models.utils import generate_random_token_project, UUIDT
 from posthog.permissions import (
     CREATE_METHODS,
     OrganizationAdminWritePermissions,
@@ -41,7 +48,7 @@
 from posthog.utils import get_ip_address, get_week_start_for_country_code
 
 
-class PremiumMultiProjectPermissions(permissions.BasePermission):
+class PremiumMultiProjectPermissions(BasePermission):
     """Require user to have all necessary premium features on their plan for create access to the endpoint."""
 
     message = "You must upgrade your PostHog plan to be able to create and manage multiple projects."
@@ -280,6 +287,18 @@ def create(self, validated_data: Dict[str, Any], **kwargs) -> Team:
         request.user.current_team = team
         request.user.team = request.user.current_team  # Update cached property
         request.user.save()
+
+        log_activity(
+            organization_id=organization.id,
+            team_id=team.pk,
+            user=request.user,
+            was_impersonated=is_impersonated_session(request),
+            scope="Team",
+            item_id=team.pk,
+            activity="created",
+            detail=Detail(name=str(team.name)),
+        )
+
         return team
 
     def _handle_timezone_update(self, team: Team) -> None:
@@ -288,24 +307,41 @@ def _handle_timezone_update(self, team: Team) -> None:
         cache.delete_many(hashes)
 
     def update(self, instance: Team, validated_data: Dict[str, Any]) -> Team:
+        before_update = instance.__dict__.copy()
+
         if "timezone" in validated_data and validated_data["timezone"] != instance.timezone:
             self._handle_timezone_update(instance)
 
         updated_team = super().update(instance, validated_data)
+        changes = dict_changes_between("Team", before_update, updated_team.__dict__, use_field_exclusions=True)
+
+        log_activity(
+            organization_id=cast(UUIDT, instance.organization_id),
+            team_id=instance.pk,
+            user=cast(User, self.context["request"].user),
+            was_impersonated=is_impersonated_session(request),
+            scope="Team",
+            item_id=instance.pk,
+            activity="updated",
+            detail=Detail(
+                name=str(instance.name),
+                changes=changes,
+            ),
+        )
+
         return updated_team
 
 
-class TeamViewSet(viewsets.ModelViewSet):
+class TeamViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Projects for the current organization.
     """
 
     serializer_class = TeamSerializer
     queryset = Team.objects.all().select_related("organization")
-    permission_classes = [permissions.IsAuthenticated, PremiumMultiProjectPermissions]
+    permission_classes = [IsAuthenticated, PremiumMultiProjectPermissions]
     lookup_field = "id"
     ordering = "-created_by"
-    organization: Optional[Organization] = None
     include_in_docs = True
 
     def get_queryset(self):
@@ -318,16 +354,6 @@ def get_serializer_class(self) -> Type[serializers.BaseSerializer]:
             return TeamBasicSerializer
         return super().get_serializer_class()
 
-    def check_permissions(self, request):
-        if self.action and self.action == "create":
-            organization = getattr(self.request.user, "organization", None)
-            if not organization:
-                raise exceptions.ValidationError("You need to belong to an organization.")
-            # To be used later by OrganizationAdminWritePermissions and TeamSerializer
-            self.organization = organization
-
-        return super().check_permissions(request)
-
     def get_permissions(self) -> List:
         """
         Special permissions handling for create requests as the organization is inferred from the current user.
@@ -347,6 +373,16 @@ def get_permissions(self) -> List:
                 base_permissions.append(TeamMemberLightManagementPermission())
         return base_permissions
 
+    def check_permissions(self, request):
+        if self.action and self.action == "create":
+            organization = getattr(self.request.user, "organization", None)
+            if not organization:
+                raise exceptions.ValidationError("You need to belong to an organization.")
+            # To be used later by OrganizationAdminWritePermissions and TeamSerializer
+            self.organization = organization
+
+        return super().check_permissions(request)
+
     def get_object(self):
         lookup_value = self.kwargs[self.lookup_field]
         if lookup_value == "@current":
@@ -370,6 +406,8 @@ def team(self):
 
     def perform_destroy(self, team: Team):
         team_id = team.pk
+        organization_id = team.organization_id
+        team_name = team.name
 
         user = cast(User, self.request.user)
 
@@ -392,6 +430,16 @@ def perform_destroy(self, team: Team):
             ignore_conflicts=True,
         )
 
+        log_activity(
+            organization_id=cast(UUIDT, organization_id),
+            team_id=team_id,
+            user=user,
+            was_impersonated=is_impersonated_session(self.request),
+            scope="Team",
+            item_id=team_id,
+            activity="deleted",
+            detail=Detail(name=str(team_name)),
+        )
         # TRICKY: We pass in Team here as otherwise the access to "current_team" can fail if it was deleted
         report_user_action(user, f"team deleted", team=team)
 
@@ -400,7 +448,7 @@ def perform_destroy(self, team: Team):
         detail=True,
         # Only ADMIN or higher users are allowed to access this project
         permission_classes=[
-            permissions.IsAuthenticated,
+            IsAuthenticated,
             TeamMemberStrictManagementPermission,
         ],
     )
@@ -409,19 +457,56 @@ def reset_token(self, request: request.Request, id: str, **kwargs) -> response.R
         old_token = team.api_token
         team.api_token = generate_random_token_project()
         team.save()
+
+        log_activity(
+            organization_id=team.organization_id,
+            team_id=team.pk,
+            user=cast(User, request.user),
+            was_impersonated=is_impersonated_session(request),
+            scope="Team",
+            item_id=team.pk,
+            activity="updated",
+            detail=Detail(
+                name=str(team.name),
+                changes=[
+                    Change(
+                        type="Team",
+                        action="changed",
+                        field="api_token",
+                    )
+                ],
+            ),
+        )
+
         set_team_in_cache(old_token, None)
         return response.Response(TeamSerializer(team, context=self.get_serializer_context()).data)
 
     @action(
         methods=["GET"],
         detail=True,
-        permission_classes=[permissions.IsAuthenticated],
+        permission_classes=[IsAuthenticated],
     )
     def is_generating_demo_data(self, request: request.Request, id: str, **kwargs) -> response.Response:
         team = self.get_object()
         cache_key = f"is_generating_demo_data_{team.pk}"
         return response.Response({"is_generating_demo_data": cache.get(cache_key) == "True"})
 
+    @action(methods=["GET"], detail=True)
+    def activity(self, request: request.Request, **kwargs):
+        limit = int(request.query_params.get("limit", "10"))
+        page = int(request.query_params.get("page", "1"))
+
+        team = self.get_object()
+
+        activity_page = load_activity(
+            scope="Team",
+            team_id=team.pk,
+            item_ids=[str(team.pk)],
+            limit=limit,
+            page=page,
+        )
+        return activity_page_response(activity_page, limit, page, request)
+
     @cached_property
     def user_permissions(self):
         team = self.get_object() if self.action == "reset_token" else None
diff --git a/posthog/api/test/__snapshots__/test_api_docs.ambr b/posthog/api/test/__snapshots__/test_api_docs.ambr
index c59eda95b7757..b1ffdb2329c1d 100644
--- a/posthog/api/test/__snapshots__/test_api_docs.ambr
+++ b/posthog/api/test/__snapshots__/test_api_docs.ambr
@@ -1,6 +1,8 @@
 # serializer version: 1
 # name: TestAPIDocsSchema.test_api_docs_generation_warnings_snapshot
   list([
+    "/home/runner/work/posthog/posthog/posthog/api/organization.py: Warning [OrganizationViewSet]: could not resolve authenticator <class 'posthog.auth.PersonalAPIKeyAuthentication'>. There was no OpenApiAuthenticationExtension registered for that class. Try creating one by subclassing it. Ignoring for now.",
+    '/home/runner/work/posthog/posthog/posthog/api/organization.py: Warning [OrganizationViewSet > OrganizationSerializer]: unable to resolve type hint for function "get_metadata". Consider using a type hint or @extend_schema_field. Defaulting to string.',
     '/home/runner/work/posthog/posthog/posthog/batch_exports/http.py: Warning [BatchExportOrganizationViewSet]: could not derive type of path parameter "parent_lookup_organization_id" because model "posthog.batch_exports.models.BatchExport" contained no such field. Consider annotating parameter with @extend_schema. Defaulting to "string".',
     "/home/runner/work/posthog/posthog/posthog/batch_exports/http.py: Warning [BatchExportOrganizationViewSet]: could not resolve authenticator <class 'posthog.auth.PersonalAPIKeyAuthentication'>. There was no OpenApiAuthenticationExtension registered for that class. Try creating one by subclassing it. Ignoring for now.",
     '/home/runner/work/posthog/posthog/posthog/batch_exports/http.py: Warning [BatchExportOrganizationViewSet > BatchExportSerializer]: could not resolve serializer field "HogQLSelectQueryField(required=False)". Defaulting to "string"',
@@ -176,8 +178,12 @@
     '/home/runner/work/posthog/posthog/posthog/warehouse/api/table.py: Warning [TableViewSet > TableSerializer]: unable to resolve type hint for function "get_external_schema". Consider using a type hint or @extend_schema_field. Defaulting to string.',
     '/home/runner/work/posthog/posthog/posthog/warehouse/api/view_link.py: Warning [ViewLinkViewSet]: could not derive type of path parameter "project_id" because model "posthog.warehouse.models.view_link.DataWarehouseViewLink" contained no such field. Consider annotating parameter with @extend_schema. Defaulting to "string".',
     "/home/runner/work/posthog/posthog/posthog/warehouse/api/view_link.py: Warning [ViewLinkViewSet]: could not resolve authenticator <class 'posthog.auth.PersonalAPIKeyAuthentication'>. There was no OpenApiAuthenticationExtension registered for that class. Try creating one by subclassing it. Ignoring for now.",
-    '/home/runner/work/posthog/posthog/posthog/api/prompt.py: Error [PromptSequenceViewSet]: unable to guess serializer. This is graceful fallback handling for APIViews. Consider using GenericAPIView as view base class, if view is under your control. Either way you may want to add a serializer_class (or method). Ignoring view for now.',
-    "/home/runner/work/posthog/posthog/posthog/api/prompt.py: Warning [PromptSequenceViewSet]: could not resolve authenticator <class 'posthog.auth.PersonalAPIKeyAuthentication'>. There was no OpenApiAuthenticationExtension registered for that class. Try creating one by subclassing it. Ignoring for now.",
+    'Warning: operationId "list" has collisions [(\'/api/organizations/\', \'get\'), (\'/api/projects/\', \'get\')]. resolving with numeral suffixes.',
+    'Warning: operationId "create" has collisions [(\'/api/organizations/\', \'post\'), (\'/api/projects/\', \'post\')]. resolving with numeral suffixes.',
+    'Warning: operationId "retrieve" has collisions [(\'/api/organizations/{id}/\', \'get\'), (\'/api/projects/{id}/\', \'get\')]. resolving with numeral suffixes.',
+    'Warning: operationId "update" has collisions [(\'/api/organizations/{id}/\', \'put\'), (\'/api/projects/{id}/\', \'put\')]. resolving with numeral suffixes.',
+    'Warning: operationId "partial_update" has collisions [(\'/api/organizations/{id}/\', \'patch\'), (\'/api/projects/{id}/\', \'patch\')]. resolving with numeral suffixes.',
+    'Warning: operationId "destroy" has collisions [(\'/api/organizations/{id}/\', \'delete\'), (\'/api/projects/{id}/\', \'delete\')]. resolving with numeral suffixes.',
     'Warning: operationId "batch_exports_list" has collisions [(\'/api/organizations/{parent_lookup_organization_id}/batch_exports/\', \'get\'), (\'/api/projects/{project_id}/batch_exports/\', \'get\')]. resolving with numeral suffixes.',
     'Warning: operationId "batch_exports_create" has collisions [(\'/api/organizations/{parent_lookup_organization_id}/batch_exports/\', \'post\'), (\'/api/projects/{project_id}/batch_exports/\', \'post\')]. resolving with numeral suffixes.',
     'Warning: operationId "batch_exports_retrieve" has collisions [(\'/api/organizations/{parent_lookup_organization_id}/batch_exports/{id}/\', \'get\'), (\'/api/projects/{project_id}/batch_exports/{id}/\', \'get\')]. resolving with numeral suffixes.',
diff --git a/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr b/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
index 197132c69be54..27dc42ed1593d 100644
--- a/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
+++ b/posthog/api/test/dashboards/__snapshots__/test_dashboard.ambr
@@ -1235,33 +1235,6 @@
                                           5 /* ... */)) /*controller='project_dashboards-detail',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/dashboards/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/%3F%24'*/
   '''
 # ---
-# name: TestDashboard.test_adding_insights_is_not_nplus1_for_gets.32
-  '''
-  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 (NOT ("posthog_dashboard"."deleted")
-         AND "posthog_dashboard"."id" IN (1,
-                                          2,
-                                          3,
-                                          4,
-                                          5 /* ... */)) /*controller='project_dashboards-detail',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/dashboards/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/%3F%24'*/
-  '''
-# ---
 # name: TestDashboard.test_adding_insights_is_not_nplus1_for_gets.4
   '''
   SELECT "posthog_dashboard"."id",
@@ -2721,24 +2694,6 @@
                                                           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",
@@ -11655,24 +11610,6 @@
                                                           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_retrieve_dashboard_list.33
-  '''
-  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_retrieve_dashboard_list.4
   '''
   SELECT "posthog_dashboardtile"."id"
diff --git a/posthog/api/test/dashboards/test_dashboard.py b/posthog/api/test/dashboards/test_dashboard.py
index 74216d2280453..4165f6b680687 100644
--- a/posthog/api/test/dashboards/test_dashboard.py
+++ b/posthog/api/test/dashboards/test_dashboard.py
@@ -863,33 +863,49 @@ def test_dashboard_duplication_can_duplicate_tiles(self):
 
     def test_dashboard_duplication_can_duplicate_tiles_without_editing_name_if_there_is_none(self) -> None:
         existing_dashboard = Dashboard.objects.create(team=self.team, name="existing dashboard", created_by=self.user)
-        insight_one_id, _ = self.dashboard_api.create_insight({"dashboards": [existing_dashboard.pk], "name": None})
-        _, dashboard_with_tiles = self.dashboard_api.create_text_tile(existing_dashboard.id)
+        self.dashboard_api.create_insight({"dashboards": [existing_dashboard.pk], "name": None})
+        self.dashboard_api.create_text_tile(existing_dashboard.pk)
 
         _, duplicate_response = self.dashboard_api.create_dashboard(
             {
                 "name": "another",
-                "use_dashboard": existing_dashboard.id,
+                "use_dashboard": existing_dashboard.pk,
                 "duplicate_tiles": True,
             }
         )
 
-        assert duplicate_response["tiles"][0]["insight"]["name"] is None
+        assert duplicate_response is not None
+        assert len(duplicate_response.get("tiles", [])) == 2
+
+        insight_tile = next(tile for tile in duplicate_response["tiles"] if "insight" in tile)
+        text_tile = next(tile for tile in duplicate_response["tiles"] if "text" in tile)
+
+        # this test only needs to check that insight name is still None,
+        # but it flaps in CI.
+        # my guess was that the order of the response is not guaranteed
+        # but even after lifting insight tile out specifically, it still flaps
+        # it isn't clear from the error if insight_tile or insight_tile["insight"] is None
+        with self.retry_assertion():
+            assert insight_tile is not None
+            assert insight_tile["insight"] is not None
+            assert insight_tile["insight"]["name"] is None
+            assert text_tile is not None
 
     def test_dashboard_duplication(self):
         existing_dashboard = Dashboard.objects.create(team=self.team, name="existing dashboard", created_by=self.user)
         insight1 = Insight.objects.create(filters={"name": "test1"}, team=self.team, last_refresh=now())
-        DashboardTile.objects.create(dashboard=existing_dashboard, insight=insight1)
+        tile1 = DashboardTile.objects.create(dashboard=existing_dashboard, insight=insight1)
         insight2 = Insight.objects.create(filters={"name": "test2"}, team=self.team, last_refresh=now())
-        DashboardTile.objects.create(dashboard=existing_dashboard, insight=insight2)
-        _, response = self.dashboard_api.create_dashboard({"name": "another", "use_dashboard": existing_dashboard.id})
+        tile2 = DashboardTile.objects.create(dashboard=existing_dashboard, insight=insight2)
+        _, response = self.dashboard_api.create_dashboard({"name": "another", "use_dashboard": existing_dashboard.pk})
         self.assertEqual(response["creation_mode"], "duplicate")
 
         self.assertEqual(len(response["tiles"]), len(existing_dashboard.insights.all()))
 
-        existing_dashboard_item_id_set = set(map(lambda x: x.id, existing_dashboard.insights.all()))
+        existing_dashboard_item_id_set = {tile1.pk, tile2.pk}
         response_item_id_set = set(map(lambda x: x.get("id", None), response["tiles"]))
         # check both sets are disjoint to verify that the new items' ids are different than the existing items
+
         self.assertTrue(existing_dashboard_item_id_set.isdisjoint(response_item_id_set))
 
         for item in response["tiles"]:
diff --git a/posthog/api/test/test_action.py b/posthog/api/test/test_action.py
index fc21c9f12f270..c86d14d4156b1 100644
--- a/posthog/api/test/test_action.py
+++ b/posthog/api/test/test_action.py
@@ -183,14 +183,14 @@ def test_update_action_remove_all_steps(self, *args):
     # otherwise evil sites could create actions with a users' session.
     # NOTE: Origin header is only set on cross domain request
     def test_create_from_other_domain(self, *args):
-        # FIXME: BaseTest is using Django client to performe calls to a DRF endpoint.
+        # FIXME: BaseTest is using Django client to perform calls to a DRF endpoint.
         # Django HttpResponse does not have an attribute `data`. Better use rest_framework.test.APIClient.
         response = self.client.post(
             f"/api/projects/{self.team.id}/actions/",
             data={"name": "user signed up"},
             HTTP_ORIGIN="https://evilwebsite.com",
         )
-        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.status_code, 401)
 
         self.user.temporary_token = "token123"
         self.user.save()
@@ -214,13 +214,13 @@ def test_create_from_other_domain(self, *args):
             f"/api/projects/{self.team.id}/actions/",
             HTTP_ORIGIN="https://evilwebsite.com",
         )
-        self.assertEqual(list_response.status_code, 403)
+        self.assertEqual(list_response.status_code, 401)
 
         detail_response = self.client.get(
             f"/api/projects/{self.team.id}/actions/{response.json()['id']}/",
             HTTP_ORIGIN="https://evilwebsite.com",
         )
-        self.assertEqual(detail_response.status_code, 403)
+        self.assertEqual(detail_response.status_code, 401)
 
         self.client.logout()
         list_response = self.client.get(
diff --git a/posthog/api/test/test_event_definition.py b/posthog/api/test/test_event_definition.py
index 9b978490cda7e..aa2a2c05a2428 100644
--- a/posthog/api/test/test_event_definition.py
+++ b/posthog/api/test/test_event_definition.py
@@ -135,7 +135,7 @@ def test_cant_see_event_definitions_for_another_team(self):
         # Also can't fetch for a team to which the user doesn't have permissions
         response = self.client.get(f"/api/projects/{team.pk}/event_definitions/")
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEqual(response.json(), self.permission_denied_response())
+        self.assertEqual(response.json(), self.permission_denied_response("You don't have access to the project."))
 
     def test_query_event_definitions(self):
         # Regular search
diff --git a/posthog/api/test/test_feature_flag.py b/posthog/api/test/test_feature_flag.py
index a665ed570d25c..35e35dbaddb9e 100644
--- a/posthog/api/test/test_feature_flag.py
+++ b/posthog/api/test/test_feature_flag.py
@@ -1126,7 +1126,7 @@ def test_my_flags_is_not_nplus1(self) -> None:
             format="json",
         ).json()
 
-        with self.assertNumQueries(FuzzyInt(10, 11)):
+        with self.assertNumQueries(FuzzyInt(5, 6)):
             response = self.client.get(f"/api/projects/{self.team.id}/feature_flags/my_flags")
             self.assertEqual(response.status_code, status.HTTP_200_OK)
 
@@ -1141,7 +1141,7 @@ def test_my_flags_is_not_nplus1(self) -> None:
                 format="json",
             ).json()
 
-        with self.assertNumQueries(FuzzyInt(10, 11)):
+        with self.assertNumQueries(FuzzyInt(5, 6)):
             response = self.client.get(f"/api/projects/{self.team.id}/feature_flags/my_flags")
             self.assertEqual(response.status_code, status.HTTP_200_OK)
 
diff --git a/posthog/api/test/test_insight.py b/posthog/api/test/test_insight.py
index 5710513597f6b..5089c774be1bd 100644
--- a/posthog/api/test/test_insight.py
+++ b/posthog/api/test/test_insight.py
@@ -1830,64 +1830,6 @@ def test_insight_trends_allowed_if_project_open_and_org_member(self) -> None:
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-    @patch("posthog.api.insight.capture_exception")
-    def test_serializer(self, patch_capture_exception) -> None:
-        """
-        Various regression tests for the serializer
-        """
-        # Display
-        self.client.get(
-            f"/api/projects/{self.team.id}/insights/trend/?events={json.dumps([{'id': '$pageview'}])}&properties=%5B%5D&display=ActionsLineGraph"
-        )
-
-        self.assertEqual(
-            patch_capture_exception.call_count,
-            0,
-            patch_capture_exception.call_args_list,
-        )
-
-        # Properties with an array
-        events = [
-            {
-                "id": "$pageview",
-                "properties": [{"key": "something", "value": ["something"]}],
-            }
-        ]
-        self.client.get(
-            f"/api/projects/{self.team.id}/insights/trend/?events={json.dumps(events)}&properties=%5B%5D&display=ActionsLineGraph"
-        )
-        self.assertEqual(
-            patch_capture_exception.call_count,
-            0,
-            patch_capture_exception.call_args_list,
-        )
-
-        # Breakdown with ints in funnels
-        cohort_one_id = self._create_one_person_cohort([{"key": "prop", "value": 5, "type": "person"}])
-        cohort_two_id = self._create_one_person_cohort([{"key": "prop", "value": 6, "type": "person"}])
-
-        events = [
-            {
-                "id": "$pageview",
-                "properties": [{"key": "something", "value": ["something"]}],
-            },
-            {"id": "$pageview"},
-        ]
-        response = self.client.post(
-            f"/api/projects/{self.team.id}/insights/funnel/",
-            {
-                "events": events,
-                "breakdown": [cohort_one_id, cohort_two_id],
-                "breakdown_type": "cohort",
-            },
-        )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            patch_capture_exception.call_count,
-            0,
-            patch_capture_exception.call_args_list,
-        )
-
     def _create_one_person_cohort(self, properties: List[Dict[str, Any]]) -> int:
         Person.objects.create(team=self.team, properties=properties)
         cohort_one_id = self.client.post(
diff --git a/posthog/api/test/test_preflight.py b/posthog/api/test/test_preflight.py
index 6b63ad28f7542..d5fec0c360ff7 100644
--- a/posthog/api/test/test_preflight.py
+++ b/posthog/api/test/test_preflight.py
@@ -6,7 +6,6 @@
 from rest_framework import status
 
 from posthog.cloud_utils import (
-    TEST_clear_cloud_cache,
     TEST_clear_instance_license_cache,
 )
 from posthog.models.instance_setting import set_instance_setting
@@ -287,20 +286,14 @@ def test_can_create_org_with_multi_org(self):
             self.assertEqual(response.json()["can_create_org"], True)
 
     @pytest.mark.ee
-    def test_cloud_preflight_based_on_license(self):
-        TEST_clear_cloud_cache()
-        try:
-            from ee.models.license import License, LicenseManager
-        except ImportError:
-            pass
-        else:
-            super(LicenseManager, cast(LicenseManager, License.objects)).create(
-                key="key::123",
-                plan="cloud",
-                valid_until=timezone.datetime(2038, 1, 19, 3, 14, 7),
-            )
-
+    def test_cloud_preflight_based_on_region(self):
+        with self.settings(CLOUD_DEPLOYMENT="US"):
             response = self.client.get("/_preflight/")
             assert response.status_code == status.HTTP_200_OK
             assert response.json()["realm"] == "cloud"
-            assert response.json()["cloud"]
+            assert response.json()["cloud"] is True
+        with self.settings(CLOUD_DEPLOYMENT=None):
+            response = self.client.get("/_preflight/")
+            assert response.status_code == status.HTTP_200_OK
+            assert response.json()["realm"] == "hosted-clickhouse"
+            assert response.json()["cloud"] is False
diff --git a/posthog/api/test/test_prompt.py b/posthog/api/test/test_prompt.py
deleted file mode 100644
index 7a56060eb712d..0000000000000
--- a/posthog/api/test/test_prompt.py
+++ /dev/null
@@ -1,226 +0,0 @@
-from freezegun.api import freeze_time
-from rest_framework import status
-
-from posthog.models import User
-from posthog.models.prompt import Prompt, PromptSequence, UserPromptState
-from posthog.test.base import APIBaseTest
-
-
-def _setup_prompts() -> None:
-    prompt1 = Prompt.objects.create(
-        step=0,
-        type="tooltip",
-        title="Welcome to PostHog!",
-        text="We have prepared a list of suggestions and resources to improve your experience with the tool. You can access it at any time by clicking on the question mark icon in the top right corner of the screen, and then selecting 'How to be successful with PostHog'.",
-        placement="bottom-start",
-        reference="help-button",
-        buttons=[{"action": "activation-checklist", "label": "Show me suggestions"}],
-    )
-    sequence1 = PromptSequence.objects.create(
-        key="start-flow",
-        type="one-off",
-        path_match=["/*"],
-        path_exclude=["/ingestion", "/ingestion/*"],
-        status="active",
-    )
-    sequence1.prompts.add(prompt1)
-
-    prompt2 = Prompt.objects.create(
-        step=0,
-        type="tooltip",
-        title="Track your marketing websites",
-        text="PostHog may have been built for product analytics, but that doesn’t mean you can only deploy it on your core product — you can also use it to gather analytics from your marketing website too.",
-        placement="bottom-start",
-        reference="help-button",
-        buttons=[
-            {
-                "url": "https://posthog.com/blog/how-and-why-track-your-website-with-posthog",
-                "label": "How (and why) to track your website with PostHog",
-            }
-        ],
-    )
-    sequence2 = PromptSequence.objects.create(
-        key="activation-checklist",
-        type="one-off",
-        path_match=["/*"],
-        path_exclude=["/ingestion", "/ingestion/*"],
-        status="active",
-    )
-    sequence2.prompts.add(prompt2)
-    sequence2.must_have_completed.add(sequence1)
-
-
-_webhook_prompt = {
-    "key": "start-flow",
-    "prompts": [
-        {
-            "step": 0,
-            "title": "Welcome to PostHog!",
-            "text": "We have prepared a list of suggestions and resources to improve your experience with the tool. You can access it at any time by clicking on the question mark icon in the top right corner of the screen, and then selecting 'How to be successful with PostHog'.",
-        }
-    ],
-}
-
-
-class TestPrompt(APIBaseTest):
-    @classmethod
-    def setUpTestData(cls):
-        super().setUpTestData()
-
-    def setUp(cls):
-        distinct_id_user = User.objects.create_and_join(cls.organization, "distinct_id_user@posthog.com", None)
-        distinct_id_user.distinct_id = "distinct_id"
-        distinct_id_user.save()
-        cls.user = distinct_id_user
-
-    @freeze_time("2022-08-25T22:09:14.252Z")
-    def test_my_prompts(self):
-        self.client.force_login(self.user)
-        _setup_prompts()
-        # receive only the one sequence which doesn't have prerequisites
-        response = self.client.patch(f"/api/prompts/my_prompts", {}, format="json")
-        assert response.status_code == status.HTTP_200_OK
-        json_response = response.json()
-        assert len(json_response["sequences"]) == 1
-        assert json_response["sequences"][0]["key"] == "start-flow"
-
-        # updates the saved state using the more recent local state
-        local_state = {
-            "start-flow": {
-                "sequence": "start-flow",
-                "last_updated_at": "2022-08-25T22:09:14.252Z",
-                "step": 0,
-                "completed": True,
-                "dismissed": False,
-            }
-        }
-        response = self.client.patch(f"/api/prompts/my_prompts", local_state, format="json")
-        assert response.status_code == status.HTTP_200_OK
-        json_response = response.json()
-        # we now also receive the other sequences, as the first one has been marked as completed
-        assert len(json_response["sequences"]) == 2
-        assert json_response["state"]["start-flow"]["step"] == 0
-        assert json_response["state"]["start-flow"]["completed"] is True
-
-        saved_states = list(UserPromptState.objects.filter(user=self.user))
-        assert len(saved_states) == 1
-        first_saved_state = list(saved_states)[0]
-        assert first_saved_state.step == 0
-        assert first_saved_state.completed is True
-
-        # ignores the local state as it is less recent
-        local_state = {
-            "start-flow": {
-                "sequence": "start-flow",
-                "last_updated_at": "2022-08-24T22:09:14.252Z",
-                "step": 1,
-                "completed": False,
-                "dismissed": False,
-            }
-        }
-        response = self.client.patch(f"/api/prompts/my_prompts", local_state, format="json")
-        assert response.status_code == status.HTTP_200_OK
-        json_response = response.json()
-        assert len(json_response["sequences"]) == 2
-        assert json_response["state"]["start-flow"]["step"] == 0
-        assert json_response["state"]["start-flow"]["completed"] is True
-
-    def test_webhook_rejects_missing_token(self):
-        # we send a webhook with a new sequence, but it's missing an api_token so it should get rejected
-        webhook_data = {
-            "emails": [],
-            "sequence": _webhook_prompt,
-        }
-        response = self.client.post("/api/prompts/webhook", webhook_data, format="json")
-        assert response.status_code == status.HTTP_401_UNAUTHORIZED
-
-    def test_webhook_rejects_get_request(self):
-        # we send a webhook with a GET call so it should get rejected
-        response = self.client.get("/api/prompts/webhook", format="json")
-        assert response.json()["code"] == "no_data"
-        assert response.status_code == status.HTTP_400_BAD_REQUEST
-
-    def test_webhook_invalid_data(self):
-        # we send a webhook with invalid data so it should get rejected
-        webhook_data = {
-            "api_key": self.team.api_token,
-            "emails": self.user.email,  # this should be a list
-            "sequence": {  # key is missing
-                "type": "one-off",
-                "path_match": ["/*"],
-                "status": "active",
-                "path_exclude": ["/ingestion", "/ingestion/*"],
-                "prompts": [
-                    {
-                        "step": 0,
-                        "type": "tooltip",
-                        "title": "Welcome to PostHog!",
-                        "text": "We have prepared a list of suggestions and resources to improve your experience with the tool. You can access it at any time by clicking on the question mark icon in the top right corner of the screen, and then selecting 'How to be successful with PostHog'.",
-                        "placement": "bottom-start",
-                        "reference": "help-button",
-                        "buttons": [
-                            {
-                                "action": "activation-checklist",
-                                "label": "Show me suggestions",
-                            }
-                        ],
-                    }
-                ],
-            },
-        }
-        response = self.client.post("/api/prompts/webhook", webhook_data, format="json")
-        assert response.json()["code"] == "invalid"
-        assert response.status_code == status.HTTP_400_BAD_REQUEST
-
-    def test_webhook_creates_sequence_and_state(self):
-        # we send a webhook with a new sequence, and we want to trigger it for a user
-        webhook_data = {
-            "api_key": self.team.api_token,
-            "emails": [self.user.email],
-            "sequence": _webhook_prompt,
-        }
-
-        # there is no sequence or prompt saved yet
-        saved_sequences = list(PromptSequence.objects.all())
-        assert len(saved_sequences) == 0
-        saved_prompts = list(Prompt.objects.all())
-        assert len(saved_prompts) == 0
-
-        response = self.client.post("/api/prompts/webhook", webhook_data, format="json")
-        assert response.status_code == status.HTTP_202_ACCEPTED
-        assert response.json() == {"success": True}
-
-        # assert that the sequence and prompt have been saved correctly matching the webhook data
-        saved_prompts = list(Prompt.objects.all())
-        assert len(saved_prompts) == 1
-        first_saved_prompt = list(saved_prompts)[0]
-        assert first_saved_prompt.step == 0
-        assert first_saved_prompt.type == "tooltip"
-        assert first_saved_prompt.title == "Welcome to PostHog!"
-        assert (
-            first_saved_prompt.text
-            == "We have prepared a list of suggestions and resources to improve your experience with the tool. You can access it at any time by clicking on the question mark icon in the top right corner of the screen, and then selecting 'How to be successful with PostHog'."
-        )
-        assert first_saved_prompt.placement == "top"
-        assert first_saved_prompt.reference is None
-        assert first_saved_prompt.buttons == []
-
-        saved_sequences = list(PromptSequence.objects.all())
-        assert len(saved_sequences) == 1
-        first_saved_sequence = list(saved_sequences)[0]
-        assert first_saved_sequence.key == "start-flow"
-        assert first_saved_sequence.type == "one-off"
-        assert first_saved_sequence.path_match == ["/*"]
-        assert first_saved_sequence.path_exclude == []
-        assert first_saved_sequence.status == "active"
-        assert first_saved_sequence.autorun is False
-        assert first_saved_sequence.must_have_completed.count() == 0
-        assert first_saved_prompt in first_saved_sequence.prompts.all()
-
-        # assert that the user prompt state has been created correctly, with step = None so that it triggers the first prompt on first load
-        saved_states = list(UserPromptState.objects.filter(user=self.user))
-        assert len(saved_states) == 1
-        first_saved_state = list(saved_states)[0]
-        assert first_saved_state.sequence == first_saved_sequence
-        assert first_saved_state.step is None
-        assert first_saved_state.completed is False
diff --git a/posthog/api/test/test_property_definition.py b/posthog/api/test/test_property_definition.py
index 512f43ce92d0c..3d68b73facd59 100644
--- a/posthog/api/test/test_property_definition.py
+++ b/posthog/api/test/test_property_definition.py
@@ -135,7 +135,7 @@ def test_cant_see_property_definitions_for_another_team(self):
         # Also can't fetch for a team to which the user doesn't have permissions
         response = self.client.get(f"/api/projects/{team.pk}/property_definitions/")
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEqual(response.json(), self.permission_denied_response())
+        self.assertEqual(response.json(), self.permission_denied_response("You don't have access to the project."))
 
     def test_query_property_definitions(self):
         # no search at all
diff --git a/posthog/api/test/test_team.py b/posthog/api/test/test_team.py
index 7f1df628558e4..b172a58863979 100644
--- a/posthog/api/test/test_team.py
+++ b/posthog/api/test/test_team.py
@@ -1,10 +1,12 @@
 import json
-from typing import List, cast
+import uuid
+from typing import List, cast, Dict, Optional
 from unittest import mock
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import MagicMock, call, patch, ANY
 
 from asgiref.sync import sync_to_async
 from django.core.cache import cache
+from freezegun import freeze_time
 from parameterized import parameterized
 from rest_framework import status
 from temporalio.service import RPCError
@@ -12,7 +14,7 @@
 from posthog.api.test.batch_exports.conftest import start_test_worker
 from posthog.temporal.common.schedule import describe_schedule
 from posthog.constants import AvailableFeature
-from posthog.models import EarlyAccessFeature
+from posthog.models import EarlyAccessFeature, ActivityLog
 from posthog.models.async_deletion.async_deletion import AsyncDeletion, DeletionType
 from posthog.models.dashboard import Dashboard
 from posthog.models.instance_setting import get_instance_setting
@@ -24,6 +26,22 @@
 
 
 class TestTeamAPI(APIBaseTest):
+    def _assert_activity_log(self, expected: List[Dict], team_id: Optional[int] = None) -> None:
+        if not team_id:
+            team_id = self.team.pk
+
+        starting_log_response = self.client.get(f"/api/projects/{team_id}/activity")
+        assert starting_log_response.status_code == 200
+        assert starting_log_response.json()["results"] == expected
+
+    def _assert_organization_activity_log(self, expected: List[Dict]) -> None:
+        starting_log_response = self.client.get(f"/api/organizations/{self.organization.pk}/activity")
+        assert starting_log_response.status_code == 200
+        assert starting_log_response.json()["results"] == expected
+
+    def _assert_activity_log_is_empty(self) -> None:
+        self._assert_activity_log([])
+
     def test_list_projects(self):
         response = self.client.get("/api/projects/")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -140,16 +158,49 @@ def test_cant_create_a_second_project_without_license(self):
             response_data,
         )
 
+    @freeze_time("2022-02-08")
     def test_update_project_timezone(self):
-        response = self.client.patch("/api/projects/@current/", {"timezone": "Europe/Istanbul"})
+        self._assert_activity_log_is_empty()
+
+        response = self.client.patch("/api/projects/@current/", {"timezone": "Europe/Lisbon"})
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         response_data = response.json()
         self.assertEqual(response_data["name"], self.team.name)
-        self.assertEqual(response_data["timezone"], "Europe/Istanbul")
+        self.assertEqual(response_data["timezone"], "Europe/Lisbon")
 
         self.team.refresh_from_db()
-        self.assertEqual(self.team.timezone, "Europe/Istanbul")
+        self.assertEqual(self.team.timezone, "Europe/Lisbon")
+
+        self._assert_activity_log(
+            [
+                {
+                    "activity": "updated",
+                    "created_at": "2022-02-08T00:00:00Z",
+                    "detail": {
+                        "changes": [
+                            {
+                                "action": "changed",
+                                "after": "Europe/Lisbon",
+                                "before": "UTC",
+                                "field": "timezone",
+                                "type": "Team",
+                            },
+                        ],
+                        "name": "Default Project",
+                        "short_id": None,
+                        "trigger": None,
+                        "type": None,
+                    },
+                    "item_id": str(self.team.pk),
+                    "scope": "Team",
+                    "user": {
+                        "email": "user1@posthog.com",
+                        "first_name": "",
+                    },
+                },
+            ]
+        )
 
     def test_update_test_filter_default_checked(self):
         response = self.client.patch("/api/projects/@current/", {"test_account_filters_default_checked": "true"})
@@ -202,6 +253,50 @@ def test_filter_permission(self):
             [{"key": "$current_url", "value": "test"}],
         )
 
+    @freeze_time("2022-02-08")
+    @patch("posthog.api.team.delete_bulky_postgres_data")
+    @patch("posthoganalytics.capture")
+    def test_delete_team_activity_log(self, mock_capture: MagicMock, mock_delete_bulky_postgres_data: MagicMock):
+        self.organization_membership.level = OrganizationMembership.Level.ADMIN
+        self.organization_membership.save()
+
+        team: Team = Team.objects.create_with_data(organization=self.organization)
+
+        response = self.client.delete(f"/api/projects/{team.id}")
+        assert response.status_code == 204
+
+        # activity log is queried in the context of the team
+        # and the team was deleted, so we can't (for now) view a deleted team activity via the API
+        # even though the activity log is recorded
+
+        deleted_team_activity_response = self.client.get(f"/api/projects/{team.id}/activity")
+        assert deleted_team_activity_response.status_code == status.HTTP_404_NOT_FOUND
+
+        # we can't query by API but can prove the log was recorded
+        activity = [a.__dict__ for a in ActivityLog.objects.filter(team_id=team.pk).all()]
+        assert activity == [
+            {
+                "_state": ANY,
+                "activity": "deleted",
+                "created_at": ANY,
+                "detail": {
+                    "changes": None,
+                    "name": "Default Project",
+                    "short_id": None,
+                    "trigger": None,
+                    "type": None,
+                },
+                "id": ANY,
+                "is_system": False,
+                "organization_id": ANY,
+                "team_id": team.pk,
+                "item_id": str(team.pk),
+                "scope": "Team",
+                "user_id": self.user.pk,
+                "was_impersonated": False,
+            },
+        ]
+
     @patch("posthog.api.team.delete_bulky_postgres_data")
     @patch("posthoganalytics.capture")
     def test_delete_team_own_second(self, mock_capture: MagicMock, mock_delete_bulky_postgres_data: MagicMock):
@@ -328,10 +423,13 @@ def test_delete_batch_exports(self):
             with self.assertRaises(RPCError):
                 describe_schedule(temporal, batch_export_id)
 
+    @freeze_time("2022-02-08")
     def test_reset_token(self):
         self.organization_membership.level = OrganizationMembership.Level.ADMIN
         self.organization_membership.save()
 
+        self._assert_activity_log_is_empty()
+
         self.team.api_token = "xyz"
         self.team.save()
 
@@ -344,6 +442,36 @@ def test_reset_token(self):
         self.assertEqual(response_data["api_token"], self.team.api_token)
         self.assertTrue(response_data["api_token"].startswith("phc_"))
 
+        self._assert_activity_log(
+            [
+                {
+                    "activity": "updated",
+                    "created_at": "2022-02-08T00:00:00Z",
+                    "detail": {
+                        "changes": [
+                            {
+                                "action": "changed",
+                                "after": None,
+                                "before": None,
+                                "field": "api_token",
+                                "type": "Team",
+                            },
+                        ],
+                        "name": "Default Project",
+                        "short_id": None,
+                        "trigger": None,
+                        "type": None,
+                    },
+                    "item_id": str(self.team.pk),
+                    "scope": "Team",
+                    "user": {
+                        "email": "user1@posthog.com",
+                        "first_name": "",
+                    },
+                },
+            ]
+        )
+
     def test_reset_token_insufficient_priviledges(self):
         self.team.api_token = "xyz"
         self.team.save()
@@ -416,6 +544,76 @@ def test_org_member_can_create_demo_project(self, mock_create_data_for_demo_team
         mock_create_data_for_demo_team.assert_called_once()
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
+    @freeze_time("2022-02-08")
+    def test_team_float_config_can_be_serialized_to_activity_log(self):
+        # regression test since this isn't true by default
+        response = self.client.patch(f"/api/projects/@current/", {"session_recording_sample_rate": 0.4})
+        assert response.status_code == status.HTTP_200_OK
+        self._assert_activity_log(
+            [
+                {
+                    "activity": "updated",
+                    "created_at": "2022-02-08T00:00:00Z",
+                    "detail": {
+                        "changes": [
+                            {
+                                "action": "created",
+                                "after": "0.4",
+                                "before": None,
+                                "field": "session_recording_sample_rate",
+                                "type": "Team",
+                            },
+                        ],
+                        "name": "Default Project",
+                        "short_id": None,
+                        "trigger": None,
+                        "type": None,
+                    },
+                    "item_id": str(self.team.pk),
+                    "scope": "Team",
+                    "user": {
+                        "email": "user1@posthog.com",
+                        "first_name": "",
+                    },
+                },
+            ]
+        )
+
+    @freeze_time("2022-02-08")
+    def test_team_creation_is_in_activity_log(self):
+        Team.objects.all().delete()
+
+        self.organization_membership.level = OrganizationMembership.Level.ADMIN
+        self.organization_membership.save()
+
+        team_name = str(uuid.uuid4())
+        response = self.client.post("/api/projects/", {"name": team_name, "is_demo": False})
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+        team_id = response.json()["id"]
+        self._assert_activity_log(
+            [
+                {
+                    "activity": "created",
+                    "created_at": "2022-02-08T00:00:00Z",
+                    "detail": {
+                        "changes": None,
+                        "name": team_name,
+                        "short_id": None,
+                        "trigger": None,
+                        "type": None,
+                    },
+                    "item_id": str(team_id),
+                    "scope": "Team",
+                    "user": {
+                        "email": "user1@posthog.com",
+                        "first_name": "",
+                    },
+                },
+            ],
+            team_id=team_id,
+        )
+
     def test_team_is_cached_on_create_and_update(self):
         Team.objects.all().delete()
         self.organization_membership.level = OrganizationMembership.Level.ADMIN
diff --git a/posthog/api/uploaded_media.py b/posthog/api/uploaded_media.py
index b8d4610f201cb..ccf0efcf441bd 100644
--- a/posthog/api/uploaded_media.py
+++ b/posthog/api/uploaded_media.py
@@ -13,14 +13,12 @@
     ValidationError,
 )
 from rest_framework.parsers import FormParser, MultiPartParser
-from rest_framework.permissions import IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from statshog.defaults.django import statsd
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import UploadedMedia
 from posthog.models.uploaded_media import ObjectStorageUnavailable
-from posthog.permissions import TeamMemberAccessPermission
 from posthog.storage import object_storage
 
 FOUR_MEGABYTES = 4 * 1024 * 1024
@@ -82,10 +80,9 @@ def download(request, *args, **kwargs) -> HttpResponse:
     )
 
 
-class MediaViewSet(StructuredViewSetMixin, viewsets.GenericViewSet):
+class MediaViewSet(TeamAndOrgViewSetMixin, viewsets.GenericViewSet):
     queryset = UploadedMedia.objects.all()
     parser_classes = (MultiPartParser, FormParser)
-    permission_classes = [IsAuthenticatedOrReadOnly, TeamMemberAccessPermission]
 
     @extend_schema(
         description="""
diff --git a/posthog/auth.py b/posthog/auth.py
index 062e7e48bb5c5..c9b87107b7104 100644
--- a/posthog/auth.py
+++ b/posthog/auth.py
@@ -143,8 +143,13 @@ def authenticate(self, request: Request):
             if not user.exists():
                 raise AuthenticationFailed(detail="User doesn't exist")
             return (user.first(), None)
+
         return None
 
+    # NOTE: This appears first in the authentication chain often so we want to define an authenticate_header to ensure 401 and not 403
+    def authenticate_header(self, request: Request):
+        return "Bearer"
+
 
 class JwtAuthentication(authentication.BaseAuthentication):
     """
diff --git a/posthog/batch_exports/http.py b/posthog/batch_exports/http.py
index ad98129126cc6..fc6b6319631a3 100644
--- a/posthog/batch_exports/http.py
+++ b/posthog/batch_exports/http.py
@@ -14,10 +14,9 @@
     ValidationError,
 )
 from rest_framework.pagination import CursorPagination
-from rest_framework.permissions import IsAuthenticated
 from rest_framework_dataclasses.serializers import DataclassSerializer
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.batch_exports.models import (
     BATCH_EXPORT_INTERVALS,
     BatchExportLogEntry,
@@ -49,7 +48,6 @@
     Team,
     User,
 )
-from posthog.permissions import OrganizationMemberPermissions, TeamMemberAccessPermission
 from posthog.temporal.common.client import sync_connect
 from posthog.utils import relative_date_parse
 
@@ -94,9 +92,8 @@ class RunsCursorPagination(CursorPagination):
     page_size = 100
 
 
-class BatchExportRunViewSet(StructuredViewSetMixin, viewsets.ReadOnlyModelViewSet):
+class BatchExportRunViewSet(TeamAndOrgViewSetMixin, viewsets.ReadOnlyModelViewSet):
     queryset = BatchExportRun.objects.all()
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     serializer_class = BatchExportRunSerializer
     pagination_class = RunsCursorPagination
 
@@ -340,9 +337,8 @@ def update(self, batch_export: BatchExport, validated_data: dict) -> BatchExport
         return batch_export
 
 
-class BatchExportViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class BatchExportViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = BatchExport.objects.all()
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
     serializer_class = BatchExportSerializer
 
     def get_queryset(self):
@@ -454,7 +450,6 @@ def perform_destroy(self, instance: BatchExport):
 
 
 class BatchExportOrganizationViewSet(BatchExportViewSet):
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_rewrite_rules = {"organization_id": "team__organization_id"}
 
 
@@ -463,8 +458,7 @@ class Meta:
         dataclass = BatchExportLogEntry
 
 
-class BatchExportLogViewSet(StructuredViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
+class BatchExportLogViewSet(TeamAndOrgViewSetMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = BatchExportLogEntrySerializer
 
     def get_queryset(self):
diff --git a/posthog/clickhouse/migrations/0052_session_replay_embeddings.py b/posthog/clickhouse/migrations/0052_session_replay_embeddings.py
new file mode 100644
index 0000000000000..2263bbbd63655
--- /dev/null
+++ b/posthog/clickhouse/migrations/0052_session_replay_embeddings.py
@@ -0,0 +1,12 @@
+from posthog.clickhouse.client.migration_tools import run_sql_with_exceptions
+from posthog.session_recordings.sql.session_replay_embeddings_sql import (
+    SESSION_REPLAY_EMBEDDINGS_TABLE_SQL,
+    DISTRIBUTED_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL,
+    WRITABLE_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL,
+)
+
+operations = [
+    run_sql_with_exceptions(WRITABLE_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL()),
+    run_sql_with_exceptions(DISTRIBUTED_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL()),
+    run_sql_with_exceptions(SESSION_REPLAY_EMBEDDINGS_TABLE_SQL()),
+]
diff --git a/posthog/clickhouse/migrations/0053_add_person_distinct_id_overrides_table.py b/posthog/clickhouse/migrations/0053_add_person_distinct_id_overrides_table.py
new file mode 100644
index 0000000000000..1889e4305d6ae
--- /dev/null
+++ b/posthog/clickhouse/migrations/0053_add_person_distinct_id_overrides_table.py
@@ -0,0 +1,6 @@
+from posthog.clickhouse.client.migration_tools import run_sql_with_exceptions
+from posthog.models.person.sql import PERSON_DISTINCT_ID_OVERRIDES_TABLE_SQL
+
+operations = [
+    run_sql_with_exceptions(PERSON_DISTINCT_ID_OVERRIDES_TABLE_SQL()),
+]
diff --git a/posthog/clickhouse/schema.py b/posthog/clickhouse/schema.py
index e6ed91af60c97..b40934a427a8a 100644
--- a/posthog/clickhouse/schema.py
+++ b/posthog/clickhouse/schema.py
@@ -56,6 +56,7 @@
     PERSON_OVERRIDES_CREATE_TABLE_SQL,
     PERSONS_DISTINCT_ID_TABLE_SQL,
     PERSON_DISTINCT_ID2_TABLE_SQL,
+    PERSON_DISTINCT_ID_OVERRIDES_TABLE_SQL,
     PLUGIN_LOG_ENTRIES_TABLE_SQL,
     SESSION_RECORDING_EVENTS_TABLE_SQL,
     INGESTION_WARNINGS_DATA_TABLE_SQL,
diff --git a/posthog/clickhouse/test/__snapshots__/test_schema.ambr b/posthog/clickhouse/test/__snapshots__/test_schema.ambr
index c445d3dbbe5e5..6188a647a214e 100644
--- a/posthog/clickhouse/test/__snapshots__/test_schema.ambr
+++ b/posthog/clickhouse/test/__snapshots__/test_schema.ambr
@@ -1237,6 +1237,31 @@
   
   '''
 # ---
+# name: test_create_table_query[person_distinct_id_overrides]
+  '''
+  
+  CREATE TABLE IF NOT EXISTS person_distinct_id_overrides ON CLUSTER 'posthog'
+  (
+      team_id Int64,
+      distinct_id VARCHAR,
+      person_id UUID,
+      is_deleted Int8,
+      version Int64
+      
+      
+  , _timestamp DateTime
+  , _offset UInt64
+  , _partition UInt64
+  
+      , INDEX kafka_timestamp_minmax_person_distinct_id_overrides _timestamp TYPE minmax GRANULARITY 3
+      
+  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id_overrides', '{replica}-{shard}', version)
+  
+      ORDER BY (team_id, distinct_id)
+      SETTINGS index_granularity = 512
+      
+  '''
+# ---
 # name: test_create_table_query[person_mv]
   '''
   
@@ -2106,6 +2131,31 @@
   
   '''
 # ---
+# name: test_create_table_query_replicated_and_storage[person_distinct_id_overrides]
+  '''
+  
+  CREATE TABLE IF NOT EXISTS person_distinct_id_overrides ON CLUSTER 'posthog'
+  (
+      team_id Int64,
+      distinct_id VARCHAR,
+      person_id UUID,
+      is_deleted Int8,
+      version Int64
+      
+      
+  , _timestamp DateTime
+  , _offset UInt64
+  , _partition UInt64
+  
+      , INDEX kafka_timestamp_minmax_person_distinct_id_overrides _timestamp TYPE minmax GRANULARITY 3
+      
+  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id_overrides', '{replica}-{shard}', version)
+  
+      ORDER BY (team_id, distinct_id)
+      SETTINGS index_granularity = 512
+      
+  '''
+# ---
 # name: test_create_table_query_replicated_and_storage[person_overrides]
   '''
   
diff --git a/posthog/cloud_utils.py b/posthog/cloud_utils.py
index cc0aec67d15ff..6e6aaeabf63b7 100644
--- a/posthog/cloud_utils.py
+++ b/posthog/cloud_utils.py
@@ -12,38 +12,8 @@
 instance_license_cached: Optional["License"] = None
 
 
-# NOTE: This is cached for the lifetime of the instance but this is not an issue as the value is not expected to change
-def is_cloud():
-    global is_cloud_cached
-
-    if not settings.EE_AVAILABLE:
-        return False
-
-    if isinstance(is_cloud_cached, bool):
-        return is_cloud_cached
-
-    if not is_cloud_cached:
-        try:
-            # NOTE: Important not to import this from ee.models as that will cause a circular import for celery
-            from ee.models.license import License
-
-            # TRICKY - The license table may not exist if a migration is running
-            license = License.objects.first_valid()
-            is_cloud_cached = license.plan == "cloud" if license else False
-        except ProgrammingError:
-            # TRICKY - The license table may not exist if a migration is running
-            pass
-        except Exception as e:
-            print("ERROR: Unable to check license", e)  # noqa: T201
-            capture_exception(e)
-
-    return is_cloud_cached
-
-
-# NOTE: This is purely for testing purposes
-def TEST_clear_cloud_cache(value: Optional[bool] = None):
-    global is_cloud_cached
-    is_cloud_cached = value
+def is_cloud() -> bool:
+    return bool(settings.CLOUD_DEPLOYMENT)
 
 
 def get_cached_instance_license() -> Optional["License"]:
diff --git a/posthog/conftest.py b/posthog/conftest.py
index 2bd97894ddf09..d1feb049174e4 100644
--- a/posthog/conftest.py
+++ b/posthog/conftest.py
@@ -5,7 +5,7 @@
 from infi.clickhouse_orm import Database
 
 from posthog.client import sync_execute
-from posthog.test.base import TestMixin, run_clickhouse_statement_in_parallel
+from posthog.test.base import PostHogTestCase, run_clickhouse_statement_in_parallel
 
 
 def create_clickhouse_tables(num_tables: int):
@@ -124,7 +124,7 @@ def django_db_setup(django_db_setup, django_db_keepdb):
 
 @pytest.fixture
 def base_test_mixin_fixture():
-    kls = TestMixin()
+    kls = PostHogTestCase()
     kls.setUp()
     kls.setUpTestData()
 
diff --git a/posthog/git.py b/posthog/git.py
index c6fb03badf8ee..501b648ca3e9c 100644
--- a/posthog/git.py
+++ b/posthog/git.py
@@ -1,7 +1,14 @@
 import subprocess
 from typing import Optional
 
-# In production images, the two functions below are overwritten by container-images-cd.yml
+_git_commit_baked_in: Optional[str] = None
+try:
+    # Docker containers should have a commit.txt file in the base directory with the git
+    # commit hash used to generate them.
+    with open("commit.txt") as f:
+        _git_commit_baked_in = f.read().strip()
+except FileNotFoundError:
+    pass
 
 
 def get_git_commit() -> Optional[str]:
@@ -9,6 +16,8 @@ def get_git_commit() -> Optional[str]:
 
     Example: get_git_commit() => "4ff54c8d"
     """
+    if _git_commit_baked_in:
+        return _git_commit_baked_in
     try:
         return subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode("utf-8").strip()
     except Exception:
diff --git a/posthog/hogql/autocomplete.py b/posthog/hogql/autocomplete.py
index 8aba7802b256e..3a86ecd3fc3ae 100644
--- a/posthog/hogql/autocomplete.py
+++ b/posthog/hogql/autocomplete.py
@@ -1,4 +1,4 @@
-from copy import copy
+from copy import copy, deepcopy
 from typing import Callable, Dict, List, Optional, cast
 from posthog.hogql.context import HogQLContext
 from posthog.hogql.database.database import create_hogql_database
@@ -82,6 +82,29 @@ def constant_type_to_database_field(constant_type: ConstantType, name: str) -> D
     return DatabaseField(name=name)
 
 
+def convert_field_or_table_to_type_string(field_or_table: FieldOrTable) -> str | None:
+    if isinstance(field_or_table, ast.BooleanDatabaseField):
+        return "Boolean"
+    if isinstance(field_or_table, ast.IntegerDatabaseField):
+        return "Integer"
+    if isinstance(field_or_table, ast.FloatDatabaseField):
+        return "Float"
+    if isinstance(field_or_table, ast.StringDatabaseField):
+        return "String"
+    if isinstance(field_or_table, ast.DateTimeDatabaseField):
+        return "DateTime"
+    if isinstance(field_or_table, ast.DateDatabaseField):
+        return "Date"
+    if isinstance(field_or_table, ast.StringJSONDatabaseField):
+        return "Object"
+    if isinstance(field_or_table, ast.ExpressionField):
+        return "Expression"
+    if isinstance(field_or_table, (ast.Table, ast.LazyJoin)):
+        return "Table"
+
+    return None
+
+
 def get_table(context: HogQLContext, join_expr: ast.JoinExpr, ctes: Optional[Dict[str, CTE]]) -> None | Table:
     assert context.database is not None
 
@@ -160,11 +183,81 @@ def to_printed_hogql(self):
     return None
 
 
+def get_tables_aliases(query: ast.SelectQuery, context: HogQLContext) -> Dict[str, ast.Table]:
+    tables: Dict[str, ast.Table] = {}
+
+    if query.select_from is not None and query.select_from.alias is not None:
+        table = get_table(context, query.select_from, query.ctes)
+        if table is not None:
+            tables[query.select_from.alias] = table
+
+    if query.select_from is not None and query.select_from.next_join is not None:
+        next_join: ast.JoinExpr | None = query.select_from.next_join
+        while next_join is not None:
+            if next_join.alias is not None:
+                table = get_table(context, next_join, query.ctes)
+                if table is not None:
+                    tables[next_join.alias] = table
+            next_join = next_join.next_join
+
+    return tables
+
+
+# Replaces all ast.FieldTraverser with the underlying node
+def resolve_table_field_traversers(table: Table) -> Table:
+    new_table = deepcopy(table)
+    new_fields: Dict[str, FieldOrTable] = {}
+    for key, field in list(new_table.fields.items()):
+        if not isinstance(field, ast.FieldTraverser):
+            new_fields[key] = field
+            continue
+
+        current_table_or_field: FieldOrTable = new_table
+        for chain in field.chain:
+            if isinstance(current_table_or_field, Table):
+                chain_field = current_table_or_field.fields.get(chain)
+            elif isinstance(current_table_or_field, LazyJoin):
+                chain_field = current_table_or_field.join_table.fields.get(chain)
+            elif isinstance(current_table_or_field, DatabaseField):
+                chain_field = current_table_or_field
+            else:
+                # Cant find the field, default back
+                new_fields[key] = field
+                break
+
+            if chain_field is not None:
+                current_table_or_field = chain_field
+                new_fields[key] = chain_field
+
+    new_table.fields = new_fields
+    return new_table
+
+
+def append_table_field_to_response(table: Table, suggestions: List[AutocompleteCompletionItem]) -> None:
+    keys: List[str] = []
+    details: List[str | None] = []
+    table_fields = list(table.fields.items())
+    for field_name, field_or_table in table_fields:
+        keys.append(field_name)
+        details.append(convert_field_or_table_to_type_string(field_or_table))
+
+    extend_responses(keys=keys, suggestions=suggestions, details=details)
+
+    available_functions = ALL_EXPOSED_FUNCTION_NAMES
+    extend_responses(
+        available_functions,
+        suggestions,
+        Kind.Function,
+        insert_text=lambda key: f"{key}()",
+    )
+
+
 def extend_responses(
     keys: List[str],
     suggestions: List[AutocompleteCompletionItem],
     kind: Kind = Kind.Variable,
     insert_text: Optional[Callable[[str], str]] = None,
+    details: Optional[List[str | None]] = None,
 ) -> None:
     suggestions.extend(
         [
@@ -172,8 +265,9 @@ def extend_responses(
                 insertText=insert_text(key) if insert_text is not None else key,
                 label=key,
                 kind=kind,
+                detail=details[index] if details is not None else None,
             )
-            for key in keys
+            for index, key in enumerate(keys)
         ]
     )
 
@@ -184,7 +278,7 @@ def extend_responses(
 
 # TODO: Support ast.SelectUnionQuery nodes
 def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocompleteResponse:
-    response = HogQLAutocompleteResponse(suggestions=[])
+    response = HogQLAutocompleteResponse(suggestions=[], incomplete_list=False)
 
     database = create_hogql_database(team_id=team.pk, team_arg=team)
     context = HogQLContext(team_id=team.pk, team=team, database=database)
@@ -208,7 +302,10 @@ def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocom
 
             select_ast = parse_select(query.select)
             if query.filters:
-                select_ast = cast(ast.SelectQuery, replace_filters(select_ast, query.filters, team))
+                try:
+                    select_ast = cast(ast.SelectQuery, replace_filters(select_ast, query.filters, team))
+                except Exception:
+                    pass
 
             if isinstance(select_ast, ast.SelectQuery):
                 ctes = select_ast.ctes
@@ -233,8 +330,6 @@ def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocom
                 and nearest_select.select_from is not None
                 and not isinstance(parent_node, ast.JoinExpr)
             ):
-                # TODO: add logic for FieldTraverser field types
-
                 # Handle fields
                 table = get_table(context, nearest_select.select_from, ctes)
                 if table is None:
@@ -245,27 +340,34 @@ def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocom
                 for index, chain_part in enumerate(node.chain):
                     # Return just the table alias
                     if table_has_alias and index == 0 and chain_len == 1:
-                        extend_responses([str(chain_part)], response.suggestions, Kind.Folder)
+                        table_aliases = list(get_tables_aliases(nearest_select, context).keys())
+                        extend_responses(
+                            keys=table_aliases,
+                            suggestions=response.suggestions,
+                            kind=Kind.Folder,
+                            details=["Table"] * len(table_aliases),  # type: ignore
+                        )
                         break
 
                     if table_has_alias and index == 0:
-                        continue
+                        tables = get_tables_aliases(nearest_select, context)
+                        aliased_table = tables.get(str(chain_part))
+                        if aliased_table is not None:
+                            last_table = aliased_table
+                            continue
+                        else:
+                            # Dont continue if the alias is not found in the query
+                            break
 
                     # Ignore last chain part, it's likely an incomplete word or added characters
                     is_last_part = index >= (chain_len - 2)
 
+                    # Replaces all ast.FieldTraverser with the underlying node
+                    last_table = resolve_table_field_traversers(last_table)
+
                     if is_last_part:
                         if last_table.fields.get(str(chain_part)) is None:
-                            fields = list(table.fields.keys())
-                            extend_responses(fields, response.suggestions)
-
-                            available_functions = ALL_EXPOSED_FUNCTION_NAMES
-                            extend_responses(
-                                available_functions,
-                                response.suggestions,
-                                Kind.Function,
-                                insert_text=lambda key: f"{key}()",
-                            )
+                            append_table_field_to_response(table=last_table, suggestions=response.suggestions)
                             break
 
                         field = last_table.fields[str(chain_part)]
@@ -285,19 +387,36 @@ def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocom
                                 if match_term == MATCH_ANY_CHARACTER:
                                     match_term = ""
 
-                                properties = PropertyDefinition.objects.filter(
+                                property_query = PropertyDefinition.objects.filter(
                                     name__contains=match_term,
                                     team_id=team.pk,
                                     type=property_type,
-                                )[:PROPERTY_DEFINITION_LIMIT].values("name")
+                                )
+
+                                total_property_count = property_query.count()
+                                properties = property_query[:PROPERTY_DEFINITION_LIMIT].values("name", "property_type")
 
-                                extend_responses([prop["name"] for prop in properties], response.suggestions)
+                                extend_responses(
+                                    keys=[prop["name"] for prop in properties],
+                                    suggestions=response.suggestions,
+                                    details=[prop["property_type"] for prop in properties],
+                                )
+                                response.incomplete_list = total_property_count > PROPERTY_DEFINITION_LIMIT
                         elif isinstance(field, VirtualTable) or isinstance(field, LazyTable):
-                            fields = list(last_table.fields.keys())
-                            extend_responses(fields, response.suggestions)
+                            fields = list(last_table.fields.items())
+                            extend_responses(
+                                keys=[key for key, field in fields],
+                                suggestions=response.suggestions,
+                                details=[convert_field_or_table_to_type_string(field) for key, field in fields],
+                            )
                         elif isinstance(field, LazyJoin):
-                            fields = list(field.join_table.fields.keys())
-                            extend_responses(fields, response.suggestions)
+                            fields = list(field.join_table.fields.items())
+
+                            extend_responses(
+                                keys=[key for key, field in fields],
+                                suggestions=response.suggestions,
+                                details=[convert_field_or_table_to_type_string(field) for key, field in fields],
+                            )
                         break
                     else:
                         field = last_table.fields[str(chain_part)]
@@ -309,7 +428,12 @@ def get_hogql_autocomplete(query: HogQLAutocomplete, team: Team) -> HogQLAutocom
                 # Handle table names
                 if len(node.chain) == 1:
                     table_names = database.get_all_tables()
-                    extend_responses(table_names, response.suggestions, Kind.Folder)
+                    extend_responses(
+                        keys=table_names,
+                        suggestions=response.suggestions,
+                        kind=Kind.Folder,
+                        details=["Table"] * len(table_names),  # type: ignore
+                    )
         except Exception:
             pass
 
diff --git a/posthog/hogql/filters.py b/posthog/hogql/filters.py
index aebe2016367d6..246d0e252981e 100644
--- a/posthog/hogql/filters.py
+++ b/posthog/hogql/filters.py
@@ -82,6 +82,10 @@ def visit_placeholder(self, node):
                     )
                 )
 
+            if self.filters.filterTestAccounts:
+                for prop in self.team.test_account_filters or []:
+                    exprs.append(property_to_expr(prop, self.team))
+
             if len(exprs) == 0:
                 return ast.Constant(value=True)
             if len(exprs) == 1:
diff --git a/posthog/hogql/placeholders.py b/posthog/hogql/placeholders.py
index bd63ce32754c0..ec0a75f04e5bb 100644
--- a/posthog/hogql/placeholders.py
+++ b/posthog/hogql/placeholders.py
@@ -20,6 +20,9 @@ def __init__(self):
         super().__init__()
         self.found: set[str] = set()
 
+    def visit_cte(self, node: ast.CTE):
+        super().visit(node.expr)
+
     def visit_placeholder(self, node: ast.Placeholder):
         self.found.add(node.field)
 
diff --git a/posthog/hogql/printer.py b/posthog/hogql/printer.py
index 74341e76b6839..93a8ec42bdc4e 100644
--- a/posthog/hogql/printer.py
+++ b/posthog/hogql/printer.py
@@ -1075,8 +1075,10 @@ def visit_window_expr(self, node: ast.WindowExpr):
             if len(node.partition_by) == 0:
                 raise HogQLException("PARTITION BY must have at least one argument")
             strings.append("PARTITION BY")
+            columns = []
             for expr in node.partition_by:
-                strings.append(self.visit(expr))
+                columns.append(self.visit(expr))
+            strings.append(", ".join(columns))
 
         if node.order_by is not None:
             if len(node.order_by) == 0:
diff --git a/posthog/hogql/test/test_autocomplete.py b/posthog/hogql/test/test_autocomplete.py
index f644ae7337e4d..46eb8a1cd0394 100644
--- a/posthog/hogql/test/test_autocomplete.py
+++ b/posthog/hogql/test/test_autocomplete.py
@@ -148,3 +148,81 @@ def test_autocomplete_cte_constant_type(self):
         assert results.suggestions[0].label == "potato"
         assert "event" not in [suggestion.label for suggestion in results.suggestions]
         assert "properties" not in [suggestion.label for suggestion in results.suggestions]
+
+    def test_autocomplete_field_traversers(self):
+        query = "select person. from events"
+        results = self._query_response(query=query, start=14, end=14)
+        assert len(results.suggestions) != 0
+
+    def test_autocomplete_table_alias(self):
+        query = "select  from events e"
+        results = self._query_response(query=query, start=7, end=7)
+        assert len(results.suggestions) != 0
+        assert results.suggestions[0].label == "e"
+
+    def test_autocomplete_complete_list(self):
+        query = "select event from events"
+        results = self._query_response(query=query, start=7, end=12)
+        assert results.incomplete_list is False
+
+    def test_autocomplete_properties_list_with_under_220_properties(self):
+        for index in range(20):
+            PropertyDefinition.objects.create(
+                team=self.team,
+                name=f"some_event_value_{index}",
+                property_type="String",
+                type=PropertyDefinition.Type.EVENT,
+            )
+
+        query = "select properties. from events"
+        results = self._query_response(query=query, start=18, end=18)
+        assert results.incomplete_list is False
+
+    def test_autocomplete_properties_list_with_over_220_properties(self):
+        for index in range(221):
+            PropertyDefinition.objects.create(
+                team=self.team,
+                name=f"some_event_value_{index}",
+                property_type="String",
+                type=PropertyDefinition.Type.EVENT,
+            )
+
+        query = "select properties. from events"
+        results = self._query_response(query=query, start=18, end=18)
+        assert results.incomplete_list is True
+
+    def test_autocomplete_joined_tables(self):
+        query = "select p. from events e left join persons p on e.person_id = p.id"
+        results = self._query_response(query=query, start=9, end=9)
+
+        assert len(results.suggestions) != 0
+
+        keys = list(PERSONS_FIELDS.keys())
+
+        for index, key in enumerate(keys):
+            assert results.suggestions[index].label == key
+
+    def test_autocomplete_joined_table_contraints(self):
+        query = "select p.id from events e left join persons p on e.person_id = p."
+        results = self._query_response(query=query, start=65, end=65)
+
+        assert len(results.suggestions) != 0
+
+        keys = list(PERSONS_FIELDS.keys())
+
+        for index, key in enumerate(keys):
+            assert results.suggestions[index].label == key
+
+    def test_autocomplete_joined_tables_aliases(self):
+        query = "select  from events e left join persons p on e.person_id = p.id"
+        results = self._query_response(query=query, start=7, end=7)
+
+        assert len(results.suggestions) == 2
+        assert results.suggestions[0].label == "e"
+        assert results.suggestions[1].label == "p"
+
+    def test_autocomplete_non_existing_alias(self):
+        query = "select o. from events e"
+        results = self._query_response(query=query, start=9, end=9)
+
+        assert len(results.suggestions) == 0
diff --git a/posthog/hogql/test/test_filters.py b/posthog/hogql/test/test_filters.py
index 98b319bb31694..951d5814f213a 100644
--- a/posthog/hogql/test/test_filters.py
+++ b/posthog/hogql/test/test_filters.py
@@ -31,7 +31,7 @@ def _print_ast(self, node: ast.Expr):
             context=HogQLContext(team_id=self.team.pk, enable_select_queries=True),
         )
 
-    def test_replace_filters(self):
+    def test_replace_filters_empty(self):
         select = replace_filters(self._parse_select("SELECT event FROM events"), HogQLFilters(), self.team)
         self.assertEqual(self._print_ast(select), "SELECT event FROM events LIMIT 10000")
 
@@ -42,6 +42,7 @@ def test_replace_filters(self):
         )
         self.assertEqual(self._print_ast(select), "SELECT event FROM events WHERE true LIMIT 10000")
 
+    def test_replace_filters_date_range(self):
         select = replace_filters(
             self._parse_select("SELECT event FROM events where {filters}"),
             HogQLFilters(dateRange=DateRange(date_from="2020-02-02")),
@@ -62,6 +63,7 @@ def test_replace_filters(self):
             "SELECT event FROM events WHERE less(timestamp, toDateTime('2020-02-02 00:00:00.000000')) LIMIT 10000",
         )
 
+    def test_replace_filters_event_property(self):
         select = replace_filters(
             self._parse_select("SELECT event FROM events where {filters}"),
             HogQLFilters(
@@ -74,6 +76,7 @@ def test_replace_filters(self):
             "SELECT event FROM events WHERE equals(properties.random_uuid, '123') LIMIT 10000",
         )
 
+    def test_replace_filters_person_property(self):
         select = replace_filters(
             self._parse_select("SELECT event FROM events where {filters}"),
             HogQLFilters(
@@ -100,3 +103,24 @@ def test_replace_filters(self):
             self._print_ast(select),
             "SELECT event FROM events WHERE and(equals(properties.random_uuid, '123'), equals(person.properties.random_uuid, '123')) LIMIT 10000",
         )
+
+    def test_replace_filters_test_accounts(self):
+        self.team.test_account_filters = [
+            {
+                "key": "email",
+                "type": "person",
+                "value": "posthog.com",
+                "operator": "not_icontains",
+            }
+        ]
+        self.team.save()
+
+        select = replace_filters(
+            self._parse_select("SELECT event FROM events where {filters}"),
+            HogQLFilters(filterTestAccounts=True),
+            self.team,
+        )
+        self.assertEqual(
+            self._print_ast(select),
+            "SELECT event FROM events WHERE notILike(person.properties.email, '%posthog.com%') LIMIT 10000",
+        )
diff --git a/posthog/hogql/test/test_placeholders.py b/posthog/hogql/test/test_placeholders.py
index 88c92ebfc8fe8..752400776bcc4 100644
--- a/posthog/hogql/test/test_placeholders.py
+++ b/posthog/hogql/test/test_placeholders.py
@@ -1,6 +1,7 @@
+from typing import cast
 from posthog.hogql import ast
 from posthog.hogql.errors import HogQLException
-from posthog.hogql.parser import parse_expr
+from posthog.hogql.parser import parse_expr, parse_select
 from posthog.hogql.placeholders import replace_placeholders, find_placeholders
 from posthog.test.base import BaseTest
 
@@ -69,3 +70,16 @@ def test_assert_no_placeholders(self):
             "Placeholders, such as {foo}, are not supported in this context",
             str(context.exception),
         )
+
+    def test_replace_placeholders_with_cte(self):
+        expr = cast(ast.SelectQuery, parse_select("with test as (select {foo}) select * from test"))
+
+        assert expr.ctes is not None and expr.ctes["test"] is not None
+        assert isinstance(expr.ctes["test"].expr, ast.SelectQuery)
+        assert isinstance(expr.ctes["test"].expr.select[0], ast.Placeholder)
+
+        expr2 = cast(ast.SelectQuery, replace_placeholders(expr, {"foo": ast.Constant(value=1)}))
+
+        assert expr2.ctes is not None and expr2.ctes["test"] is not None
+        assert isinstance(expr2.ctes["test"].expr, ast.SelectQuery)
+        assert isinstance(expr2.ctes["test"].expr.select[0], ast.Constant)
diff --git a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
index 98abb1ceb6030..9ff7f8ee0ab49 100644
--- a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
+++ b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
@@ -31,7 +31,7 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [2]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [12]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
   WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
@@ -42,7 +42,7 @@
   FROM events LEFT JOIN (
   SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
   FROM static_cohort_people 
-  WHERE in(cohort_id, [2])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE in(cohort_id, [12])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
   WHERE and(1, equals(__in_cohort.matched, 1)) 
   LIMIT 100
   '''
@@ -55,7 +55,7 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [3]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [13]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
   WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
@@ -66,7 +66,7 @@
   FROM events LEFT JOIN (
   SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
   FROM static_cohort_people 
-  WHERE in(cohort_id, [3])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE in(cohort_id, [13])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
   WHERE and(1, equals(__in_cohort.matched, 1)) 
   LIMIT 100
   '''
diff --git a/posthog/hogql/visitor.py b/posthog/hogql/visitor.py
index 5eb93400ce555..9acb6fec87db7 100644
--- a/posthog/hogql/visitor.py
+++ b/posthog/hogql/visitor.py
@@ -115,6 +115,9 @@ def visit_join_expr(self, node: ast.JoinExpr):
     def visit_select_query(self, node: ast.SelectQuery):
         # :TRICKY: when adding new fields, also add them to visit_select_query of resolver.py
         self.visit(node.select_from)
+        if node.ctes is not None:
+            for expr in list(node.ctes.values()):
+                self.visit(expr)
         for expr in node.array_join_list or []:
             self.visit(expr)
         for expr in node.select or []:
diff --git a/posthog/hogql_queries/events_query_runner.py b/posthog/hogql_queries/events_query_runner.py
index df88a1c48d162..b97fc06ab9d24 100644
--- a/posthog/hogql_queries/events_query_runner.py
+++ b/posthog/hogql_queries/events_query_runner.py
@@ -116,6 +116,10 @@ def to_query(self) -> ast.SelectQuery:
                                 timings=self.timings,
                             )
                         )
+                if self.query.filterTestAccounts:
+                    with self.timings.measure("test_account_filters"):
+                        for prop in self.team.test_account_filters or []:
+                            where_exprs.append(property_to_expr(prop, self.team))
 
             with self.timings.measure("timestamps"):
                 # prevent accidentally future events from being visible by default
diff --git a/posthog/hogql_queries/insights/funnels/__init__.py b/posthog/hogql_queries/insights/funnels/__init__.py
index d6cddab2ba293..37061f5d8a71b 100644
--- a/posthog/hogql_queries/insights/funnels/__init__.py
+++ b/posthog/hogql_queries/insights/funnels/__init__.py
@@ -1,3 +1,4 @@
 from .base import FunnelBase
 from .funnel import Funnel
 from .funnel_strict import FunnelStrict
+from .funnel_unordered import FunnelUnordered
diff --git a/posthog/hogql_queries/insights/funnels/base.py b/posthog/hogql_queries/insights/funnels/base.py
index 3278f0c236f77..0ec978f692b57 100644
--- a/posthog/hogql_queries/insights/funnels/base.py
+++ b/posthog/hogql_queries/insights/funnels/base.py
@@ -1,19 +1,35 @@
 from abc import ABC
+from functools import cached_property
 from typing import Any, Dict, List, Optional, Tuple, cast
 import uuid
 from posthog.clickhouse.materialized_columns.column import ColumnName
+from posthog.constants import BREAKDOWN_VALUES_LIMIT
 from posthog.hogql import ast
-from posthog.hogql.parser import parse_expr
+from posthog.hogql.parser import parse_expr, parse_select
 from posthog.hogql.property import action_to_expr, property_to_expr
+from posthog.hogql.query import execute_hogql_query
 from posthog.hogql_queries.insights.funnels.funnel_event_query import FunnelEventQuery
 from posthog.hogql_queries.insights.funnels.funnel_query_context import FunnelQueryContext
-from posthog.hogql_queries.insights.funnels.utils import funnel_window_interval_unit_to_sql
+from posthog.hogql_queries.insights.funnels.utils import (
+    funnel_window_interval_unit_to_sql,
+    get_breakdown_expr,
+)
 from posthog.hogql_queries.insights.utils.entities import is_equal, is_superset
 from posthog.models.action.action import Action
+from posthog.models.cohort.cohort import Cohort
 from posthog.models.property.property import PropertyName
 from posthog.queries.util import correct_result_for_sampling
-from posthog.schema import ActionsNode, EventsNode, FunnelExclusionActionsNode
+from posthog.queries.breakdown_props import ALL_USERS_COHORT_ID, get_breakdown_cohort_name
+from posthog.schema import (
+    ActionsNode,
+    BreakdownAttributionType,
+    BreakdownType,
+    EventsNode,
+    FunnelExclusionActionsNode,
+    StepOrderValue,
+)
 from posthog.types import EntityNode, ExclusionEntityNode
+from rest_framework.exceptions import ValidationError
 
 
 class FunnelBase(ABC):
@@ -45,13 +61,217 @@ def get_step_counts_query(self) -> str:
     def get_step_counts_without_aggregation_query(self) -> str:
         raise NotImplementedError()
 
-    def _format_results(self, results) -> List[Dict[str, Any]]:
-        breakdownFilter = self.context.breakdownFilter
+    @cached_property
+    def breakdown_cohorts(self) -> List[Cohort]:
+        team, breakdown = self.context.team, self.context.breakdown
+
+        if isinstance(breakdown, list):
+            cohorts = Cohort.objects.filter(team_id=team.pk, pk__in=[b for b in breakdown if b != "all"])
+        else:
+            cohorts = Cohort.objects.filter(team_id=team.pk, pk=breakdown)
+
+        return list(cohorts)
+
+    @cached_property
+    def breakdown_cohorts_ids(self) -> List[int]:
+        breakdown = self.context.breakdown
+
+        ids = [int(cohort.pk) for cohort in self.breakdown_cohorts]
+
+        if isinstance(breakdown, list) and "all" in breakdown:
+            ids.append(ALL_USERS_COHORT_ID)
+
+        return ids
+
+    @cached_property
+    def breakdown_values(self) -> List[int] | List[str] | List[List[str]]:
+        # """
+        # Returns the top N breakdown prop values for event/person breakdown
+
+        # e.g. for Browser with limit 3 might return ['Chrome', 'Safari', 'Firefox', 'Other']
+        # """
+        team, query, funnelsFilter, breakdownType, breakdownFilter, breakdownAttributionType = (
+            self.context.team,
+            self.context.query,
+            self.context.funnelsFilter,
+            self.context.breakdownType,
+            self.context.breakdownFilter,
+            self.context.breakdownAttributionType,
+        )
+
+        use_all_funnel_entities = (
+            breakdownAttributionType
+            in [
+                BreakdownAttributionType.first_touch,
+                BreakdownAttributionType.last_touch,
+            ]
+            or funnelsFilter.funnelOrderType == StepOrderValue.unordered
+        )
+        first_entity = query.series[0]
+        target_entity = first_entity
+        if breakdownAttributionType == BreakdownAttributionType.step:
+            assert isinstance(funnelsFilter.breakdownAttributionValue, int)
+            target_entity = query.series[funnelsFilter.breakdownAttributionValue]
+
+        if breakdownType == "cohort":
+            return self.breakdown_cohorts_ids
+        else:
+            # get query params
+            breakdown_expr = self._get_breakdown_expr()
+            breakdown_limit_or_default = breakdownFilter.breakdown_limit or BREAKDOWN_VALUES_LIMIT
+            offset = 0
+
+            funnel_event_query = FunnelEventQuery(context=self.context)
+
+            if use_all_funnel_entities:
+                entity_expr = funnel_event_query._entity_expr(skip_entity_filter=False)
+                prop_exprs = funnel_event_query._properties_expr()
+            else:
+                entity_expr = None
+                # TODO implement for strict and ordered funnels
+                # entity_params, entity_format_params = get_entity_filtering_params(
+                #     allowed_entities=[target_entity],
+                #     team_id=team.pk,
+                #     table_name="e",
+                #     person_id_joined_alias=person_id_joined_alias,
+                #     person_properties_mode=person_properties_mode,
+                #     hogql_context=filter.hogql_context,
+                # )
+
+                if target_entity.properties:
+                    prop_exprs = [property_to_expr(target_entity.properties, team)]
+                else:
+                    prop_exprs = []
+
+            where_exprs: List[ast.Expr | None] = [
+                # entity filter
+                entity_expr,
+                # prop filter
+                *prop_exprs,
+                # date range filter
+                funnel_event_query._date_range_expr(),
+                # null persons filter
+                parse_expr("notEmpty(e.person_id)"),
+            ]
+
+            # build query
+            values_query = ast.SelectQuery(
+                select=[ast.Alias(alias="value", expr=breakdown_expr), parse_expr("count(*) as count")],
+                select_from=ast.JoinExpr(
+                    table=ast.Field(chain=["events"]),
+                    alias="e",
+                ),
+                where=ast.And(exprs=[expr for expr in where_exprs if expr is not None]),
+                group_by=[ast.Field(chain=["value"])],
+                order_by=[
+                    ast.OrderExpr(expr=ast.Field(chain=["count"]), order="DESC"),
+                    ast.OrderExpr(expr=ast.Field(chain=["value"]), order="DESC"),
+                ],
+                limit=ast.Constant(value=breakdown_limit_or_default + 1),
+                offset=ast.Constant(value=offset),
+            )
+
+            if query.samplingFactor is not None:
+                assert isinstance(values_query.select_from, ast.JoinExpr)
+                values_query.select_from.sample = ast.SampleExpr(
+                    sample_value=ast.RatioExpr(left=ast.Constant(value=query.samplingFactor))
+                )
+
+            # execute query
+            results = execute_hogql_query(values_query, self.context.team).results
+            if results is None:
+                raise ValidationError("Apologies, there has been an error computing breakdown values.")
+            return [row[0] for row in results[0:breakdown_limit_or_default]]
+
+    def _get_breakdown_select_prop(self) -> List[ast.Expr]:
+        breakdown, breakdownAttributionType, funnelsFilter = (
+            self.context.breakdown,
+            self.context.breakdownAttributionType,
+            self.context.funnelsFilter,
+        )
+
+        if not breakdown:
+            return []
+
+        # breakdown prop
+        prop_basic = ast.Alias(alias="prop_basic", expr=self._get_breakdown_expr())
+
+        # breakdown attribution
+        if breakdownAttributionType == BreakdownAttributionType.step:
+            select_columns = []
+            default_breakdown_selector = "[]" if self._query_has_array_breakdown() else "NULL"
+            # get prop value from each step
+            for index, _ in enumerate(self.context.query.series):
+                select_columns.append(
+                    parse_expr(f"if(step_{index} = 1, prop_basic, {default_breakdown_selector}) as prop_{index}")
+                )
+
+            final_select = parse_expr(f"prop_{funnelsFilter.breakdownAttributionValue} as prop")
+            prop_window = parse_expr("groupUniqArray(prop) over (PARTITION by aggregation_target) as prop_vals")
+
+            return [prop_basic, *select_columns, final_select, prop_window]
+        elif breakdownAttributionType in [
+            BreakdownAttributionType.first_touch,
+            BreakdownAttributionType.last_touch,
+        ]:
+            prop_conditional = (
+                "notEmpty(arrayFilter(x -> notEmpty(x), prop))"
+                if self._query_has_array_breakdown()
+                else "isNotNull(prop)"
+            )
+
+            aggregate_operation = (
+                "argMinIf" if breakdownAttributionType == BreakdownAttributionType.first_touch else "argMaxIf"
+            )
+
+            breakdown_window_selector = f"{aggregate_operation}(prop, timestamp, {prop_conditional})"
+            prop_window = parse_expr(f"{breakdown_window_selector} over (PARTITION by aggregation_target) as prop_vals")
+            return [
+                prop_basic,
+                ast.Alias(alias="prop", expr=ast.Field(chain=["prop_basic"])),
+                prop_window,
+            ]
+        else:
+            # all_events
+            return [
+                prop_basic,
+                ast.Alias(alias="prop", expr=ast.Field(chain=["prop_basic"])),
+            ]
+
+    def _get_breakdown_expr(self) -> ast.Expr:
+        breakdown, breakdownType, breakdownFilter = (
+            self.context.breakdown,
+            self.context.breakdownType,
+            self.context.breakdownFilter,
+        )
+
+        if breakdownType == "person":
+            properties_column = "person.properties"
+            return get_breakdown_expr(breakdown, properties_column)
+        elif breakdownType == "event":
+            properties_column = "properties"
+            normalize_url = breakdownFilter.breakdown_normalize_url
+            return get_breakdown_expr(breakdown, properties_column, normalize_url=normalize_url)
+        elif breakdownType == "cohort":
+            return ast.Field(chain=["value"])
+        elif breakdownType == "group":
+            properties_column = f"group_{breakdownFilter.breakdown_group_type_index}.properties"
+            return get_breakdown_expr(breakdown, properties_column)
+        elif breakdownType == "hogql":
+            return ast.Alias(
+                alias="value",
+                expr=parse_expr(str(breakdown)),
+            )
+        else:
+            raise ValidationError(detail=f"Unsupported breakdown type: {breakdownType}")
+
+    def _format_results(self, results) -> List[Dict[str, Any]] | List[List[Dict[str, Any]]]:
+        breakdown = self.context.breakdown
 
         if not results or len(results) == 0:
             return []
 
-        if breakdownFilter.breakdown:
+        if breakdown:
             return [self._format_single_funnel(res, with_breakdown=True) for res in results]
         else:
             return self._format_single_funnel(results[0])
@@ -63,7 +283,7 @@ def _format_single_funnel(self, results, with_breakdown=False):
         steps = []
         total_people = 0
 
-        # breakdown_value = results[-1]
+        breakdown_value = results[-1]
         # cache_invalidation_key = generate_short_id()
 
         for index, step in enumerate(reversed(self.context.query.series)):
@@ -91,25 +311,27 @@ def _format_single_funnel(self, results, with_breakdown=False):
             # converted_people_filter = self._filter.shallow_clone({"funnel_step": funnel_step})
             # dropped_people_filter = self._filter.shallow_clone({"funnel_step": -funnel_step})
 
-            # if with_breakdown:
-            #     # breakdown will return a display ready value
-            #     # breakdown_value will return the underlying id if different from display ready value (ex: cohort id)
-            #     serialized_result.update(
-            #         {
-            #             "breakdown": get_breakdown_cohort_name(breakdown_value)
-            #             if self._filter.breakdown_type == "cohort"
-            #             else breakdown_value,
-            #             "breakdown_value": breakdown_value,
-            #         }
-            #     )
-            #     # important to not try and modify this value any how - as these
-            #     # are keys for fetching persons
-
-            #     # Add in the breakdown to people urls as well
-            #     converted_people_filter = converted_people_filter.shallow_clone(
-            #         {"funnel_step_breakdown": breakdown_value}
-            #     )
-            #     dropped_people_filter = dropped_people_filter.shallow_clone({"funnel_step_breakdown": breakdown_value})
+            if with_breakdown:
+                # breakdown will return a display ready value
+                # breakdown_value will return the underlying id if different from display ready value (ex: cohort id)
+                serialized_result.update(
+                    {
+                        "breakdown": (
+                            get_breakdown_cohort_name(breakdown_value)
+                            if self.context.breakdownFilter.breakdown_type == "cohort"
+                            else breakdown_value
+                        ),
+                        "breakdown_value": breakdown_value,
+                    }
+                )
+                # important to not try and modify this value any how - as these
+                # are keys for fetching persons
+
+                # # Add in the breakdown to people urls as well
+                # converted_people_filter = converted_people_filter.shallow_clone(
+                #     {"funnel_step_breakdown": breakdown_value}
+                # )
+                # dropped_people_filter = dropped_people_filter.shallow_clone({"funnel_step_breakdown": breakdown_value})
 
             # serialized_result.update(
             #     {
@@ -144,7 +366,7 @@ def _serialize_step(
             name = action.name
 
         return {
-            "action_id": step.event if isinstance(step, EventsNode) else str(step.id),
+            "action_id": step.event if isinstance(step, EventsNode) else step.id,
             "name": name,
             "custom_name": step.custom_name,
             "order": index,
@@ -164,7 +386,13 @@ def _get_inner_event_query(
         skip_entity_filter=False,
         skip_step_filter=False,
     ) -> ast.SelectQuery:
-        query, funnelsFilter = self.context.query, self.context.funnelsFilter
+        query, funnelsFilter, breakdown, breakdownType, breakdownAttributionType = (
+            self.context.query,
+            self.context.funnelsFilter,
+            self.context.breakdown,
+            self.context.breakdownType,
+            self.context.breakdownAttributionType,
+        )
         entities_to_use = entities or query.series
 
         # extra_fields = []
@@ -172,17 +400,12 @@ def _get_inner_event_query(
         # for prop in self._include_properties:
         #     extra_fields.append(prop)
 
-        funnel_events_query = FunnelEventQuery(context=self.context).to_query()
+        funnel_events_query = FunnelEventQuery(context=self.context).to_query(skip_entity_filter=skip_entity_filter)
         # funnel_events_query, params = FunnelEventQuery(
         #     extra_fields=[*self._extra_event_fields, *extra_fields],
         #     extra_event_properties=self._extra_event_properties,
         # ).get_query(entities_to_use, entity_name, skip_entity_filter=skip_entity_filter)
 
-        # if skip_step_filter:
-        #     steps_conditions = "1=1"
-        # else:
-        #     steps_conditions = self._get_steps_conditions(length=len(entities_to_use))
-
         all_step_cols: List[ast.Expr] = []
         for index, entity in enumerate(entities_to_use):
             step_cols = self._get_step_col(entity, index, entity_name)
@@ -194,43 +417,115 @@ def _get_inner_event_query(
             # where i is the starting step for exclusion on that entity
             all_step_cols.extend(step_cols)
 
-        # breakdown_select_prop, breakdown_select_prop_params = self._get_breakdown_select_prop()
-
-        # if breakdown_select_prop:
-        #     all_step_cols.append(breakdown_select_prop)
+        breakdown_select_prop = self._get_breakdown_select_prop()
 
-        # extra_join = ""
-
-        # if self._filter.breakdown:
-        #     if self._filter.breakdown_type == "cohort":
-        #         extra_join = self._get_cohort_breakdown_join()
-        #     else:
-        #         values = self._get_breakdown_conditions()
-        #         self.params.update({"breakdown_values": values})
+        if breakdown_select_prop:
+            all_step_cols.extend(breakdown_select_prop)
 
         funnel_events_query.select = [*funnel_events_query.select, *all_step_cols]
 
-        # funnel_events_query = funnel_events_query.format(
-        #     # extra_join=extra_join,
-        #     # step_filter="AND ({})".format(steps_conditions),
-        # )
+        if breakdown and breakdownType == BreakdownType.cohort:
+            if funnel_events_query.select_from is None:
+                raise ValidationError("Apologies, there was an error adding cohort breakdowns to the query.")
+            funnel_events_query.select_from.next_join = self._get_cohort_breakdown_join()
+
+        if not skip_step_filter:
+            assert isinstance(funnel_events_query.where, ast.Expr)
+            steps_conditions = self._get_steps_conditions(length=len(entities_to_use))
+            funnel_events_query.where = ast.And(exprs=[funnel_events_query.where, steps_conditions])
 
-        # if self._filter.breakdown and self._filter.breakdown_attribution_type != BreakdownAttributionType.ALL_EVENTS:
-        #     # ALL_EVENTS attribution is the old default, which doesn't need the subquery
-        #     return self._add_breakdown_attribution_subquery(funnel_events_query)
+        if breakdown and breakdownAttributionType != BreakdownAttributionType.all_events:
+            # ALL_EVENTS attribution is the old default, which doesn't need the subquery
+            return self._add_breakdown_attribution_subquery(funnel_events_query)
 
         return funnel_events_query
 
-    # def _get_steps_conditions(self, length: int) -> str:
-    #     step_conditions: List[str] = []
+    def _get_cohort_breakdown_join(self) -> ast.JoinExpr:
+        breakdown = self.context.breakdown
 
-    #     for index in range(length):
-    #         step_conditions.append(f"step_{index} = 1")
+        cohort_queries: List[ast.SelectQuery] = []
 
-    #     for exclusion_id, entity in enumerate(self._filter.exclusions):
-    #         step_conditions.append(f"exclusion_{exclusion_id}_step_{entity.funnel_from_step} = 1")
+        for cohort in self.breakdown_cohorts:
+            query = parse_select(
+                f"select id as cohort_person_id, {cohort.pk} as value from persons where id in cohort {cohort.pk}"
+            )
+            assert isinstance(query, ast.SelectQuery)
+            cohort_queries.append(query)
+
+        if isinstance(breakdown, list) and "all" in breakdown:
+            all_query = FunnelEventQuery(context=self.context).to_query()
+            all_query.select = [
+                ast.Alias(alias="cohort_person_id", expr=ast.Field(chain=["person_id"])),
+                ast.Alias(alias="value", expr=ast.Constant(value=ALL_USERS_COHORT_ID)),
+            ]
+            cohort_queries.append(all_query)
+
+        return ast.JoinExpr(
+            join_type="INNER JOIN",
+            table=ast.SelectUnionQuery(select_queries=cohort_queries),
+            alias="cohort_join",
+            constraint=ast.JoinConstraint(
+                expr=ast.CompareOperation(
+                    left=ast.Field(chain=[FunnelEventQuery.EVENT_TABLE_ALIAS, "person_id"]),
+                    right=ast.Field(chain=["cohort_join", "cohort_person_id"]),
+                    op=ast.CompareOperationOp.Eq,
+                )
+            ),
+        )
 
-    #     return " OR ".join(step_conditions)
+    def _add_breakdown_attribution_subquery(self, inner_query: ast.SelectQuery) -> ast.SelectQuery:
+        breakdown, breakdownAttributionType = (
+            self.context.breakdown,
+            self.context.breakdownAttributionType,
+        )
+
+        if breakdownAttributionType in [
+            BreakdownAttributionType.first_touch,
+            BreakdownAttributionType.last_touch,
+        ]:
+            # When breaking down by first/last touch, each person can only have one prop value
+            # so just select that. Except for the empty case, where we select the default.
+
+            if self._query_has_array_breakdown():
+                default_breakdown_value = f"""[{','.join(["''" for _ in range(len(breakdown or []))])}]"""
+                # default is [''] when dealing with a single breakdown array, otherwise ['', '', ...., '']
+                breakdown_selector = parse_expr(
+                    f"if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, {default_breakdown_value})"
+                )
+            else:
+                breakdown_selector = ast.Field(chain=["prop_vals"])
+
+            return ast.SelectQuery(
+                select=[ast.Field(chain=["*"]), ast.Alias(alias="prop", expr=breakdown_selector)],
+                select_from=ast.JoinExpr(table=inner_query),
+            )
+
+        # When breaking down by specific step, each person can have multiple prop values
+        # so array join those to each event
+        query = ast.SelectQuery(
+            select=[ast.Field(chain=["*"]), ast.Field(chain=["prop"])],
+            select_from=ast.JoinExpr(table=inner_query),
+            array_join_op="ARRAY JOIN",
+            array_join_list=[ast.Alias(alias="prop", expr=ast.Field(chain=["prop_vals"]))],
+        )
+
+        if self._query_has_array_breakdown():
+            query.where = ast.CompareOperation(
+                left=ast.Field(chain=["prop"]), right=ast.Array(exprs=[]), op=ast.CompareOperationOp.NotEq
+            )
+
+        return query
+
+    def _get_steps_conditions(self, length: int) -> ast.Expr:
+        step_conditions: List[ast.Expr] = []
+
+        for index in range(length):
+            step_conditions.append(parse_expr(f"step_{index} = 1"))
+
+        for exclusion_id, entity in enumerate(self.context.funnelsFilter.exclusions or []):
+            step_conditions.append(parse_expr(f"exclusion_{exclusion_id}_step_{entity.funnelFromStep} = 1"))
+
+        return ast.Or(exprs=step_conditions)
 
     def _get_step_col(
         self,
@@ -458,43 +753,63 @@ def _get_partition_cols(self, level_index: int, max_steps: int) -> List[ast.Expr
 
         return exprs
 
-    def _get_breakdown_expr(self, group_remaining=False) -> List[ast.Expr]:
-        # SEE BELOW
-        # if self._filter.breakdown:
-        #     other_aggregation = "['Other']" if self._query_has_array_breakdown() else "'Other'"
-        #     if group_remaining and self._filter.breakdown_type in [
-        #         "person",
-        #         "event",
-        #         "group",
-        #     ]:
-        #         return f", if(has(%(breakdown_values)s, prop), prop, {other_aggregation}) as prop"
-        #     else:
-        #         # Cohorts don't have "Other" aggregation
-        #         return ", prop"
-        # else:
-        #     return ""
-        return []
+    def _get_breakdown_prop_expr(self, group_remaining=False) -> List[ast.Expr]:
+        # SEE BELOW for a string implementation of the following
+        breakdown, breakdownType = self.context.breakdown, self.context.breakdownType
+
+        if breakdown:
+            other_aggregation = "['Other']" if self._query_has_array_breakdown() else "'Other'"
+            if group_remaining and breakdownType in [
+                BreakdownType.person,
+                BreakdownType.event,
+                BreakdownType.group,
+            ]:
+                breakdown_values = self._get_breakdown_conditions()
+                return [parse_expr(f"if(has({breakdown_values}, prop), prop, {other_aggregation}) as prop")]
+            else:
+                # Cohorts don't have "Other" aggregation
+                return [ast.Field(chain=["prop"])]
+        else:
+            return []
 
     def _get_breakdown_prop(self, group_remaining=False) -> str:
-        # SEE ABOVE
-        # if self._filter.breakdown:
-        #     other_aggregation = "['Other']" if self._query_has_array_breakdown() else "'Other'"
-        #     if group_remaining and self._filter.breakdown_type in [
-        #         "person",
-        #         "event",
-        #         "group",
-        #     ]:
-        #         return f", if(has(%(breakdown_values)s, prop), prop, {other_aggregation}) as prop"
-        #     else:
-        #         # Cohorts don't have "Other" aggregation
-        #         return ", prop"
-        # else:
-        #     return ""
-        return ""
+        # SEE ABOVE for an ast implementation of the following
+        breakdown = self.context.breakdown
+
+        if breakdown:
+            # TODO: implement the below if group_remaining can ever be true
+            # breakdown_values = self._get_breakdown_conditions()
+            # other_aggregation = "['Other']" if self._query_has_array_breakdown() else "'Other'"
+            # if group_remaining and breakdownFilter.breakdown_type in [
+            #     BreakdownType.person,
+            #     BreakdownType.event,
+            #     BreakdownType.group,
+            # ]:
+            #     return f", if(has({breakdown_values}, prop), prop, {other_aggregation}) as prop"
+            # else:
+            #     # Cohorts don't have "Other" aggregation
+            return ", prop"
+        else:
+            return ""
+
+    def _get_breakdown_conditions(self) -> Optional[List[int] | List[str] | List[List[str]]]:
+        """
+        For people, pagination sets the offset param, which is common across filters
+        and gives us the wrong breakdown values here, so we override it.
+        For events, depending on the attribution type, we either look at only one entity,
+        or all of them in the funnel.
+        if this is a multi property breakdown then the breakdown values are misleading
+        e.g. [Chrome, Safari], [95, 15] doesn't make clear that Chrome 15 isn't valid but Safari 15 is
+        so the generated list here must be [[Chrome, 95], [Safari, 15]]
+        """
+        if self.context.breakdown:
+            return self.breakdown_values
+
+        return None
 
     def _query_has_array_breakdown(self) -> bool:
-        breakdown, breakdown_type = self.context.breakdownFilter.breakdown, self.context.breakdownFilter.breakdown_type
-        return not isinstance(breakdown, str) and breakdown_type != "cohort"
+        breakdown, breakdownType = self.context.breakdown, self.context.breakdownType
+        return not isinstance(breakdown, str) and breakdownType != "cohort"
 
     def _get_exclusion_condition(self) -> List[ast.Expr]:
         funnelsFilter = self.context.funnelsFilter
diff --git a/posthog/hogql_queries/insights/funnels/funnel.py b/posthog/hogql_queries/insights/funnels/funnel.py
index a5d324a640830..adbfaaaccc991 100644
--- a/posthog/hogql_queries/insights/funnels/funnel.py
+++ b/posthog/hogql_queries/insights/funnels/funnel.py
@@ -33,7 +33,7 @@ class Funnel(FunnelBase):
     def get_query(self):
         max_steps = self.context.max_steps
 
-        breakdown_exprs = self._get_breakdown_expr()
+        breakdown_exprs = self._get_breakdown_prop_expr()
 
         select: List[ast.Expr] = [
             *self._get_count_columns(max_steps),
@@ -50,7 +50,7 @@ def get_query(self):
 
     def get_step_counts_query(self):
         max_steps = self.context.max_steps
-        breakdown_exprs = self._get_breakdown_expr()
+        breakdown_exprs = self._get_breakdown_prop_expr()
         inner_timestamps, outer_timestamps = self._get_timestamp_selects()
         person_and_group_properties = self._get_person_and_group_properties()
 
@@ -104,7 +104,7 @@ def get_step_counts_without_aggregation_query(self):
             raise ValidationError("Funnels require at least two steps before calculating.")
 
         formatted_query = self._build_step_subquery(2, max_steps)
-        breakdown_exprs = self._get_breakdown_expr()
+        breakdown_exprs = self._get_breakdown_prop_expr()
 
         select: List[ast.Expr] = [
             ast.Field(chain=["*"]),
@@ -120,11 +120,13 @@ def get_step_counts_without_aggregation_query(self):
             ast.CompareOperation(
                 left=ast.Field(chain=["step_0"]), right=ast.Constant(value=1), op=ast.CompareOperationOp.Eq
             ),
-            ast.CompareOperation(
-                left=ast.Field(chain=["exclusion"]), right=ast.Constant(value=0), op=ast.CompareOperationOp.Eq
-            )
-            if self._get_exclusion_condition() != []
-            else None,
+            (
+                ast.CompareOperation(
+                    left=ast.Field(chain=["exclusion"]), right=ast.Constant(value=0), op=ast.CompareOperationOp.Eq
+                )
+                if self._get_exclusion_condition() != []
+                else None
+            ),
         ]
         where = ast.And(exprs=[expr for expr in where_exprs if expr is not None])
 
@@ -142,7 +144,7 @@ def _build_step_subquery(
             select = [
                 *select,
                 *self._get_partition_cols(1, max_steps),
-                *self._get_breakdown_expr(group_remaining=True),
+                *self._get_breakdown_prop_expr(group_remaining=True),
                 *self._get_person_and_group_properties(),
             ]
 
@@ -153,13 +155,13 @@ def _build_step_subquery(
             outer_select = [
                 *select,
                 *self._get_partition_cols(level_index, max_steps),
-                *self._get_breakdown_expr(),
+                *self._get_breakdown_prop_expr(),
                 *self._get_person_and_group_properties(),
             ]
             inner_select = [
                 *select,
                 *self._get_comparison_cols(level_index, max_steps),
-                *self._get_breakdown_expr(),
+                *self._get_breakdown_prop_expr(),
                 *self._get_person_and_group_properties(),
             ]
 
diff --git a/posthog/hogql_queries/insights/funnels/funnel_query_context.py b/posthog/hogql_queries/insights/funnels/funnel_query_context.py
index f7a12f91c3a45..db5fc7e7a17de 100644
--- a/posthog/hogql_queries/insights/funnels/funnel_query_context.py
+++ b/posthog/hogql_queries/insights/funnels/funnel_query_context.py
@@ -1,11 +1,14 @@
-from typing import Optional
+from typing import List, Optional, Union
 from posthog.hogql.constants import LimitContext
 from posthog.hogql.timings import HogQLTimings
 from posthog.hogql_queries.insights.query_context import QueryContext
 from posthog.models.filters.mixins.utils import cached_property
+from posthog.models.property.util import box_value
 from posthog.models.team.team import Team
 from posthog.schema import (
+    BreakdownAttributionType,
     BreakdownFilter,
+    BreakdownType,
     FunnelConversionWindowTimeUnit,
     FunnelsFilter,
     FunnelsQuery,
@@ -18,6 +21,10 @@ class FunnelQueryContext(QueryContext):
     funnelsFilter: FunnelsFilter
     breakdownFilter: BreakdownFilter
 
+    breakdown: List[Union[str, int]] | None
+    breakdownType: BreakdownType
+    breakdownAttributionType: BreakdownAttributionType
+
     funnelWindowInterval: int
     funnelWindowIntervalUnit: FunnelConversionWindowTimeUnit
 
@@ -34,11 +41,46 @@ def __init__(
         self.funnelsFilter = self.query.funnelsFilter or FunnelsFilter()
         self.breakdownFilter = self.query.breakdownFilter or BreakdownFilter()
 
+        # defaults
+        self.breakdownType = self.breakdownFilter.breakdown_type or BreakdownType.event
+        self.breakdownAttributionType = (
+            self.funnelsFilter.breakdownAttributionType or BreakdownAttributionType.first_touch
+        )
         self.funnelWindowInterval = self.funnelsFilter.funnelWindowInterval or 14
         self.funnelWindowIntervalUnit = (
             self.funnelsFilter.funnelWindowIntervalUnit or FunnelConversionWindowTimeUnit.day
         )
 
+        # the API accepts either:
+        #   a string (single breakdown) in parameter "breakdown"
+        #   a list of numbers (one or more cohorts) in parameter "breakdown"
+        #   a list of strings (multiple breakdown) in parameter "breakdowns"
+        # if the breakdown is a string, box it as a list to reduce paths through the code
+        #
+        # The code below ensures that breakdown is always an array
+        # without it affecting the multiple areas of the code outside of funnels that use breakdown
+        #
+        # Once multi property breakdown is implemented in Trends this becomes unnecessary
+
+        # if isinstance(self._filter.breakdowns, List) and self._filter.breakdown_type in [
+        #     "person",
+        #     "event",
+        #     "hogql",
+        #     None,
+        # ]:
+        #     data.update({"breakdown": [b.get("property") for b in self._filter.breakdowns]})
+
+        if isinstance(self.breakdownFilter.breakdown, str) and self.breakdownType in [
+            "person",
+            "event",
+            "hogql",
+            None,
+        ]:
+            boxed_breakdown: List[Union[str, int]] = box_value(self.breakdownFilter.breakdown)
+            self.breakdown = boxed_breakdown
+        else:
+            self.breakdown = self.breakdownFilter.breakdown  # type: ignore
+
     @cached_property
     def max_steps(self) -> int:
         return len(self.query.series)
diff --git a/posthog/hogql_queries/insights/funnels/funnel_strict.py b/posthog/hogql_queries/insights/funnels/funnel_strict.py
index f7bc5b0d34de8..503cf4de6e3bc 100644
--- a/posthog/hogql_queries/insights/funnels/funnel_strict.py
+++ b/posthog/hogql_queries/insights/funnels/funnel_strict.py
@@ -9,31 +9,31 @@ class FunnelStrict(FunnelBase):
     def get_query(self):
         max_steps = self.context.max_steps
 
-        # breakdown_exprs = self._get_breakdown_prop_expr()
+        breakdown_exprs = self._get_breakdown_prop_expr()
 
         select: List[ast.Expr] = [
             *self._get_count_columns(max_steps),
             *self._get_step_time_avgs(max_steps),
             *self._get_step_time_median(max_steps),
-            # *breakdown_exprs,
+            *breakdown_exprs,
         ]
 
         return ast.SelectQuery(
             select=select,
             select_from=ast.JoinExpr(table=self.get_step_counts_query()),
-            # group_by=[ast.Field(chain=["prop"])] if len(breakdown_exprs) > 0 else None,
+            group_by=[ast.Field(chain=["prop"])] if len(breakdown_exprs) > 0 else None,
         )
 
     def get_step_counts_query(self):
         max_steps = self.context.max_steps
-        # breakdown_exprs = self._get_breakdown_prop_expr()
+        breakdown_exprs = self._get_breakdown_prop_expr()
         inner_timestamps, outer_timestamps = self._get_timestamp_selects()
         person_and_group_properties = self._get_person_and_group_properties()
 
         group_by_columns: List[ast.Expr] = [
             ast.Field(chain=["aggregation_target"]),
             ast.Field(chain=["steps"]),
-            # *breakdown_exprs,
+            *breakdown_exprs,
         ]
 
         outer_select: List[ast.Expr] = [
@@ -41,7 +41,7 @@ def get_step_counts_query(self):
             *self._get_step_time_avgs(max_steps, inner_query=True),
             *self._get_step_time_median(max_steps, inner_query=True),
             *self._get_matching_event_arrays(max_steps),
-            # *breakdown_exprs,
+            *breakdown_exprs,
             *outer_timestamps,
             *person_and_group_properties,
         ]
@@ -55,7 +55,7 @@ def get_step_counts_query(self):
             max_steps_expr,
             *self._get_step_time_names(max_steps),
             *self._get_matching_events(max_steps),
-            # *breakdown_exprs,
+            *breakdown_exprs,
             *inner_timestamps,
             *person_and_group_properties,
         ]
@@ -81,7 +81,7 @@ def get_step_counts_without_aggregation_query(self):
             ast.Field(chain=["aggregation_target"]),
             ast.Field(chain=["timestamp"]),
             *self._get_partition_cols(1, max_steps),
-            # *self._get_breakdown_prop_expr(group_remaining=True),
+            *self._get_breakdown_prop_expr(group_remaining=True),
             *self._get_person_and_group_properties(),
         ]
         select_from_inner = self._get_inner_event_query(skip_entity_filter=True, skip_step_filter=True)
diff --git a/posthog/hogql_queries/insights/funnels/funnel_unordered.py b/posthog/hogql_queries/insights/funnels/funnel_unordered.py
new file mode 100644
index 0000000000000..03745309f9321
--- /dev/null
+++ b/posthog/hogql_queries/insights/funnels/funnel_unordered.py
@@ -0,0 +1,247 @@
+from typing import Any, Dict, List, Optional
+import uuid
+
+from rest_framework.exceptions import ValidationError
+from posthog.hogql import ast
+from posthog.hogql.parser import parse_expr
+from posthog.hogql_queries.insights.funnels.base import FunnelBase
+from posthog.hogql_queries.insights.funnels.utils import funnel_window_interval_unit_to_sql
+from posthog.schema import ActionsNode, EventsNode
+from posthog.queries.util import correct_result_for_sampling
+
+
+class FunnelUnordered(FunnelBase):
+    """
+    Unordered Funnel is a funnel where the order of steps doesn't matter.
+
+    ## Query Intuition
+
+    Imagine a funnel with three events: A, B, and C.
+    This query splits the problem into two parts:
+    1. Given the first event is A, find the furthest everyone went starting from A.
+       This finds any B's and C's that happen after A (without ordering them)
+    2. Repeat the above, assuming first event to be B, and then C.
+
+    Then, the outer query unions the result of (2) and takes the maximum of these.
+
+    ## Results
+
+    The result format is the same as the basic funnel, i.e. [step, count].
+    Here, `step_i` (0 indexed) signifies the number of people that did at least `i+1` steps.
+
+    ## Exclusion Semantics
+    For unordered funnels, exclusion is a bit weird. It means, given all ordering of the steps,
+    how far can you go without seeing an exclusion event.
+    If you see an exclusion event => you're discarded.
+    See test_advanced_funnel_multiple_exclusions_between_steps for details.
+    """
+
+    def get_query(self):
+        max_steps = self.context.max_steps
+
+        for exclusion in self.context.funnelsFilter.exclusions or []:
+            if exclusion.funnelFromStep != 0 or exclusion.funnelToStep != max_steps - 1:
+                raise ValidationError("Partial Exclusions not allowed in unordered funnels")
+
+        breakdown_exprs = self._get_breakdown_prop_expr()
+
+        select: List[ast.Expr] = [
+            *self._get_count_columns(max_steps),
+            *self._get_step_time_avgs(max_steps),
+            *self._get_step_time_median(max_steps),
+            *breakdown_exprs,
+        ]
+
+        return ast.SelectQuery(
+            select=select,
+            select_from=ast.JoinExpr(table=self.get_step_counts_query()),
+            group_by=[ast.Field(chain=["prop"])] if len(breakdown_exprs) > 0 else None,
+        )
+
+    def get_step_counts_query(self):
+        max_steps = self.context.max_steps
+        breakdown_exprs = self._get_breakdown_prop_expr()
+        inner_timestamps, outer_timestamps = self._get_timestamp_selects()
+        person_and_group_properties = self._get_person_and_group_properties()
+
+        group_by_columns: List[ast.Expr] = [
+            ast.Field(chain=["aggregation_target"]),
+            ast.Field(chain=["steps"]),
+            *breakdown_exprs,
+        ]
+
+        outer_select: List[ast.Expr] = [
+            *group_by_columns,
+            *self._get_step_time_avgs(max_steps, inner_query=True),
+            *self._get_step_time_median(max_steps, inner_query=True),
+            *outer_timestamps,
+            *person_and_group_properties,
+        ]
+
+        max_steps_expr = parse_expr(
+            f"max(steps) over (PARTITION BY aggregation_target {self._get_breakdown_prop()}) as max_steps"
+        )
+
+        inner_select: List[ast.Expr] = [
+            *group_by_columns,
+            max_steps_expr,
+            *self._get_step_time_names(max_steps),
+            *inner_timestamps,
+            *person_and_group_properties,
+        ]
+
+        return ast.SelectQuery(
+            select=outer_select,
+            select_from=ast.JoinExpr(
+                table=ast.SelectQuery(
+                    select=inner_select,
+                    select_from=ast.JoinExpr(table=self.get_step_counts_without_aggregation_query()),
+                )
+            ),
+            group_by=group_by_columns,
+            having=ast.CompareOperation(
+                left=ast.Field(chain=["steps"]), right=ast.Field(chain=["max_steps"]), op=ast.CompareOperationOp.Eq
+            ),
+        )
+
+    def get_step_counts_without_aggregation_query(self):
+        max_steps = self.context.max_steps
+        union_queries: List[ast.SelectQuery] = []
+        entities_to_use = list(self.context.query.series)
+
+        for i in range(max_steps):
+            inner_query = ast.SelectQuery(
+                select=[
+                    ast.Field(chain=["aggregation_target"]),
+                    ast.Field(chain=["timestamp"]),
+                    *self._get_partition_cols(1, max_steps),
+                    *self._get_breakdown_prop_expr(group_remaining=True),
+                    *self._get_person_and_group_properties(),
+                ],
+                select_from=ast.JoinExpr(table=self._get_inner_event_query(entities_to_use, f"events_{i}")),
+            )
+
+            where_exprs = [
+                ast.CompareOperation(
+                    left=ast.Field(chain=["step_0"]), right=ast.Constant(value=1), op=ast.CompareOperationOp.Eq
+                ),
+                (
+                    ast.CompareOperation(
+                        left=ast.Field(chain=["exclusion"]), right=ast.Constant(value=0), op=ast.CompareOperationOp.Eq
+                    )
+                    if self._get_exclusion_condition() != []
+                    else None
+                ),
+            ]
+            where = ast.And(exprs=[expr for expr in where_exprs if expr is not None])
+
+            formatted_query = ast.SelectQuery(
+                select=[
+                    ast.Field(chain=["*"]),
+                    *self.get_sorting_condition(max_steps),
+                    *self._get_exclusion_condition(),
+                    *self._get_step_times(max_steps),
+                    *self._get_person_and_group_properties(),
+                ],
+                select_from=ast.JoinExpr(table=inner_query),
+                where=where,
+            )
+
+            #  rotate entities by 1 to get new first event
+            entities_to_use.append(entities_to_use.pop(0))
+            union_queries.append(formatted_query)
+
+        return ast.SelectUnionQuery(select_queries=union_queries)
+
+    def _get_step_times(self, max_steps: int) -> List[ast.Expr]:
+        windowInterval = self.context.funnelWindowInterval
+        windowIntervalUnit = funnel_window_interval_unit_to_sql(self.context.funnelWindowIntervalUnit)
+
+        exprs: List[ast.Expr] = []
+
+        conversion_times_elements = []
+        for i in range(max_steps):
+            conversion_times_elements.append(f"latest_{i}")
+
+        exprs.append(parse_expr(f"arraySort([{','.join(conversion_times_elements)}]) as conversion_times"))
+
+        for i in range(1, max_steps):
+            exprs.append(
+                parse_expr(
+                    f"if(isNotNull(conversion_times[{i+1}]) AND conversion_times[{i+1}] <= conversion_times[{i}] + INTERVAL {windowInterval} {windowIntervalUnit}, dateDiff('second', conversion_times[{i}], conversion_times[{i+1}]), NULL) step_{i}_conversion_time"
+                )
+            )
+            # array indices in ClickHouse are 1-based :shrug:
+
+        return exprs
+
+    def get_sorting_condition(self, max_steps: int) -> List[ast.Expr]:
+        windowInterval = self.context.funnelWindowInterval
+        windowIntervalUnit = funnel_window_interval_unit_to_sql(self.context.funnelWindowIntervalUnit)
+
+        conditions = []
+
+        event_times_elements = []
+        for i in range(max_steps):
+            event_times_elements.append(f"latest_{i}")
+
+        conditions.append(parse_expr(f"arraySort([{','.join(event_times_elements)}]) as event_times"))
+        # replacement of latest_i for whatever query part requires it, just like conversion_times
+        basic_conditions: List[str] = []
+        for i in range(1, max_steps):
+            basic_conditions.append(
+                f"if(latest_0 < latest_{i} AND latest_{i} <= latest_0 + INTERVAL {windowInterval} {windowIntervalUnit}, 1, 0)"
+            )
+
+        if basic_conditions:
+            conditions.append(ast.Alias(alias="steps", expr=parse_expr(f"arraySum([{','.join(basic_conditions)}, 1])")))
+            return conditions
+        else:
+            return [ast.Alias(alias="steps", expr=ast.Constant(value=1))]
+
+    def _get_exclusion_condition(self) -> List[ast.Expr]:
+        funnelsFilter = self.context.funnelsFilter
+        windowInterval = self.context.funnelWindowInterval
+        windowIntervalUnit = funnel_window_interval_unit_to_sql(self.context.funnelWindowIntervalUnit)
+
+        if not funnelsFilter.exclusions:
+            return []
+
+        conditions: List[ast.Expr] = []
+
+        for exclusion_id, exclusion in enumerate(funnelsFilter.exclusions):
+            from_time = f"latest_{exclusion.funnelFromStep}"
+            to_time = f"event_times[{exclusion.funnelToStep + 1}]"
+            exclusion_time = f"exclusion_{exclusion_id}_latest_{exclusion.funnelFromStep}"
+            condition = parse_expr(
+                f"if( {exclusion_time} > {from_time} AND {exclusion_time} < if(isNull({to_time}), {from_time} + INTERVAL {windowInterval} {windowIntervalUnit}, {to_time}), 1, 0)"
+            )
+            conditions.append(condition)
+
+        if conditions:
+            return [
+                ast.Alias(
+                    alias="exclusion",
+                    expr=ast.Call(name="arraySum", args=[ast.Array(exprs=conditions)]),
+                )
+            ]
+        else:
+            return []
+
+    def _serialize_step(
+        self,
+        step: ActionsNode | EventsNode,
+        count: int,
+        index: int,
+        people: Optional[List[uuid.UUID]] = None,
+        sampling_factor: Optional[float] = None,
+    ) -> Dict[str, Any]:
+        return {
+            "action_id": None,
+            "name": f"Completed {index+1} step{'s' if index != 0 else ''}",
+            "custom_name": None,
+            "order": index,
+            "people": people if people else [],
+            "count": correct_result_for_sampling(count, sampling_factor),
+            "type": "events" if isinstance(step, EventsNode) else "actions",
+        }
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
index 4a8a029323773..b960faa708110 100644
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
@@ -80,7 +80,7 @@
                           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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two')))))))
+                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -280,7 +280,7 @@
                           FROM person_overrides
                           WHERE equals(person_overrides.team_id, 2)
                           GROUP BY person_overrides.old_person_id) AS e__override ON equals(e.person_id, e__override.old_person_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2011-12-25 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2012-01-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$autocapture', 'user signed up')))))))
+                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2011-12-25 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2012-01-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$autocapture', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -350,7 +350,7 @@
                         if(and(equals(e.event, 'user signed up'), ifNull(in(e__pdi.person_id,
                                                                               (SELECT cohortpeople.person_id AS person_id
                                                                                FROM cohortpeople
-                                                                               WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 8))
+                                                                               WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 20))
                                                                                GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)), 1, 0) AS step_0,
                         if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
@@ -364,7 +364,7 @@
                     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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
-                 WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')))))
+                 WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -467,7 +467,7 @@
                                                                             WHERE equals(person.team_id, 2)
                                                                             GROUP BY person.id
                                                                             HAVING ifNull(equals(argMax(person.is_deleted, person.version), 0), 0))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__pdi__person ON equals(e__pdi.person_id, e__pdi__person.id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__pdi__person.properties___email, '%.com%'), 0), ifNull(equals(e__pdi__person.properties___age, '20'), 0)), or(ifNull(ilike(e__pdi__person.properties___email, '%.org%'), 0), ifNull(equals(e__pdi__person.properties___age, '28'), 0))))))))
+                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__pdi__person.properties___email, '%.com%'), 0), ifNull(equals(e__pdi__person.properties___age, '20'), 0)), or(ifNull(ilike(e__pdi__person.properties___email, '%.org%'), 0), ifNull(equals(e__pdi__person.properties___age, '28'), 0)))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -871,7 +871,7 @@
                         if(and(equals(e.event, 'user signed up'), ifNull(in(e__pdi.person_id,
                                                                               (SELECT person_static_cohort.person_id AS person_id
                                                                                FROM person_static_cohort
-                                                                               WHERE and(equals(person_static_cohort.team_id, 2), equals(person_static_cohort.cohort_id, 9)))), 0)), 1, 0) AS step_0,
+                                                                               WHERE and(equals(person_static_cohort.team_id, 2), equals(person_static_cohort.cohort_id, 21)))), 0)), 1, 0) AS step_0,
                         if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
                         if(equals(e.event, 'paid'), 1, 0) AS step_1,
                         if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1
@@ -883,7 +883,7 @@
                     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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
-                 WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')))))
+                 WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -942,7 +942,7 @@
                     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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
-                 WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'US/Pacific')), lessOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'US/Pacific'))), in(e.event, tuple('paid', 'user signed up')))))
+                 WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'US/Pacific')), lessOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'US/Pacific'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))))
            WHERE ifNull(equals(step_0, 1), 0)))
      GROUP BY aggregation_target,
               steps
@@ -953,3 +953,1361 @@
                      allow_experimental_object_type=1
   '''
 # ---
+# name: TestFunnelBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([['Safari'], ['Mac'], ['Chrome']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop_0 AS prop_0,
+                        prop_1 AS prop_1,
+                        prop,
+                        prop_vals AS prop_vals,
+                        prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
+                           if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
+                           prop_1 AS prop,
+                           groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
+                 JOIN prop_vals AS prop
+                 WHERE ifNull(notEquals(prop, []), isNotNull(prop)
+                              or isNotNull([]))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelBreakdown.test_funnel_step_multiple_breakdown_snapshot
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelBreakdown.test_funnel_step_multiple_breakdown_snapshot.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([['', ''], ['alakazam', ''], ['Safari', 'xyz'], ['Mac', ''], ['Chrome', 'xyz'], ['0', '0'], ['', 'no-mac']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'buy'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT OUTER JOIN
+    (SELECT argMax(person_overrides.override_person_id, person_overrides.version) AS override_person_id,
+            person_overrides.old_person_id AS old_person_id
+     FROM person_overrides
+     WHERE equals(person_overrides.team_id, 2)
+     GROUP BY person_overrides.old_person_id) AS e__override ON equals(e.person_id, e__override.old_person_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id)))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e__pdi.person_id AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.2
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.3
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time ,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
+                  prop
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    latest_1,
+                                                    step_2,
+                                                    min(latest_2) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                       prop
+              FROM
+                (SELECT aggregation_target, timestamp, step_0,
+                                                       latest_0,
+                                                       step_1,
+                                                       latest_1,
+                                                       step_2,
+                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
+                                                       prop
+                 FROM
+                   (SELECT aggregation_target, timestamp, step_0,
+                                                          latest_0,
+                                                          step_1,
+                                                          min(latest_1) over (PARTITION by aggregation_target,
+                                                                                           prop
+                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                             step_2,
+                                                                             min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                              prop
+                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+                    FROM
+                      (SELECT *,
+                              prop_vals as prop
+                       FROM
+                         (SELECT e.timestamp as timestamp,
+                                 pdi.person_id as aggregation_target,
+                                 pdi.person_id as person_id,
+                                 if(event = 'sign up', 1, 0) as step_0,
+                                 if(step_0 = 1, timestamp, null) as latest_0,
+                                 if(event = 'play movie', 1, 0) as step_1,
+                                 if(step_1 = 1, timestamp, null) as latest_1,
+                                 if(event = 'buy', 1, 0) as step_2,
+                                 if(step_2 = 1, timestamp, null) as latest_2,
+                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                                 prop_basic as prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                          FROM events e
+                          INNER JOIN
+                            (SELECT distinct_id,
+                                    argMax(person_id, version) as person_id
+                             FROM person_distinct_id2
+                             WHERE team_id = 2
+                               AND distinct_id IN
+                                 (SELECT distinct_id
+                                  FROM events
+                                  WHERE team_id = 2
+                                    AND event IN ['buy', 'play movie', 'sign up']
+                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                             GROUP BY distinct_id
+                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                          LEFT JOIN
+                            (SELECT group_key,
+                                    argMax(group_properties, _timestamp) AS group_properties_0
+                             FROM groups
+                             WHERE team_id = 2
+                               AND group_type_index = 0
+                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                          WHERE team_id = 2
+                            AND event IN ['buy', 'play movie', 'sign up']
+                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                            AND (step_0 = 1
+                                 OR step_1 = 1
+                                 OR step_2 = 1) )))))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.4
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.5
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time ,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
+                  prop
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    latest_1,
+                                                    step_2,
+                                                    min(latest_2) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                       prop
+              FROM
+                (SELECT aggregation_target, timestamp, step_0,
+                                                       latest_0,
+                                                       step_1,
+                                                       latest_1,
+                                                       step_2,
+                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
+                                                       prop
+                 FROM
+                   (SELECT aggregation_target, timestamp, step_0,
+                                                          latest_0,
+                                                          step_1,
+                                                          min(latest_1) over (PARTITION by aggregation_target,
+                                                                                           prop
+                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                             step_2,
+                                                                             min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                              prop
+                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+                    FROM
+                      (SELECT *,
+                              prop_vals as prop
+                       FROM
+                         (SELECT e.timestamp as timestamp,
+                                 pdi.person_id as aggregation_target,
+                                 pdi.person_id as person_id,
+                                 if(event = 'sign up', 1, 0) as step_0,
+                                 if(step_0 = 1, timestamp, null) as latest_0,
+                                 if(event = 'play movie', 1, 0) as step_1,
+                                 if(step_1 = 1, timestamp, null) as latest_1,
+                                 if(event = 'buy', 1, 0) as step_2,
+                                 if(step_2 = 1, timestamp, null) as latest_2,
+                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                                 prop_basic as prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                          FROM events e
+                          INNER JOIN
+                            (SELECT distinct_id,
+                                    argMax(person_id, version) as person_id
+                             FROM person_distinct_id2
+                             WHERE team_id = 2
+                               AND distinct_id IN
+                                 (SELECT distinct_id
+                                  FROM events
+                                  WHERE team_id = 2
+                                    AND event IN ['buy', 'play movie', 'sign up']
+                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                             GROUP BY distinct_id
+                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                          LEFT JOIN
+                            (SELECT group_key,
+                                    argMax(group_properties, _timestamp) AS group_properties_0
+                             FROM groups
+                             WHERE team_id = 2
+                               AND group_type_index = 0
+                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                          WHERE team_id = 2
+                            AND event IN ['buy', 'play movie', 'sign up']
+                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                            AND (step_0 = 1
+                                 OR step_1 = 1
+                                 OR step_2 = 1) )))))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.6
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.7
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time ,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
+                  prop
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    latest_1,
+                                                    step_2,
+                                                    min(latest_2) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                       prop
+              FROM
+                (SELECT aggregation_target, timestamp, step_0,
+                                                       latest_0,
+                                                       step_1,
+                                                       latest_1,
+                                                       step_2,
+                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
+                                                       prop
+                 FROM
+                   (SELECT aggregation_target, timestamp, step_0,
+                                                          latest_0,
+                                                          step_1,
+                                                          min(latest_1) over (PARTITION by aggregation_target,
+                                                                                           prop
+                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                             step_2,
+                                                                             min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                              prop
+                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+                    FROM
+                      (SELECT *,
+                              prop_vals as prop
+                       FROM
+                         (SELECT e.timestamp as timestamp,
+                                 pdi.person_id as aggregation_target,
+                                 pdi.person_id as person_id,
+                                 if(event = 'sign up', 1, 0) as step_0,
+                                 if(step_0 = 1, timestamp, null) as latest_0,
+                                 if(event = 'play movie', 1, 0) as step_1,
+                                 if(step_1 = 1, timestamp, null) as latest_1,
+                                 if(event = 'buy', 1, 0) as step_2,
+                                 if(step_2 = 1, timestamp, null) as latest_2,
+                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                                 prop_basic as prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                          FROM events e
+                          INNER JOIN
+                            (SELECT distinct_id,
+                                    argMax(person_id, version) as person_id
+                             FROM person_distinct_id2
+                             WHERE team_id = 2
+                               AND distinct_id IN
+                                 (SELECT distinct_id
+                                  FROM events
+                                  WHERE team_id = 2
+                                    AND event IN ['buy', 'play movie', 'sign up']
+                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                             GROUP BY distinct_id
+                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                          LEFT JOIN
+                            (SELECT group_key,
+                                    argMax(group_properties, _timestamp) AS group_properties_0
+                             FROM groups
+                             WHERE team_id = 2
+                               AND group_type_index = 0
+                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                          WHERE team_id = 2
+                            AND event IN ['buy', 'play movie', 'sign up']
+                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                            AND (step_0 = 1
+                                 OR step_1 = 1
+                                 OR step_2 = 1) )))))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.8
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestFunnelGroupBreakdown.test_funnel_breakdown_group.9
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time ,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
+                  prop
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    latest_1,
+                                                    step_2,
+                                                    min(latest_2) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                       prop
+              FROM
+                (SELECT aggregation_target, timestamp, step_0,
+                                                       latest_0,
+                                                       step_1,
+                                                       latest_1,
+                                                       step_2,
+                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
+                                                       prop
+                 FROM
+                   (SELECT aggregation_target, timestamp, step_0,
+                                                          latest_0,
+                                                          step_1,
+                                                          min(latest_1) over (PARTITION by aggregation_target,
+                                                                                           prop
+                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                             step_2,
+                                                                             min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                              prop
+                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+                    FROM
+                      (SELECT *,
+                              prop_vals as prop
+                       FROM
+                         (SELECT e.timestamp as timestamp,
+                                 pdi.person_id as aggregation_target,
+                                 pdi.person_id as person_id,
+                                 if(event = 'sign up', 1, 0) as step_0,
+                                 if(step_0 = 1, timestamp, null) as latest_0,
+                                 if(event = 'play movie', 1, 0) as step_1,
+                                 if(step_1 = 1, timestamp, null) as latest_1,
+                                 if(event = 'buy', 1, 0) as step_2,
+                                 if(step_2 = 1, timestamp, null) as latest_2,
+                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                                 prop_basic as prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                          FROM events e
+                          INNER JOIN
+                            (SELECT distinct_id,
+                                    argMax(person_id, version) as person_id
+                             FROM person_distinct_id2
+                             WHERE team_id = 2
+                               AND distinct_id IN
+                                 (SELECT distinct_id
+                                  FROM events
+                                  WHERE team_id = 2
+                                    AND event IN ['buy', 'play movie', 'sign up']
+                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                             GROUP BY distinct_id
+                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                          LEFT JOIN
+                            (SELECT group_key,
+                                    argMax(group_properties, _timestamp) AS group_properties_0
+                             FROM groups
+                             WHERE team_id = 2
+                               AND group_type_index = 0
+                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                          WHERE team_id = 2
+                            AND event IN ['buy', 'play movie', 'sign up']
+                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                            AND (step_0 = 1
+                                 OR step_1 = 1
+                                 OR step_2 = 1) )))))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr
new file mode 100644
index 0000000000000..5b12c1d8d00e0
--- /dev/null
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr
@@ -0,0 +1,1264 @@
+# serializer version: 1
+# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
+                                        if(has([['Safari'], ['Mac'], ['Chrome']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop_0 AS prop_0,
+                        prop_1 AS prop_1,
+                        prop,
+                        prop_vals AS prop_vals,
+                        prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
+                           if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
+                           prop_1 AS prop,
+                           groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))) ARRAY
+                 JOIN prop_vals AS prop
+                 WHERE ifNull(notEquals(prop, []), isNotNull(prop)
+                              or isNotNull([]))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelStrictStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelStrictStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
+                                        if(has([['', ''], ['alakazam', ''], ['Safari', 'xyz'], ['Mac', ''], ['Chrome', 'xyz'], ['0', '0'], ['', 'no-mac']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'buy'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT OUTER JOIN
+    (SELECT argMax(person_overrides.override_person_id, person_overrides.version) AS override_person_id,
+            person_overrides.old_person_id AS old_person_id
+     FROM person_overrides
+     WHERE equals(person_overrides.team_id, 2)
+     GROUP BY person_overrides.old_person_id) AS e__override ON equals(e.person_id, e__override.old_person_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id)))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e__pdi.person_id AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.2
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.3
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (1=1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.4
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.5
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (1=1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.6
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.7
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (1=1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.8
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.9
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  if(latest_0 <= latest_1
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
+                     AND latest_1 <= latest_2
+                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
+                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
+                  if(isNotNull(latest_1)
+                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
+                  if(isNotNull(latest_2)
+                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (1=1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr
new file mode 100644
index 0000000000000..214583b03f081
--- /dev/null
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr
@@ -0,0 +1,2147 @@
+# serializer version: 1
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  arraySort([latest_0, latest_1]) AS event_times,
+                  arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                  arraySort([latest_0, latest_1]) AS conversion_times,
+                  if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)
+           UNION ALL SELECT aggregation_target AS aggregation_target,
+                            timestamp AS timestamp,
+                            step_0 AS step_0,
+                            latest_0 AS latest_0,
+                            step_1 AS step_1,
+                            latest_1 AS latest_1,
+                            prop AS prop,
+                            arraySort([latest_0, latest_1]) AS event_times,
+                            arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                            arraySort([latest_0, latest_1]) AS conversion_times,
+                            if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  arraySort([latest_0, latest_1]) AS event_times,
+                  arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                  arraySort([latest_0, latest_1]) AS conversion_times,
+                  if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop_0 AS prop_0,
+                        prop_1 AS prop_1,
+                        prop,
+                        prop_vals AS prop_vals,
+                        prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
+                           if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
+                           prop_1 AS prop,
+                           groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
+                 JOIN prop_vals AS prop
+                 WHERE ifNull(notEquals(prop, []), isNotNull(prop)
+                              or isNotNull([]))))
+           WHERE ifNull(equals(step_0, 1), 0)
+           UNION ALL SELECT aggregation_target AS aggregation_target,
+                            timestamp AS timestamp,
+                            step_0 AS step_0,
+                            latest_0 AS latest_0,
+                            step_1 AS step_1,
+                            latest_1 AS latest_1,
+                            prop AS prop,
+                            arraySort([latest_0, latest_1]) AS event_times,
+                            arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                            arraySort([latest_0, latest_1]) AS conversion_times,
+                            if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([[''], ['Mac'], ['Chrome'], ['Safari']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop_0 AS prop_0,
+                        prop_1 AS prop_1,
+                        prop,
+                        prop_vals AS prop_vals,
+                        prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
+                           if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
+                           prop_1 AS prop,
+                           groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
+                 JOIN prop_vals AS prop
+                 WHERE ifNull(notEquals(prop, []), isNotNull(prop)
+                              or isNotNull([]))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot
+  '''
+  SELECT [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestFunnelUnorderedStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  prop AS prop,
+                  arraySort([latest_0, latest_1]) AS event_times,
+                  arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                  arraySort([latest_0, latest_1]) AS conversion_times,
+                  if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([['', ''], ['alakazam', ''], ['Safari', 'xyz'], ['Mac', ''], ['Chrome', 'xyz'], ['0', '0'], ['', 'no-mac']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'buy'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)
+           UNION ALL SELECT aggregation_target AS aggregation_target,
+                            timestamp AS timestamp,
+                            step_0 AS step_0,
+                            latest_0 AS latest_0,
+                            step_1 AS step_1,
+                            latest_1 AS latest_1,
+                            prop AS prop,
+                            arraySort([latest_0, latest_1]) AS event_times,
+                            arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
+                            arraySort([latest_0, latest_1]) AS conversion_times,
+                            if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(conversion_times[1], toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                        if(has([['', ''], ['alakazam', ''], ['Safari', 'xyz'], ['Mac', ''], ['Chrome', 'xyz'], ['0', '0'], ['', 'no-mac']], prop), prop, ['Other']) AS prop
+              FROM
+                (SELECT timestamp AS timestamp,
+                        aggregation_target AS aggregation_target,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        prop_basic AS prop_basic,
+                        prop,
+                        prop_vals AS prop_vals,
+                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
+                 FROM
+                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                           e__pdi.person_id AS aggregation_target,
+                           if(equals(e.event, 'buy'), 1, 0) AS step_0,
+                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                           if(equals(e.event, 'sign up'), 1, 0) AS step_1,
+                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                           [ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', ''), ''), ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), '')] AS prop_basic,
+                           prop_basic AS prop,
+                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
+                    FROM events AS e
+                    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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  LEFT OUTER JOIN
+    (SELECT argMax(person_overrides.override_person_id, person_overrides.version) AS override_person_id,
+            person_overrides.old_person_id AS old_person_id
+     FROM person_overrides
+     WHERE equals(person_overrides.team_id, 2)
+     GROUP BY person_overrides.old_person_id) AS e__override ON equals(e.person_id, e__override.old_person_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id)))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e.`$group_0` AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group
+  '''
+  SELECT ifNull(e__group_0.properties___industry, '') AS value,
+         count(*) AS count
+  FROM events AS e
+  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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+  LEFT JOIN
+    (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+            groups.group_type_index AS index,
+            groups.group_key AS key
+     FROM groups
+     WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+     GROUP BY groups.group_type_index,
+              groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+  WHERE and(equals(e.team_id, 2), in(e.event, tuple('buy', 'play movie', 'sign up')), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), notEmpty(e__pdi.person_id))
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0 SETTINGS readonly=2,
+                    max_execution_time=60,
+                    allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.1
+  '''
+  SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
+         countIf(ifNull(equals(steps, 2), 0)) AS step_2,
+         countIf(ifNull(equals(steps, 3), 0)) AS step_3,
+         avg(step_1_average_conversion_time_inner) AS step_1_average_conversion_time,
+         avg(step_2_average_conversion_time_inner) AS step_2_average_conversion_time,
+         median(step_1_median_conversion_time_inner) AS step_1_median_conversion_time,
+         median(step_2_median_conversion_time_inner) AS step_2_median_conversion_time,
+         prop AS prop
+  FROM
+    (SELECT aggregation_target AS aggregation_target,
+            steps AS steps,
+            prop AS prop,
+            avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) AS step_2_median_conversion_time_inner,
+            prop AS prop
+     FROM
+       (SELECT aggregation_target AS aggregation_target,
+               steps AS steps,
+               prop AS prop,
+               max(steps) OVER (PARTITION BY aggregation_target,
+                                             prop) AS max_steps,
+                               step_1_conversion_time AS step_1_conversion_time,
+                               step_2_conversion_time AS step_2_conversion_time,
+                               prop AS prop
+        FROM
+          (SELECT aggregation_target AS aggregation_target,
+                  timestamp AS timestamp,
+                  step_0 AS step_0,
+                  latest_0 AS latest_0,
+                  step_1 AS step_1,
+                  latest_1 AS latest_1,
+                  step_2 AS step_2,
+                  latest_2 AS latest_2,
+                  prop AS prop,
+                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(latest_0, toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), 2, 1)) AS steps,
+                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(latest_0, toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
+                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(latest_1, toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
+                  prop AS prop
+           FROM
+             (SELECT aggregation_target AS aggregation_target,
+                     timestamp AS timestamp,
+                     step_0 AS step_0,
+                     latest_0 AS latest_0,
+                     step_1 AS step_1,
+                     latest_1 AS latest_1,
+                     step_2 AS step_2,
+                     min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                      prop
+                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                        prop AS prop
+              FROM
+                (SELECT aggregation_target AS aggregation_target,
+                        timestamp AS timestamp,
+                        step_0 AS step_0,
+                        latest_0 AS latest_0,
+                        step_1 AS step_1,
+                        latest_1 AS latest_1,
+                        step_2 AS step_2,
+                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
+                        prop AS prop
+                 FROM
+                   (SELECT aggregation_target AS aggregation_target,
+                           timestamp AS timestamp,
+                           step_0 AS step_0,
+                           latest_0 AS latest_0,
+                           step_1 AS step_1,
+                           min(latest_1) OVER (PARTITION BY aggregation_target,
+                                                            prop
+                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
+                                              step_2 AS step_2,
+                                              min(latest_2) OVER (PARTITION BY aggregation_target,
+                                                                               prop
+                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
+                                                                 if(has(['technology', 'finance'], prop), prop, 'Other') AS prop
+                    FROM
+                      (SELECT timestamp AS timestamp,
+                              aggregation_target AS aggregation_target,
+                              step_0 AS step_0,
+                              latest_0 AS latest_0,
+                              step_1 AS step_1,
+                              latest_1 AS latest_1,
+                              step_2 AS step_2,
+                              latest_2 AS latest_2,
+                              prop_basic AS prop_basic,
+                              prop,
+                              prop_vals AS prop_vals,
+                              prop_vals AS prop
+                       FROM
+                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
+                                 e__pdi.person_id AS aggregation_target,
+                                 if(equals(e.event, 'sign up'), 1, 0) AS step_0,
+                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
+                                 if(equals(e.event, 'play movie'), 1, 0) AS step_1,
+                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
+                                 if(equals(e.event, 'buy'), 1, 0) AS step_2,
+                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
+                                 ifNull(e__group_0.properties___industry, '') AS prop_basic,
+                                 prop_basic AS prop,
+                                 argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
+                          FROM events AS e
+                          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 e__pdi ON equals(e.distinct_id, e__pdi.distinct_id)
+                          LEFT JOIN
+                            (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), groups._timestamp) AS properties___industry,
+                                    groups.group_type_index AS index,
+                                    groups.group_key AS key
+                             FROM groups
+                             WHERE and(equals(groups.team_id, 2), ifNull(equals(index, 0), 0))
+                             GROUP BY groups.group_type_index,
+                                      groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
+                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))))
+           WHERE ifNull(equals(step_0, 1), 0)))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING ifNull(equals(steps, max_steps), isNull(steps)
+                   and isNull(max_steps)))
+  GROUP BY prop
+  LIMIT 100 SETTINGS readonly=2,
+                     max_execution_time=60,
+                     allow_experimental_object_type=1
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.10
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.11
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.12
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.13
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  arraySort([latest_0,latest_1,latest_2]) as event_times,
+                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                  if(isNotNull(conversion_times[2])
+                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                  if(isNotNull(conversion_times[3])
+                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'play movie', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'buy', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'sign up', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'buy', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'sign up', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'play movie', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.14
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.15
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.16
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.17
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  arraySort([latest_0,latest_1,latest_2]) as event_times,
+                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                  if(isNotNull(conversion_times[2])
+                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                  if(isNotNull(conversion_times[3])
+                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'play movie', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'buy', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'sign up', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'buy', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'sign up', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'play movie', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.2
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.3
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.4
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.5
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  arraySort([latest_0,latest_1,latest_2]) as event_times,
+                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                  if(isNotNull(conversion_times[2])
+                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                  if(isNotNull(conversion_times[3])
+                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'play movie', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'buy', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'sign up', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'buy', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'sign up', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'play movie', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [1, 2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.6
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.7
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.8
+  '''
+  
+  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
+         count(*) as count
+  FROM events e
+  LEFT JOIN
+    (SELECT group_key,
+            argMax(group_properties, _timestamp) AS group_properties_0
+     FROM groups
+     WHERE team_id = 2
+       AND group_type_index = 0
+     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+  WHERE team_id = 2
+    AND event IN ['buy', 'play movie', 'sign up']
+    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+  GROUP BY value
+  ORDER BY count DESC, value DESC
+  LIMIT 26
+  OFFSET 0
+  '''
+# ---
+# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.9
+  '''
+  
+  SELECT aggregation_target AS actor_id
+  FROM
+    (SELECT aggregation_target,
+            steps,
+            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
+            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
+            median(step_1_conversion_time) step_1_median_conversion_time_inner,
+            median(step_2_conversion_time) step_2_median_conversion_time_inner,
+            prop
+     FROM
+       (SELECT aggregation_target,
+               steps,
+               max(steps) over (PARTITION BY aggregation_target,
+                                             prop) as max_steps,
+                               step_1_conversion_time,
+                               step_2_conversion_time,
+                               prop
+        FROM
+          (SELECT *,
+                  arraySort([latest_0,latest_1,latest_2]) as event_times,
+                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                  if(isNotNull(conversion_times[2])
+                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                  if(isNotNull(conversion_times[3])
+                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'sign up', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'play movie', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'buy', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'play movie', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'buy', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'sign up', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1
+           UNION ALL SELECT *,
+                            arraySort([latest_0,latest_1,latest_2]) as event_times,
+                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
+                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
+                            if(isNotNull(conversion_times[2])
+                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
+                            if(isNotNull(conversion_times[3])
+                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
+           FROM
+             (SELECT aggregation_target, timestamp, step_0,
+                                                    latest_0,
+                                                    step_1,
+                                                    min(latest_1) over (PARTITION by aggregation_target,
+                                                                                     prop
+                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
+                                                                       step_2,
+                                                                       min(latest_2) over (PARTITION by aggregation_target,
+                                                                                                        prop
+                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
+                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
+              FROM
+                (SELECT *,
+                        prop_vals as prop
+                 FROM
+                   (SELECT e.timestamp as timestamp,
+                           pdi.person_id as aggregation_target,
+                           pdi.person_id as person_id,
+                           if(event = 'buy', 1, 0) as step_0,
+                           if(step_0 = 1, timestamp, null) as latest_0,
+                           if(event = 'sign up', 1, 0) as step_1,
+                           if(step_1 = 1, timestamp, null) as latest_1,
+                           if(event = 'play movie', 1, 0) as step_2,
+                           if(step_2 = 1, timestamp, null) as latest_2,
+                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
+                           prop_basic as prop,
+                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
+                    FROM events e
+                    INNER JOIN
+                      (SELECT distinct_id,
+                              argMax(person_id, version) as person_id
+                       FROM person_distinct_id2
+                       WHERE team_id = 2
+                         AND distinct_id IN
+                           (SELECT distinct_id
+                            FROM events
+                            WHERE team_id = 2
+                              AND event IN ['buy', 'play movie', 'sign up']
+                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
+                       GROUP BY distinct_id
+                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
+                    LEFT JOIN
+                      (SELECT group_key,
+                              argMax(group_properties, _timestamp) AS group_properties_0
+                       FROM groups
+                       WHERE team_id = 2
+                         AND group_type_index = 0
+                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
+                    WHERE team_id = 2
+                      AND event IN ['buy', 'play movie', 'sign up']
+                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
+                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
+                      AND (step_0 = 1
+                           OR step_1 = 1
+                           OR step_2 = 1) )))
+           WHERE step_0 = 1 ))
+     GROUP BY aggregation_target,
+              steps,
+              prop
+     HAVING steps = max_steps)
+  WHERE steps IN [2, 3]
+    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
+  ORDER BY aggregation_target
+  LIMIT 100
+  OFFSET 0 SETTINGS max_ast_elements=1000000,
+                    max_expanded_ast_elements=1000000
+  '''
+# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/breakdown_cases.py b/posthog/hogql_queries/insights/funnels/test/breakdown_cases.py
new file mode 100644
index 0000000000000..4d00b0a265b98
--- /dev/null
+++ b/posthog/hogql_queries/insights/funnels/test/breakdown_cases.py
@@ -0,0 +1,3100 @@
+from dataclasses import dataclass
+from datetime import datetime
+
+from string import ascii_lowercase
+from typing import Any, Callable, Dict, List, Literal, Optional, Union, cast
+
+from posthog.constants import INSIGHT_FUNNELS, FunnelOrderType
+from posthog.hogql_queries.insights.funnels.funnels_query_runner import FunnelsQueryRunner
+from posthog.hogql_queries.legacy_compatibility.filter_to_query import filter_to_query
+from posthog.models.action.action import Action
+
+from posthog.models.cohort import Cohort
+from posthog.models.filters import Filter
+from posthog.models.group.util import create_group
+from posthog.models.group_type_mapping import GroupTypeMapping
+from posthog.models.instance_setting import override_instance_config
+from posthog.models.person.person import Person
+from posthog.queries.breakdown_props import ALL_USERS_COHORT_ID
+from posthog.schema import FunnelsQuery
+from posthog.test.base import (
+    APIBaseTest,
+    also_test_with_materialized_columns,
+    also_test_with_person_on_events_v2,
+    snapshot_clickhouse_queries,
+)
+from posthog.test.test_journeys import journeys_for
+
+
+@dataclass(frozen=True)
+class FunnelStepResult:
+    name: str
+    count: int
+    breakdown: Union[List[str], str]
+    average_conversion_time: Optional[float] = None
+    median_conversion_time: Optional[float] = None
+    type: Literal["events", "actions"] = "events"
+    action_id: Optional[str] = None
+
+
+def funnel_breakdown_test_factory(
+    funnel_order_type: FunnelOrderType,
+    FunnelPerson,
+    _create_action: Callable[..., Action],
+    _create_person: Callable[..., Person],
+):
+    class TestFunnelBreakdown(APIBaseTest):
+        def _get_actor_ids_at_step(self, filter, funnel_step, breakdown_value=None):
+            filter = Filter(data=filter, team=self.team)
+            person_filter = filter.shallow_clone({"funnel_step": funnel_step, "funnel_step_breakdown": breakdown_value})
+            _, serialized_result, _ = FunnelPerson(person_filter, self.team).get_actors()
+
+            return [val["id"] for val in serialized_result]
+
+        def _assert_funnel_breakdown_result_is_correct(self, result, steps: List[FunnelStepResult]):
+            def funnel_result(step: FunnelStepResult, order: int) -> Dict[str, Any]:
+                return {
+                    "action_id": step.name if step.type == "events" else step.action_id,
+                    "name": step.name,
+                    "custom_name": None,
+                    "order": order,
+                    "people": [],
+                    "count": step.count,
+                    "type": step.type,
+                    "average_conversion_time": step.average_conversion_time,
+                    "median_conversion_time": step.median_conversion_time,
+                    "breakdown": step.breakdown,
+                    "breakdown_value": step.breakdown,
+                    **(
+                        {
+                            "action_id": None,
+                            "name": f"Completed {order+1} step{'s' if order > 0 else ''}",
+                        }
+                        if funnel_order_type == FunnelOrderType.UNORDERED
+                        else {}
+                    ),
+                }
+
+            step_results = []
+            for index, step_result in enumerate(steps):
+                step_results.append(funnel_result(step_result, index))
+
+            assert_funnel_results_equal(result, step_results)
+
+        @also_test_with_materialized_columns(["$browser", "$browser_version"])
+        def test_funnel_step_multi_property_breakdown_event(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser", "$browser_version"],
+            }
+
+            journey = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Chrome",
+                            "$browser_version": 95,
+                        },
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Chrome",
+                            "$browser_version": 95,
+                        },
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 15),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Chrome",
+                            "$browser_version": 95,
+                        },
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Safari",
+                            "$browser_version": 15,
+                        },
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Safari",
+                            "$browser_version": 15,
+                        },
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {
+                            "key": "val",
+                            "$browser": "Safari",
+                            "$browser_version": 14,
+                        },
+                    }
+                ],
+            }
+
+            people = journeys_for(events_by_person=journey, team=self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari", "14"], count=1),
+                    FunnelStepResult(name="play movie", breakdown=["Safari", "14"], count=0),
+                    FunnelStepResult(name="buy", breakdown=["Safari", "14"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Safari", "14"]),
+                [people["person3"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Safari", "14"]), [])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari", "15"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari", "15"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari", "15"], count=0),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Safari", "15"]),
+                [people["person2"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, ["Safari", "15"]),
+                [people["person2"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Chrome", "95"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Chrome", "95"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome", "95"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Chrome", "95"]),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, ["Chrome", "95"]),
+                [people["person1"].uuid],
+            )
+
+        @also_test_with_materialized_columns(["$browser"])
+        def test_funnel_step_breakdown_event_with_string_only_breakdown(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": "$browser",
+            }
+
+            journey = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 15),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    }
+                ],
+            }
+
+            people = journeys_for(events_by_person=journey, team=self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Chrome"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Chrome"),
+                [people["person1"].uuid],
+            )
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari"], count=2),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid, people["person3"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Safari"),
+                [people["person2"].uuid],
+            )
+
+        @also_test_with_materialized_columns(["$browser"])
+        def test_funnel_step_breakdown_event(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+            }
+
+            journey = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 15),
+                        "properties": {"key": "val", "$browser": "Chrome"},
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"key": "val", "$browser": "Safari"},
+                    }
+                ],
+            }
+
+            people = journeys_for(events_by_person=journey, team=self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Chrome"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari"], count=2),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid, people["person3"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Safari"),
+                [people["person2"].uuid],
+            )
+
+        @also_test_with_materialized_columns(["$browser"])
+        def test_funnel_step_breakdown_event_with_other(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_limit": 1,
+            }
+
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 15),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Safari"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Safari"},
+                    }
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "random"},
+                    }
+                ],
+                "person5": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": "another one"},
+                    }
+                ],
+            }
+
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sort_breakdown_funnel_results(results)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari"], count=2),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid, people["person3"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Safari"),
+                [people["person2"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Other"], count=3),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Other"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Other"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Other"),
+                [
+                    people["person1"].uuid,
+                    people["person4"].uuid,
+                    people["person5"].uuid,
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Other"),
+                [people["person1"].uuid],
+            )
+
+        @also_test_with_materialized_columns(["$browser"])
+        def test_funnel_step_breakdown_event_no_type(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown": ["$browser"],
+            }
+
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 15),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Safari"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Safari"},
+                    }
+                ],
+            }
+
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Chrome"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari"], count=2),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid, people["person3"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Safari"),
+                [people["person2"].uuid],
+            )
+
+        @also_test_with_materialized_columns(person_properties=["$browser"])
+        def test_funnel_step_breakdown_person(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "person",
+                "breakdown": ["$browser"],
+            }
+
+            person1 = _create_person(
+                distinct_ids=["person1"],
+                team_id=self.team.pk,
+                properties={"$browser": "Chrome"},
+            )
+            person2 = _create_person(
+                distinct_ids=["person2"],
+                team_id=self.team.pk,
+                properties={"$browser": "Safari"},
+            )
+
+            peoples_journeys = {
+                "person1": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 12)},
+                    {"event": "play movie", "timestamp": datetime(2020, 1, 1, 13)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 15)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 14)},
+                    {"event": "play movie", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            journeys_for(peoples_journeys, self.team, create_people=False)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Chrome"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=7200,
+                        median_conversion_time=7200,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Chrome"), [person1.uuid])
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, "Chrome"), [person1.uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Safari"], count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Safari"), [person2.uuid])
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 3, "Safari"), [])
+
+        @also_test_with_materialized_columns(["some_breakdown_val"])
+        def test_funnel_step_breakdown_limit(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["some_breakdown_val"],
+                "breakdown_limit": 5,
+            }
+
+            events_by_person = {}
+            for num in range(10):
+                for i in range(num):
+                    person_id = f"person_{num}_{i}"
+                    events_by_person[person_id] = [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                    ]
+            journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            # assert that we give 5 at a time at most and that those values are the most popular ones
+            breakdown_vals = sorted([res[0]["breakdown"] for res in results])
+            self.assertEqual([["5"], ["6"], ["7"], ["8"], ["9"], ["Other"]], breakdown_vals)
+
+        @also_test_with_materialized_columns(["some_breakdown_val"])
+        def test_funnel_step_custom_breakdown_limit_with_nulls(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown_limit": 3,
+                "breakdown": ["some_breakdown_val"],
+            }
+
+            events_by_person = {}
+            for num in range(5):
+                for i in range(num):
+                    person_id = f"person_{num}_{i}"
+                    events_by_person[person_id] = [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                    ]
+
+                    # no breakdown value for this guy
+            events_by_person["person_null"] = [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 12)},
+                {"event": "play movie", "timestamp": datetime(2020, 1, 1, 13)},
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 15)},
+            ]
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            breakdown_vals = sorted([res[0]["breakdown"] for res in results])
+            self.assertEqual([["2"], ["3"], ["4"], ["Other"]], breakdown_vals)
+            # skipped 1 and '' because the limit was 3.
+            self.assertTrue(people["person_null"].uuid in self._get_actor_ids_at_step(filters, 1, "Other"))
+
+        @also_test_with_materialized_columns(["some_breakdown_val"])
+        def test_funnel_step_custom_breakdown_limit_with_nulls_included(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown_limit": 6,
+                "breakdown": ["some_breakdown_val"],
+            }
+
+            events_by_person = {}
+            for num in range(5):
+                for i in range(num):
+                    person_id = f"person_{num}_{i}"
+                    events_by_person[person_id] = [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"some_breakdown_val": str(num)},
+                        },
+                    ]
+
+                    # no breakdown value for this guy
+            events_by_person["person_null"] = [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 12)},
+                {"event": "play movie", "timestamp": datetime(2020, 1, 1, 13)},
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 15)},
+            ]
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            breakdown_vals = sorted([res[0]["breakdown"] for res in results])
+            self.assertEqual([[""], ["1"], ["2"], ["3"], ["4"]], breakdown_vals)
+            # included 1 and '' because the limit was 6.
+
+            for i in range(1, 5):
+                self.assertEqual(len(self._get_actor_ids_at_step(filters, 3, str(i))), i)
+
+            self.assertEqual([people["person_null"].uuid], self._get_actor_ids_at_step(filters, 1, ""))
+            self.assertEqual([people["person_null"].uuid], self._get_actor_ids_at_step(filters, 3, ""))
+
+        @also_test_with_materialized_columns(["$browser"])
+        def test_funnel_step_breakdown_event_single_person_multiple_breakdowns(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "other event", "order": 0}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "0",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    # mixed property type!
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                ]
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["0"], count=1),
+                    FunnelStepResult(name="other event", breakdown=["0"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person1"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome"]),
+                    FunnelStepResult(name="other event", breakdown=["Chrome"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac"]),
+                    FunnelStepResult(name="other event", breakdown=["Mac"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Mac"), [people["person1"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari"]),
+                    FunnelStepResult(name="other event", breakdown=["Safari"], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person1"].uuid],
+            )
+
+        def test_funnel_step_breakdown_event_single_person_events_with_multiple_properties(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "all_events",
+            }
+
+            people = journeys_for(
+                {
+                    "person1": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"$browser": "Chrome"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 2, 12, 30),
+                            "properties": {"$browser": "Safari"},
+                        },
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 2, 13),
+                            "properties": {"$browser": "Safari"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$browser": "Safari"},
+                        },
+                    ]
+                },
+                self.team,
+            )
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self.assertEqual(len(results), 2)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome"]),
+                    FunnelStepResult(name="play movie", count=0, breakdown=["Chrome"]),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, "Chrome"), [])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari"]),
+                    FunnelStepResult(
+                        name="play movie",
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                        breakdown=["Safari"],
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "Safari"),
+                [people["person1"].uuid],
+            )
+
+        @also_test_with_materialized_columns(person_properties=["key"], verify_no_jsonextract=False)
+        def test_funnel_cohort_breakdown(self):
+            # This caused some issues with SQL parsing
+            _create_person(
+                distinct_ids=[f"person1"],
+                team_id=self.team.pk,
+                properties={"key": "value"},
+            )
+            people = journeys_for(
+                {"person1": [{"event": "sign up", "timestamp": datetime(2020, 1, 2, 12)}]},
+                self.team,
+                create_people=False,
+            )
+
+            cohort = Cohort.objects.create(
+                team=self.team,
+                name="test_cohort",
+                groups=[{"properties": [{"key": "key", "value": "value", "type": "person"}]}],
+            )
+            cohort.calculate_people_ch(pending_version=0)
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "cohort",
+                "breakdown": ["all", cohort.pk],
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": 0,
+                # first touch means same user can't be in 'all' and the other cohort both
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self.assertEqual(len(results[0]), 3)
+            self.assertEqual(results[0][0]["breakdown"], "all users")
+            self.assertEqual(len(results[1]), 3)
+            self.assertEqual(results[1][0]["breakdown"], "test_cohort")
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, cohort.pk),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, cohort.pk), [])
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ALL_USERS_COHORT_ID),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ALL_USERS_COHORT_ID), [])
+
+            # non array
+            filters = {
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "insight": INSIGHT_FUNNELS,
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "cohort",
+                "breakdown": cohort.pk,
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self.assertEqual(len(results[0]), 3)
+            self.assertEqual(results[0][0]["breakdown"], "test_cohort")
+            self.assertEqual(results[0][0]["breakdown_value"], cohort.pk)
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, cohort.pk),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, cohort.pk), [])
+
+        def test_basic_funnel_default_funnel_days_breakdown_event(self):
+            events_by_person = {
+                "user_1": [
+                    {
+                        "event": "user signed up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$current_url": "https://posthog.com/docs/x"},
+                    },
+                    {
+                        "event": "paid",
+                        "timestamp": datetime(2020, 1, 10, 14),
+                        "properties": {"$current_url": "https://posthog.com/docs/x"},
+                    },
+                ]
+            }
+            # Dummy events to make sure that breakdown is not confused
+            # It was confused before due to the nature of fetching breakdown values with a LIMIT based on value popularity
+            # See https://github.com/PostHog/posthog/pull/5496
+            for current_url_letter in ascii_lowercase[:20]:
+                # Twenty dummy breakdown values
+                for _ in range(2):
+                    # Each twice, so that the breakdown values from dummy events rank higher in raw order
+                    # This test makes sure that events are prefiltered properly to avoid problems with this raw order
+                    events_by_person["user_1"].append(
+                        {
+                            "event": "user signed up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$current_url": f"https://posthog.com/blog/{current_url_letter}"},
+                        }
+                    )
+
+            journeys_for(events_by_person, self.team)
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {
+                        "id": "user signed up",
+                        "type": "events",
+                        "order": 0,
+                        "properties": [
+                            {
+                                "key": "$current_url",
+                                "operator": "icontains",
+                                "type": "event",
+                                "value": "https://posthog.com/docs",
+                            }
+                        ],
+                    },
+                    {"id": "paid", "type": "events", "order": 1},
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-14",
+                "breakdown": ["$current_url"],
+                "breakdown_type": "event",
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(
+                        name="user signed up",
+                        count=1,
+                        breakdown=["https://posthog.com/docs/x"],
+                    ),
+                    FunnelStepResult(
+                        name="paid",
+                        count=1,
+                        average_conversion_time=691200.0,
+                        median_conversion_time=691200.0,
+                        breakdown=["https://posthog.com/docs/x"],
+                    ),
+                ],
+            )
+
+        @also_test_with_materialized_columns(["$current_url"])
+        def test_basic_funnel_default_funnel_days_breakdown_action(self):
+            # Same case as test_basic_funnel_default_funnel_days_breakdown_event but with an action
+            user_signed_up_action = _create_action(name="user signed up", event="user signed up", team=self.team)
+
+            events_by_person = {
+                "user_1": [
+                    {
+                        "event": "user signed up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$current_url": "https://posthog.com/docs/x"},
+                    },
+                    {
+                        "event": "paid",
+                        "timestamp": datetime(2020, 1, 10, 14),
+                        "properties": {"$current_url": "https://posthog.com/docs/x"},
+                    },
+                ]
+            }
+            for current_url_letter in ascii_lowercase[:20]:
+                for _ in range(2):
+                    events_by_person["user_1"].append(
+                        {
+                            "event": "user signed up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$current_url": f"https://posthog.com/blog/{current_url_letter}"},
+                        }
+                    )
+
+            journeys_for(events_by_person, self.team)
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "actions": [
+                    {
+                        "id": user_signed_up_action.id,
+                        "order": 0,
+                        "properties": [
+                            {
+                                "key": "$current_url",
+                                "operator": "icontains",
+                                "type": "event",
+                                "value": "https://posthog.com/docs",
+                            }
+                        ],
+                    }
+                ],
+                "events": [{"id": "paid", "type": "events", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-14",
+                "breakdown": ["$current_url"],
+                "breakdown_type": "event",
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(
+                        name="user signed up",
+                        count=1,
+                        breakdown=["https://posthog.com/docs/x"],
+                        type="actions",
+                        action_id=user_signed_up_action.id,  # type: ignore
+                    ),
+                    FunnelStepResult(
+                        name="paid",
+                        count=1,
+                        average_conversion_time=691200.0,
+                        median_conversion_time=691200.0,
+                        breakdown=["https://posthog.com/docs/x"],
+                    ),
+                ],
+            )
+
+        def test_funnel_step_breakdown_with_first_touch_attribution(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "first_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # first touch means alakazam is disregarded
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+                # no properties dude, represented by ''
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 5)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person5"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["0"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["0"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person4"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Mac"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Mac"), [people["person3"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[4],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid],
+            )
+
+        def test_funnel_step_breakdown_with_last_touch_attribution(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "last_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # last touch means 0 is disregarded
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "Alakazam"},
+                    },
+                ],
+                # no properties dude, represented by ''
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 5)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person5"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["Alakazam"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Alakazam"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Alakazam"),
+                [people["person4"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Mac"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Mac"), [people["person3"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[4],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid],
+            )
+
+        def test_funnel_step_breakdown_with_step_attribution(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "0",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # step attribution means alakazam is valid when step = 1
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 4)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person2"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["0"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["0"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person4"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Chrome"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Mac"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Mac"), [people["person3"].uuid])
+
+        def test_funnel_step_breakdown_with_step_one_attribution(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "1",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # step attribution means alakazam is valid when step = 1
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 3)
+            # Chrome and Mac goes away, Safari comes back
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=2),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=2,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ""),
+                [people["person1"].uuid, people["person3"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Safari"],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "Safari"),
+                [people["person2"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["alakazam"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["alakazam"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "alakazam"),
+                [people["person4"].uuid],
+            )
+
+        def test_funnel_step_multiple_breakdown_with_first_touch_attribution(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser", "$version"],
+                "breakdown_attribution_type": "first_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome", "$version": "xyz"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari", "$version": "xyz"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$version": "no-mac"},
+                    },
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0, "$version": 0},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+                # no properties dude, represented by ''
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 5)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["", ""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["", ""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["", ""]),
+                [people["person5"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["0", "0"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["0", "0"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["0", "0"]),
+                [people["person4"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome", "xyz"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome", "xyz"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Chrome", "xyz"]),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac", ""]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Mac", ""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Mac", ""]),
+                [people["person3"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[4],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari", "xyz"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Safari", "xyz"],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Safari", "xyz"]),
+                [people["person2"].uuid],
+            )
+
+        def test_funnel_step_multiple_breakdown_with_first_touch_attribution_incomplete_funnel(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser", "$version"],
+                "breakdown_attribution_type": "first_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome", "$version": "xyz"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari", "$version": "xyz"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 15), "properties": {"$version": "no-mac"}},
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0, "$version": 0},
+                    },
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 16), "properties": {"$browser": "alakazam"}},
+                ],
+                # no properties dude, represented by ''
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 5)
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["", ""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["", ""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["", ""]),
+                [people["person5"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["0", "0"], count=1),
+                    FunnelStepResult(name="buy", breakdown=["0", "0"], count=0),
+                ],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["0", "0"]),
+                [people["person4"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[2],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Chrome", "xyz"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Chrome", "xyz"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Chrome", "xyz"]),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[3],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Mac", ""]),
+                    FunnelStepResult(name="buy", breakdown=["Mac", ""], count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Mac", ""]),
+                [people["person3"].uuid],
+            )
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Mac", ""]), [])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[4],
+                [
+                    FunnelStepResult(name="sign up", count=1, breakdown=["Safari", "xyz"]),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["Safari", "xyz"],
+                        count=1,
+                        average_conversion_time=86400,
+                        median_conversion_time=86400,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, ["Safari", "xyz"]),
+                [people["person2"].uuid],
+            )
+
+        def test_funnel_step_breakdown_with_step_one_attribution_incomplete_funnel(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser"],
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "1",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 13), "properties": {"$browser": "Safari"}}
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)}
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # step attribution means alakazam is valid when step = 1
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            # Breakdown by step_1 means funnel items that never reach step_1 are NULLed out
+            self.assertEqual(len(results), 2)
+            # Chrome and Mac and Safari goes away
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person1"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["alakazam"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["alakazam"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "alakazam"),
+                [people["person4"].uuid],
+            )
+
+        def test_funnel_step_non_array_breakdown_with_step_one_attribution_incomplete_funnel(self):
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": "$browser",
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "1",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 13), "properties": {"$browser": "Safari"}}
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    # {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)}
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0},
+                    },
+                    # step attribution means alakazam is valid when step = 1
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+            }
+            people = journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            # Breakdown by step_1 means funnel items that never reach step_1 are NULLed out
+            self.assertEqual(len(results), 2)
+            # Chrome and Mac and Safari goes away
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown=[""], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=[""],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person1"].uuid])
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown=["alakazam"], count=1),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown=["alakazam"],
+                        count=1,
+                        average_conversion_time=3600,
+                        median_conversion_time=3600,
+                    ),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "alakazam"),
+                [people["person4"].uuid],
+            )
+
+        @snapshot_clickhouse_queries
+        def test_funnel_step_multiple_breakdown_snapshot(self):
+            # No person querying here, so snapshots are more legible
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": ["$browser", "$version"],
+                "breakdown_attribution_type": "first_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome", "$version": "xyz"},
+                    },
+                    {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari", "$version": "xyz"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$version": "no-mac"},
+                    },
+                ],
+                "person4": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$browser": 0, "$version": 0},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 16),
+                        "properties": {"$browser": "alakazam"},
+                    },
+                ],
+                # no properties dude, represented by ''
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 5)
+
+        @snapshot_clickhouse_queries
+        def test_funnel_breakdown_correct_breakdown_props_are_chosen(self):
+            # No person querying here, so snapshots are more legible
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {
+                        "id": "buy",
+                        "properties": [{"type": "event", "key": "$version", "value": "xyz"}],
+                        "order": 1,
+                    },
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": "$browser",
+                "breakdown_attribution_type": "first_touch",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome", "$version": "xyz"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    # discarded at step 1 because doesn't meet criteria
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari", "$version": "xyz"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$version": "xyz", "$browser": "Mac"},
+                    },
+                ],
+                # no properties dude, represented by '', who finished step 0
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 4)
+
+            self.assertCountEqual(
+                [res[0]["breakdown"] for res in results],
+                [["Mac"], ["Chrome"], ["Safari"], [""]],
+            )
+
+        @snapshot_clickhouse_queries
+        def test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step(self):
+            # No person querying here, so snapshots are more legible
+
+            filters = {
+                "insight": INSIGHT_FUNNELS,
+                "funnel_order_type": funnel_order_type,
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {
+                        "id": "buy",
+                        "properties": [{"type": "event", "key": "$version", "value": "xyz"}],
+                        "order": 1,
+                    },
+                ],
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown_type": "event",
+                "breakdown": "$browser",
+                "breakdown_attribution_type": "step",
+                "breakdown_attribution_value": "1",
+            }
+
+            # event
+            events_by_person = {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome", "$version": "xyz"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    # discarded because doesn't meet criteria
+                ],
+                "person2": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari", "$version": "xyz"},
+                    },
+                ],
+                "person3": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Mac"},
+                    },
+                    {
+                        "event": "buy",
+                        "timestamp": datetime(2020, 1, 2, 15),
+                        "properties": {"$version": "xyz", "$browser": "Mac"},
+                    },
+                ],
+                # no properties dude, doesn't make it to step 1, and since breakdown on step 1, is discarded completely
+                "person5": [
+                    {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                    {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+                ],
+            }
+            journeys_for(events_by_person, self.team)
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+            results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+            self.assertEqual(len(results), 2)
+
+            self.assertCountEqual([res[0]["breakdown"] for res in results], [["Mac"], ["Safari"]])
+
+    return TestFunnelBreakdown
+
+
+def funnel_breakdown_group_test_factory(FunnelPerson):
+    funnel_order_type = FunnelOrderType.ORDERED
+
+    class TestFunnelBreakdownGroup(APIBaseTest):
+        def _get_actor_ids_at_step(self, filter, funnel_step, breakdown_value=None):
+            filter = Filter(data=filter, team=self.team)
+            person_filter = filter.shallow_clone({"funnel_step": funnel_step, "funnel_step_breakdown": breakdown_value})
+            _, serialized_result, _ = FunnelPerson(person_filter, self.team).get_actors()
+
+            return [val["id"] for val in serialized_result]
+
+        def _create_groups(self):
+            GroupTypeMapping.objects.create(team=self.team, group_type="organization", group_type_index=0)
+            GroupTypeMapping.objects.create(team=self.team, group_type="company", group_type_index=1)
+
+            create_group(
+                team_id=self.team.pk,
+                group_type_index=0,
+                group_key="org:5",
+                properties={"industry": "finance"},
+            )
+            create_group(
+                team_id=self.team.pk,
+                group_type_index=0,
+                group_key="org:6",
+                properties={"industry": "technology"},
+            )
+            create_group(
+                team_id=self.team.pk,
+                group_type_index=1,
+                group_key="org:5",
+                properties={"industry": "random"},
+            )
+
+        def _assert_funnel_breakdown_result_is_correct(self, result, steps: List[FunnelStepResult]):
+            def funnel_result(step: FunnelStepResult, order: int) -> Dict[str, Any]:
+                return {
+                    "action_id": step.name if step.type == "events" else step.action_id,
+                    "name": step.name,
+                    "custom_name": None,
+                    "order": order,
+                    "people": [],
+                    "count": step.count,
+                    "type": step.type,
+                    "average_conversion_time": step.average_conversion_time,
+                    "median_conversion_time": step.median_conversion_time,
+                    "breakdown": step.breakdown,
+                    "breakdown_value": step.breakdown,
+                    **(
+                        {
+                            "action_id": None,
+                            "name": f"Completed {order+1} step{'s' if order > 0 else ''}",
+                        }
+                        if funnel_order_type == FunnelOrderType.UNORDERED
+                        else {}
+                    ),
+                }
+
+            step_results = []
+            for index, step_result in enumerate(steps):
+                step_results.append(funnel_result(step_result, index))
+
+            assert_funnel_results_equal(result, step_results)
+
+        @snapshot_clickhouse_queries
+        def test_funnel_breakdown_group(self):
+            self._create_groups()
+
+            people = journeys_for(
+                {
+                    "person1": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                    ],
+                    "person2": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 2, 16),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                    ],
+                    "person3": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        }
+                    ],
+                },
+                self.team,
+            )
+
+            filters = {
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "insight": INSIGHT_FUNNELS,
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown": "industry",
+                "breakdown_type": "group",
+                "breakdown_group_type_index": 0,
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown="finance", count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+            # Querying persons when aggregating by persons should be ok, despite group breakdown
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "finance"),
+                [people["person1"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "finance"),
+                [people["person1"].uuid],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown="technology", count=2),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="technology",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(name="buy", breakdown="technology", count=0),
+                ],
+            )
+
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 1, "technology"),
+                [people["person2"].uuid, people["person3"].uuid],
+            )
+            self.assertCountEqual(
+                self._get_actor_ids_at_step(filters, 2, "technology"),
+                [people["person2"].uuid],
+            )
+
+        # TODO: Delete this test when moved to person-on-events
+        @also_test_with_person_on_events_v2
+        def test_funnel_aggregate_by_groups_breakdown_group(self):
+            self._create_groups()
+
+            journeys_for(
+                {
+                    "person1": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                    ],
+                    "person2": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 2, 16),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                    ],
+                    "person3": [
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 2, 18),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        }
+                    ],
+                },
+                self.team,
+            )
+
+            filters = {
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "insight": INSIGHT_FUNNELS,
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown": "industry",
+                "breakdown_type": "group",
+                "breakdown_group_type_index": 0,
+                "aggregation_group_type_index": 0,
+            }
+
+            query = cast(FunnelsQuery, filter_to_query(filters))
+            results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown="finance", count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown="technology", count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="technology",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown="technology",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+        @also_test_with_materialized_columns(
+            group_properties=[(0, "industry")],
+            materialize_only_with_person_on_events=True,
+        )
+        @also_test_with_person_on_events_v2
+        @snapshot_clickhouse_queries
+        def test_funnel_aggregate_by_groups_breakdown_group_person_on_events(self):
+            self._create_groups()
+
+            journeys_for(
+                {
+                    "person1": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 1, 12),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 1, 13),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 1, 15),
+                            "properties": {"$group_0": "org:5", "$browser": "Chrome"},
+                        },
+                    ],
+                    "person2": [
+                        {
+                            "event": "sign up",
+                            "timestamp": datetime(2020, 1, 2, 14),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                        {
+                            "event": "play movie",
+                            "timestamp": datetime(2020, 1, 2, 16),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        },
+                    ],
+                    "person3": [
+                        {
+                            "event": "buy",
+                            "timestamp": datetime(2020, 1, 2, 18),
+                            "properties": {"$group_0": "org:6", "$browser": "Safari"},
+                        }
+                    ],
+                },
+                self.team,
+            )
+
+            filters = {
+                "events": [
+                    {"id": "sign up", "order": 0},
+                    {"id": "play movie", "order": 1},
+                    {"id": "buy", "order": 2},
+                ],
+                "insight": INSIGHT_FUNNELS,
+                "date_from": "2020-01-01",
+                "date_to": "2020-01-08",
+                "funnel_window_days": 7,
+                "breakdown": "industry",
+                "breakdown_type": "group",
+                "breakdown_group_type_index": 0,
+                "aggregation_group_type_index": 0,
+            }
+            with override_instance_config("PERSON_ON_EVENTS_ENABLED", True):
+                query = cast(FunnelsQuery, filter_to_query(filters))
+                results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[0],
+                [
+                    FunnelStepResult(name="sign up", breakdown="finance", count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=3600.0,
+                        median_conversion_time=3600.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown="finance",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+            self._assert_funnel_breakdown_result_is_correct(
+                results[1],
+                [
+                    FunnelStepResult(name="sign up", breakdown="technology", count=1),
+                    FunnelStepResult(
+                        name="play movie",
+                        breakdown="technology",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                    FunnelStepResult(
+                        name="buy",
+                        breakdown="technology",
+                        count=1,
+                        average_conversion_time=7200.0,
+                        median_conversion_time=7200.0,
+                    ),
+                ],
+            )
+
+    return TestFunnelBreakdownGroup
+
+
+def sort_breakdown_funnel_results(results: List[Dict[int, Any]]):
+    return list(sorted(results, key=lambda r: r[0]["breakdown_value"]))
+
+
+def assert_funnel_results_equal(left: List[Dict[str, Any]], right: List[Dict[str, Any]]):
+    """
+    Helper to be able to compare two funnel results, but exclude people urls
+    from the comparison, as these include:
+
+        1. all the params from the request, and will thus almost always be
+        different for varying inputs
+        2. contain timestamps which are not stable across runs
+    """
+
+    def _filter(steps: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+        return [{**step, "converted_people_url": None, "dropped_people_url": None} for step in steps]
+
+    assert len(left) == len(right)
+
+    for index, item in enumerate(_filter(left)):
+        other = _filter(right)[index]
+        assert item.keys() == other.keys()
+        for key in item.keys():
+            try:
+                assert item[key] == other[key]
+            except AssertionError as e:
+                e.args += (
+                    f"failed comparing ${key}",
+                    f'Got "{item[key]}" and "{other[key]}"',
+                )
+                raise
diff --git a/posthog/hogql_queries/insights/funnels/test/conversion_time_cases.py b/posthog/hogql_queries/insights/funnels/test/conversion_time_cases.py
index 63cf914e84cc8..5ff9a7385fc0a 100644
--- a/posthog/hogql_queries/insights/funnels/test/conversion_time_cases.py
+++ b/posthog/hogql_queries/insights/funnels/test/conversion_time_cases.py
@@ -28,7 +28,7 @@ def test_funnel_with_multiple_incomplete_tries(self):
                     {"id": "$pageview", "type": "events", "order": 1},
                     {"id": "something else", "type": "events", "order": 2},
                 ],
-                "funnel_window_days": 1,
+                "funnel_window_interval": 1,
                 "date_from": "2021-05-01 00:00:00",
                 "date_to": "2021-05-14 00:00:00",
             }
diff --git a/posthog/hogql_queries/insights/funnels/test/test_funnel.py b/posthog/hogql_queries/insights/funnels/test/test_funnel.py
index 30b0cfd0df0fb..119afafbf4f71 100644
--- a/posthog/hogql_queries/insights/funnels/test/test_funnel.py
+++ b/posthog/hogql_queries/insights/funnels/test/test_funnel.py
@@ -17,7 +17,6 @@
 from posthog.models.group_type_mapping import GroupTypeMapping
 from posthog.models.property_definition import PropertyDefinition
 from posthog.queries.funnels import ClickhouseFunnelActors
-from posthog.queries.funnels.test.breakdown_cases import assert_funnel_results_equal
 from posthog.schema import EventsNode, FunnelsQuery
 from posthog.test.base import (
     APIBaseTest,
@@ -32,7 +31,11 @@
 from posthog.hogql_queries.insights.funnels.test.conversion_time_cases import (
     funnel_conversion_time_test_factory,
 )
-
+from posthog.hogql_queries.insights.funnels.test.breakdown_cases import (
+    funnel_breakdown_test_factory,
+    funnel_breakdown_group_test_factory,
+    assert_funnel_results_equal,
+)
 from posthog.hogql_queries.insights.funnels import Funnel
 from posthog.test.test_journeys import journeys_for
 
@@ -46,18 +49,26 @@ def _create_action(**kwargs):
     return action
 
 
-# class TestFunnelBreakdown(
-#     ClickhouseTestMixin,
-#     funnel_breakdown_test_factory(  # type: ignore
-#         ClickhouseFunnel,
-#         ClickhouseFunnelActors,
-#         _create_event,
-#         _create_action,
-#         _create_person,
-#     ),
-# ):
-#     maxDiff = None
-#     pass
+class TestFunnelBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_test_factory(  # type: ignore
+        FunnelOrderType.ORDERED,
+        ClickhouseFunnelActors,
+        _create_action,
+        _create_person,
+    ),
+):
+    maxDiff = None
+    pass
+
+
+class TestFunnelGroupBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_group_test_factory(  # type: ignore
+        ClickhouseFunnelActors,
+    ),
+):
+    pass
 
 
 class TestFunnelConversionTime(
@@ -3556,7 +3567,7 @@ def test_smoke(self):
         FROM
             events AS e
         WHERE
-            and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999')))))
+            and(and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999'))), or(equals(step_0, 1), equals(step_1, 1)))))
 WHERE
     equals(step_0, 1)
 LIMIT 100""",
@@ -3616,7 +3627,7 @@ def test_smoke(self):
                 FROM
                     events AS e
                 WHERE
-                    and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999')))))
+                    and(and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999'))), or(equals(step_0, 1), equals(step_1, 1)))))
         WHERE
             equals(step_0, 1)))
 GROUP BY
@@ -3687,7 +3698,7 @@ def test_smoke(self):
                     FROM
                         events AS e
                     WHERE
-                        and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999')))))
+                        and(and(greaterOrEquals(e.timestamp, toDateTime('2024-01-03 00:00:00.000000')), lessOrEquals(e.timestamp, toDateTime('2024-01-10 23:59:59.999999'))), or(equals(step_0, 1), equals(step_1, 1)))))
             WHERE
                 equals(step_0, 1)))
     GROUP BY
diff --git a/posthog/hogql_queries/insights/funnels/test/test_funnel_strict.py b/posthog/hogql_queries/insights/funnels/test/test_funnel_strict.py
index b101fe718be61..a673eb0cddb62 100644
--- a/posthog/hogql_queries/insights/funnels/test/test_funnel_strict.py
+++ b/posthog/hogql_queries/insights/funnels/test/test_funnel_strict.py
@@ -1,4 +1,4 @@
-# from datetime import datetime
+from datetime import datetime
 from typing import cast
 
 from posthog.constants import INSIGHT_FUNNELS, FunnelOrderType
@@ -7,10 +7,11 @@
     funnel_conversion_time_test_factory,
 )
 
-# from posthog.hogql_queries.insights.funnels.test.breakdown_cases import (
-#     assert_funnel_results_equal,
-#     funnel_breakdown_test_factory,
-# )
+from posthog.hogql_queries.insights.funnels.test.breakdown_cases import (
+    funnel_breakdown_test_factory,
+    funnel_breakdown_group_test_factory,
+    assert_funnel_results_equal,
+)
 from posthog.hogql_queries.legacy_compatibility.filter_to_query import filter_to_query
 from posthog.models.action import Action
 from posthog.models.action_step import ActionStep
@@ -25,7 +26,7 @@
     _create_person,
 )
 
-# from posthog.test.test_journeys import journeys_for
+from posthog.test.test_journeys import journeys_for
 
 FORMAT_TIME = "%Y-%m-%d 00:00:00"
 
@@ -39,144 +40,153 @@ def _create_action(**kwargs):
     return action
 
 
-# class TestFunnelStrictStepsBreakdown(
-#     ClickhouseTestMixin,
-#     funnel_breakdown_test_factory(  # type: ignore
-#         FunnelStrict,
-#         ClickhouseFunnelStrictActors,
-#         _create_event,
-#         _create_action,
-#         _create_person,
-#     ),
-# ):
-#     maxDiff = None
-
-#     def test_basic_funnel_default_funnel_days_breakdown_event(self):
-#         # TODO: This test and the one below it fail, only for strict funnels. Figure out why and how to fix
-#         pass
-
-#     def test_basic_funnel_default_funnel_days_breakdown_action(self):
-#         pass
-
-#     def test_basic_funnel_default_funnel_days_breakdown_action_materialized(self):
-#         pass
-
-#     def test_strict_breakdown_events_with_multiple_properties(self):
-#         filters = {
-#             "events": [{"id": "sign up", "order": 0}, {"id": "play movie", "order": 1}],
-#             "insight": INSIGHT_FUNNELS,
-#             "date_from": "2020-01-01",
-#             "date_to": "2020-01-08",
-#             "funnel_window_days": 7,
-#             "breakdown_type": "event",
-#             "breakdown": "$browser",
-#         }
-
-#         people = journeys_for(
-#             {
-#                 "person1": [
-#                     {
-#                         "event": "sign up",
-#                         "timestamp": datetime(2020, 1, 1, 12),
-#                         "properties": {"$browser": "Chrome"},
-#                     },
-#                     {
-#                         "event": "blah",
-#                         "timestamp": datetime(2020, 1, 1, 13),
-#                         "properties": {"$browser": "Chrome"},
-#                     },
-#                     {
-#                         "event": "play movie",
-#                         "timestamp": datetime(2020, 1, 1, 14),
-#                         "properties": {"$browser": "Chrome"},
-#                     },
-#                 ],
-#                 "person2": [
-#                     {
-#                         "event": "sign up",
-#                         "timestamp": datetime(2020, 1, 2, 13),
-#                         "properties": {"$browser": "Safari"},
-#                     },
-#                     {
-#                         "event": "play movie",
-#                         "timestamp": datetime(2020, 1, 2, 14),
-#                         "properties": {"$browser": "Safari"},
-#                     },
-#                 ],
-#             },
-#             self.team,
-#         )
-
-#         query = cast(FunnelsQuery, filter_to_query(filters))
-#         results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
-
-#         assert_funnel_results_equal(
-#             results[0],
-#             [
-#                 {
-#                     "action_id": "sign up",
-#                     "name": "sign up",
-#                     "custom_name": None,
-#                     "order": 0,
-#                     "people": [],
-#                     "count": 1,
-#                     "type": "events",
-#                     "average_conversion_time": None,
-#                     "median_conversion_time": None,
-#                     "breakdown": ["Chrome"],
-#                     "breakdown_value": ["Chrome"],
-#                 },
-#                 {
-#                     "action_id": "play movie",
-#                     "name": "play movie",
-#                     "custom_name": None,
-#                     "order": 1,
-#                     "people": [],
-#                     "count": 0,
-#                     "type": "events",
-#                     "average_conversion_time": None,
-#                     "median_conversion_time": None,
-#                     "breakdown": ["Chrome"],
-#                     "breakdown_value": ["Chrome"],
-#                 },
-#             ],
-#         )
-#         self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Chrome"]), [people["person1"].uuid])
-#         self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Chrome"]), [])
-
-#         assert_funnel_results_equal(
-#             results[1],
-#             [
-#                 {
-#                     "action_id": "sign up",
-#                     "name": "sign up",
-#                     "custom_name": None,
-#                     "order": 0,
-#                     "people": [],
-#                     "count": 1,
-#                     "type": "events",
-#                     "average_conversion_time": None,
-#                     "median_conversion_time": None,
-#                     "breakdown": ["Safari"],
-#                     "breakdown_value": ["Safari"],
-#                 },
-#                 {
-#                     "action_id": "play movie",
-#                     "name": "play movie",
-#                     "custom_name": None,
-#                     "order": 1,
-#                     "people": [],
-#                     "count": 1,
-#                     "type": "events",
-#                     "average_conversion_time": 3600,
-#                     "median_conversion_time": 3600,
-#                     "breakdown": ["Safari"],
-#                     "breakdown_value": ["Safari"],
-#                 },
-#             ],
-#         )
-#         self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Safari"]), [people["person2"].uuid])
-#         self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Safari"]), [people["person2"].uuid])
+class TestFunnelStrictStepsBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_test_factory(  # type: ignore
+        FunnelOrderType.STRICT,
+        ClickhouseFunnelStrictActors,
+        _create_action,
+        _create_person,
+    ),
+):
+    maxDiff = None
+
+    def test_basic_funnel_default_funnel_days_breakdown_event(self):
+        # TODO: This test and the one below it fail, only for strict funnels. Figure out why and how to fix
+        pass
+
+    def test_basic_funnel_default_funnel_days_breakdown_action(self):
+        pass
+
+    def test_basic_funnel_default_funnel_days_breakdown_action_materialized(self):
+        pass
+
+    def test_strict_breakdown_events_with_multiple_properties(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "strict",
+            "events": [{"id": "sign up", "order": 0}, {"id": "play movie", "order": 1}],
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": "$browser",
+        }
+
+        people = journeys_for(
+            {
+                "person1": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 1, 12),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "blah",
+                        "timestamp": datetime(2020, 1, 1, 13),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 1, 14),
+                        "properties": {"$browser": "Chrome"},
+                    },
+                ],
+                "person2": [
+                    {
+                        "event": "sign up",
+                        "timestamp": datetime(2020, 1, 2, 13),
+                        "properties": {"$browser": "Safari"},
+                    },
+                    {
+                        "event": "play movie",
+                        "timestamp": datetime(2020, 1, 2, 14),
+                        "properties": {"$browser": "Safari"},
+                    },
+                ],
+            },
+            self.team,
+        )
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        assert_funnel_results_equal(
+            results[0],
+            [
+                {
+                    "action_id": "sign up",
+                    "name": "sign up",
+                    "custom_name": None,
+                    "order": 0,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Chrome"],
+                    "breakdown_value": ["Chrome"],
+                },
+                {
+                    "action_id": "play movie",
+                    "name": "play movie",
+                    "custom_name": None,
+                    "order": 1,
+                    "people": [],
+                    "count": 0,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Chrome"],
+                    "breakdown_value": ["Chrome"],
+                },
+            ],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Chrome"]), [people["person1"].uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Chrome"]), [])
+
+        assert_funnel_results_equal(
+            results[1],
+            [
+                {
+                    "action_id": "sign up",
+                    "name": "sign up",
+                    "custom_name": None,
+                    "order": 0,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Safari"],
+                    "breakdown_value": ["Safari"],
+                },
+                {
+                    "action_id": "play movie",
+                    "name": "play movie",
+                    "custom_name": None,
+                    "order": 1,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": 3600,
+                    "median_conversion_time": 3600,
+                    "breakdown": ["Safari"],
+                    "breakdown_value": ["Safari"],
+                },
+            ],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Safari"]), [people["person2"].uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Safari"]), [people["person2"].uuid])
+
+
+class TestStrictFunnelGroupBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_group_test_factory(  # type: ignore
+        ClickhouseFunnelStrictActors,
+    ),
+):
+    pass
 
 
 class TestFunnelStrictStepsConversionTime(
diff --git a/posthog/hogql_queries/insights/funnels/test/test_funnel_unordered.py b/posthog/hogql_queries/insights/funnels/test/test_funnel_unordered.py
new file mode 100644
index 0000000000000..36e5d87f39e49
--- /dev/null
+++ b/posthog/hogql_queries/insights/funnels/test/test_funnel_unordered.py
@@ -0,0 +1,1622 @@
+from datetime import datetime
+from typing import cast
+
+from rest_framework.exceptions import ValidationError
+
+from posthog.constants import INSIGHT_FUNNELS, FunnelOrderType
+from posthog.hogql_queries.insights.funnels.funnels_query_runner import FunnelsQueryRunner
+from posthog.hogql_queries.legacy_compatibility.filter_to_query import filter_to_query
+
+from posthog.models.action import Action
+from posthog.models.action_step import ActionStep
+from posthog.models.filters import Filter
+from posthog.models.property_definition import PropertyDefinition
+from posthog.queries.funnels.funnel_unordered_persons import (
+    ClickhouseFunnelUnorderedActors,
+)
+from posthog.hogql_queries.insights.funnels.test.conversion_time_cases import (
+    funnel_conversion_time_test_factory,
+)
+from posthog.schema import FunnelsQuery
+
+from posthog.hogql_queries.insights.funnels.test.breakdown_cases import (
+    FunnelStepResult,
+    funnel_breakdown_test_factory,
+    funnel_breakdown_group_test_factory,
+    assert_funnel_results_equal,
+)
+from posthog.test.base import (
+    APIBaseTest,
+    ClickhouseTestMixin,
+    _create_event,
+    _create_person,
+    snapshot_clickhouse_queries,
+)
+
+from posthog.test.test_journeys import journeys_for
+
+FORMAT_TIME = "%Y-%m-%d 00:00:00"
+
+
+def _create_action(**kwargs):
+    team = kwargs.pop("team")
+    name = kwargs.pop("name")
+    properties = kwargs.pop("properties", {})
+    action = Action.objects.create(team=team, name=name)
+    ActionStep.objects.create(action=action, event=name, properties=properties)
+    return action
+
+
+class TestFunnelUnorderedStepsBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_test_factory(  # type: ignore
+        FunnelOrderType.UNORDERED,
+        ClickhouseFunnelUnorderedActors,
+        _create_action,
+        _create_person,
+    ),
+):
+    maxDiff = None
+
+    def test_funnel_step_breakdown_event_single_person_events_with_multiple_properties(self):
+        # overriden from factory
+
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [{"id": "sign up", "order": 0}, {"id": "play movie", "order": 1}],
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": "$browser",
+            "breakdown_attribution_type": "all_events",
+        }
+
+        # event
+        person1 = _create_person(distinct_ids=["person1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="sign up",
+            distinct_id="person1",
+            properties={"key": "val", "$browser": "Chrome"},
+            timestamp="2020-01-01T12:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="sign up",
+            distinct_id="person1",
+            properties={"key": "val", "$browser": "Safari"},
+            timestamp="2020-01-02T13:00:00Z",
+        )
+        _create_event(
+            team=self.team,
+            event="play movie",
+            distinct_id="person1",
+            properties={"key": "val", "$browser": "Safari"},
+            timestamp="2020-01-02T14:00:00Z",
+        )
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        assert_funnel_results_equal(
+            results[0],
+            [
+                {
+                    "action_id": None,
+                    "name": "Completed 1 step",
+                    "custom_name": None,
+                    "order": 0,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Chrome"],
+                    "breakdown_value": ["Chrome"],
+                },
+                {
+                    "action_id": None,
+                    "name": "Completed 2 steps",
+                    "custom_name": None,
+                    "order": 1,
+                    "people": [],
+                    "count": 0,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Chrome"],
+                    "breakdown_value": ["Chrome"],
+                },
+            ],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Chrome"]), [person1.uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Chrome"]), [])
+
+        assert_funnel_results_equal(
+            results[1],
+            [
+                {
+                    "action_id": None,
+                    "name": "Completed 1 step",
+                    "custom_name": None,
+                    "order": 0,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": None,
+                    "median_conversion_time": None,
+                    "breakdown": ["Safari"],
+                    "breakdown_value": ["Safari"],
+                },
+                {
+                    "action_id": None,
+                    "name": "Completed 2 steps",
+                    "custom_name": None,
+                    "order": 1,
+                    "people": [],
+                    "count": 1,
+                    "type": "events",
+                    "average_conversion_time": 3600,
+                    "median_conversion_time": 3600,
+                    "breakdown": ["Safari"],
+                    "breakdown_value": ["Safari"],
+                },
+            ],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ["Safari"]), [person1.uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2, ["Safari"]), [person1.uuid])
+
+    def test_funnel_step_breakdown_with_step_attribution(self):
+        # overridden from factory, since with no order, step one is step zero, and vice versa
+
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": ["$browser"],
+            "breakdown_attribution_type": "step",
+            "breakdown_attribution_value": "0",
+        }
+
+        # event
+        events_by_person = {
+            "person1": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 1, 12),
+                    "properties": {"$browser": "Chrome"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+            ],
+            "person2": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 13),
+                    "properties": {"$browser": "Safari"},
+                },
+            ],
+            "person3": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 14),
+                    "properties": {"$browser": "Mac"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+            ],
+            "person4": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 15),
+                    "properties": {"$browser": 0},
+                },
+                # step attribution means alakazam is valid when step = 1
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 16),
+                    "properties": {"$browser": "alakazam"},
+                },
+            ],
+        }
+        people = journeys_for(events_by_person, self.team)
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+        results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+        self.assertEqual(len(results), 6)
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Mac"), [people["person3"].uuid])
+
+    def test_funnel_step_breakdown_with_step_one_attribution(self):
+        # overridden from factory, since with no order, step one is step zero, and vice versa
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": ["$browser"],
+            "breakdown_attribution_type": "step",
+            "breakdown_attribution_value": "1",
+        }
+
+        # event
+        events_by_person = {
+            "person1": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 1, 12),
+                    "properties": {"$browser": "Chrome"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+            ],
+            "person2": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 13),
+                    "properties": {"$browser": "Safari"},
+                },
+            ],
+            "person3": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 14),
+                    "properties": {"$browser": "Mac"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)},
+            ],
+            "person4": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 15),
+                    "properties": {"$browser": 0},
+                },
+                # step attribution means alakazam is valid when step = 1
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 16),
+                    "properties": {"$browser": "alakazam"},
+                },
+            ],
+        }
+        people = journeys_for(events_by_person, self.team)
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+        results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+        self.assertEqual(len(results), 6)
+        # unordered, so everything is step one too.
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[0],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=[""], count=3),
+                FunnelStepResult(
+                    name="Completed 2 steps",
+                    breakdown=[""],
+                    count=2,
+                    average_conversion_time=3600,
+                    median_conversion_time=3600,
+                ),
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1, ""),
+            [people["person1"].uuid, people["person2"].uuid, people["person3"].uuid],
+        )
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 2, ""),
+            [people["person1"].uuid, people["person3"].uuid],
+        )
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[1],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["0"], count=1),
+                FunnelStepResult(name="Completed 2 steps", breakdown=["0"], count=0),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person4"].uuid])
+
+    def test_funnel_step_breakdown_with_step_one_attribution_incomplete_funnel(self):
+        # overridden from factory, since with no order, step one is step zero, and vice versa
+
+        filters = {
+            "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+            "insight": INSIGHT_FUNNELS,
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": ["$browser"],
+            "breakdown_attribution_type": "step",
+            "breakdown_attribution_value": "1",
+            "funnel_order_type": "unordered",
+        }
+
+        # event
+        events_by_person = {
+            "person1": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 1, 12),
+                    "properties": {"$browser": "Chrome"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+            ],
+            "person2": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                # {"event": "buy", "timestamp": datetime(2020, 1, 2, 13), "properties": {"$browser": "Safari"}}
+            ],
+            "person3": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 14),
+                    "properties": {"$browser": "Mac"},
+                },
+                # {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)}
+            ],
+            "person4": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 15),
+                    "properties": {"$browser": 0},
+                },
+                # step attribution means alakazam is valid when step = 1
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 16),
+                    "properties": {"$browser": "alakazam"},
+                },
+            ],
+        }
+        people = journeys_for(events_by_person, self.team)
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+        results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+        # Breakdown by step_1 means funnel items that never reach step_1 are NULLed out
+        self.assertEqual(len(results), 4)
+        # Chrome and Mac and Safari goes away
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[0],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=[""], count=1),
+                FunnelStepResult(
+                    name="Completed 2 steps",
+                    breakdown=[""],
+                    count=1,
+                    average_conversion_time=3600,
+                    median_conversion_time=3600,
+                ),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person1"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[1],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["0"], count=1),
+                FunnelStepResult(name="Completed 2 steps", breakdown=["0"], count=0),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person4"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[2],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["Chrome"], count=1),
+                FunnelStepResult(name="Completed 2 steps", breakdown=["Chrome"], count=0),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Chrome"), [people["person1"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[3],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["alakazam"], count=1),
+                FunnelStepResult(
+                    name="Completed 2 steps",
+                    breakdown=["alakazam"],
+                    count=1,
+                    average_conversion_time=3600,
+                    median_conversion_time=3600,
+                ),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "alakazam"), [people["person4"].uuid])
+
+    def test_funnel_step_non_array_breakdown_with_step_one_attribution_incomplete_funnel(self):
+        # overridden from factory, since with no order, step one is step zero, and vice versa
+
+        filters = {
+            "events": [{"id": "sign up", "order": 0}, {"id": "buy", "order": 1}],
+            "insight": INSIGHT_FUNNELS,
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": "$browser",
+            "breakdown_attribution_type": "step",
+            "breakdown_attribution_value": "1",
+            "funnel_order_type": "unordered",
+        }
+
+        # event
+        events_by_person = {
+            "person1": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 1, 12),
+                    "properties": {"$browser": "Chrome"},
+                },
+                {"event": "buy", "timestamp": datetime(2020, 1, 1, 13)},
+            ],
+            "person2": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                # {"event": "buy", "timestamp": datetime(2020, 1, 2, 13), "properties": {"$browser": "Safari"}}
+            ],
+            "person3": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 14),
+                    "properties": {"$browser": "Mac"},
+                },
+                # {"event": "buy", "timestamp": datetime(2020, 1, 2, 15)}
+            ],
+            "person4": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 15),
+                    "properties": {"$browser": 0},
+                },
+                # step attribution means alakazam is valid when step = 1
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 16),
+                    "properties": {"$browser": "alakazam"},
+                },
+            ],
+        }
+        people = journeys_for(events_by_person, self.team)
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+        results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+        # Breakdown by step_1 means funnel items that never reach step_1 are NULLed out
+        self.assertEqual(len(results), 4)
+        # Chrome and Mac and Safari goes away
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[0],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=[""], count=1),
+                FunnelStepResult(
+                    name="Completed 2 steps",
+                    breakdown=[""],
+                    count=1,
+                    average_conversion_time=3600,
+                    median_conversion_time=3600,
+                ),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, ""), [people["person1"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[1],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["0"], count=1),
+                FunnelStepResult(name="Completed 2 steps", breakdown=["0"], count=0),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "0"), [people["person4"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[2],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["Chrome"], count=1),
+                FunnelStepResult(name="Completed 2 steps", breakdown=["Chrome"], count=0),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "Chrome"), [people["person1"].uuid])
+
+        self._assert_funnel_breakdown_result_is_correct(
+            results[3],
+            [
+                FunnelStepResult(name="Completed 1 step", breakdown=["alakazam"], count=1),
+                FunnelStepResult(
+                    name="Completed 2 steps",
+                    breakdown=["alakazam"],
+                    count=1,
+                    average_conversion_time=3600,
+                    median_conversion_time=3600,
+                ),
+            ],
+        )
+
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 1, "alakazam"), [people["person4"].uuid])
+
+    @snapshot_clickhouse_queries
+    def test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step(self):
+        # No person querying here, so snapshots are more legible
+        # overridden from factory, since we need to add `funnel_order_type`
+
+        filters = {
+            "events": [
+                {"id": "sign up", "order": 0},
+                {
+                    "id": "buy",
+                    "properties": [{"type": "event", "key": "$version", "value": "xyz"}],
+                    "order": 1,
+                },
+            ],
+            "insight": INSIGHT_FUNNELS,
+            "date_from": "2020-01-01",
+            "date_to": "2020-01-08",
+            "funnel_window_days": 7,
+            "breakdown_type": "event",
+            "breakdown": "$browser",
+            "breakdown_attribution_type": "step",
+            "breakdown_attribution_value": "1",
+            "funnel_order_type": "unordered",
+        }
+
+        # event
+        events_by_person = {
+            "person1": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 1, 12),
+                    "properties": {"$browser": "Chrome", "$version": "xyz"},
+                },
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 1, 13),
+                    "properties": {"$browser": "Chrome"},
+                },
+                # discarded because doesn't meet criteria
+            ],
+            "person2": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 1, 13)},
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 13),
+                    "properties": {"$browser": "Safari", "$version": "xyz"},
+                },
+            ],
+            "person3": [
+                {
+                    "event": "sign up",
+                    "timestamp": datetime(2020, 1, 2, 14),
+                    "properties": {"$browser": "Mac"},
+                },
+                {
+                    "event": "buy",
+                    "timestamp": datetime(2020, 1, 2, 15),
+                    "properties": {"$version": "xyz", "$browser": "Mac"},
+                },
+            ],
+            # no properties dude, doesn't make it to step 1, and since breakdown on step 1, is discarded completely
+            "person5": [
+                {"event": "sign up", "timestamp": datetime(2020, 1, 2, 15)},
+                {"event": "buy", "timestamp": datetime(2020, 1, 2, 16)},
+            ],
+        }
+        journeys_for(events_by_person, self.team)
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+        results = sorted(results, key=lambda res: res[0]["breakdown"])
+
+        self.assertEqual(len(results), 3)
+
+        self.assertCountEqual([res[0]["breakdown"] for res in results], [[""], ["Mac"], ["Safari"]])
+
+
+class TestUnorderedFunnelGroupBreakdown(
+    ClickhouseTestMixin,
+    funnel_breakdown_group_test_factory(  # type: ignore
+        ClickhouseFunnelUnorderedActors,
+    ),
+):
+    pass
+
+
+class TestFunnelUnorderedStepsConversionTime(
+    ClickhouseTestMixin,
+    funnel_conversion_time_test_factory(  # type: ignore
+        FunnelOrderType.UNORDERED,
+        ClickhouseFunnelUnorderedActors,
+    ),
+):
+    maxDiff = None
+    pass
+
+
+class TestFunnelUnorderedSteps(ClickhouseTestMixin, APIBaseTest):
+    def _get_actor_ids_at_step(self, filter, funnel_step, breakdown_value=None):
+        filter = Filter(data=filter, team=self.team)
+        person_filter = filter.shallow_clone({"funnel_step": funnel_step, "funnel_step_breakdown": breakdown_value})
+        _, serialized_result, _ = ClickhouseFunnelUnorderedActors(person_filter, self.team).get_actors()
+
+        return [val["id"] for val in serialized_result]
+
+    def test_basic_unordered_funnel(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "order": 0},
+                {"id": "$pageview", "order": 1},
+                {"id": "insight viewed", "order": 2},
+            ],
+        }
+
+        person1_stopped_after_signup = _create_person(distinct_ids=["stopped_after_signup1"], team_id=self.team.pk)
+        _create_event(team=self.team, event="user signed up", distinct_id="stopped_after_signup1")
+
+        person2_stopped_after_one_pageview = _create_person(
+            distinct_ids=["stopped_after_pageview1"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_pageview1")
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_pageview1",
+        )
+
+        person3_stopped_after_insight_view = _create_person(
+            distinct_ids=["stopped_after_insightview"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview",
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview")
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview",
+        )
+
+        person4_stopped_after_insight_view_reverse_order = _create_person(
+            distinct_ids=["stopped_after_insightview2"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview2",
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview2")
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview2",
+        )
+
+        person5_stopped_after_insight_view_random = _create_person(
+            distinct_ids=["stopped_after_insightview3"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview3")
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview3",
+        )
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview3")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview3",
+        )
+
+        person6_did_only_insight_view = _create_person(
+            distinct_ids=["stopped_after_insightview4"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview4")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview4",
+        )
+
+        person7_did_only_pageview = _create_person(distinct_ids=["stopped_after_insightview5"], team_id=self.team.pk)
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview5")
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview5")
+
+        person8_didnot_signup = _create_person(distinct_ids=["stopped_after_insightview6"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview6",
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview6")
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[0]["count"], 8)
+        self.assertEqual(results[1]["name"], "Completed 2 steps")
+        self.assertEqual(results[1]["count"], 5)
+        self.assertEqual(results[2]["name"], "Completed 3 steps")
+        self.assertEqual(results[2]["count"], 3)
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1),
+            [
+                person1_stopped_after_signup.uuid,
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+                person6_did_only_insight_view.uuid,
+                person7_did_only_pageview.uuid,
+                person8_didnot_signup.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 2),
+            [
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+                person8_didnot_signup.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, -2),
+            [
+                person1_stopped_after_signup.uuid,
+                person6_did_only_insight_view.uuid,
+                person7_did_only_pageview.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 3),
+            [
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, -3),
+            [person2_stopped_after_one_pageview.uuid, person8_didnot_signup.uuid],
+        )
+
+    def test_big_multi_step_unordered_funnel(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "order": 0},
+                {"id": "$pageview", "order": 1},
+                {"id": "insight viewed", "order": 2},
+                {"id": "crying", "order": 3},
+            ],
+        }
+
+        person1_stopped_after_signup = _create_person(distinct_ids=["stopped_after_signup1"], team_id=self.team.pk)
+        _create_event(team=self.team, event="user signed up", distinct_id="stopped_after_signup1")
+
+        person2_stopped_after_one_pageview = _create_person(
+            distinct_ids=["stopped_after_pageview1"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_pageview1")
+        _create_event(team=self.team, event="crying", distinct_id="stopped_after_pageview1")
+
+        person3_stopped_after_insight_view = _create_person(
+            distinct_ids=["stopped_after_insightview"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview",
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview")
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview",
+        )
+
+        person4_stopped_after_insight_view_reverse_order = _create_person(
+            distinct_ids=["stopped_after_insightview2"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview2",
+        )
+        _create_event(team=self.team, event="crying", distinct_id="stopped_after_insightview2")
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview2",
+        )
+
+        person5_stopped_after_insight_view_random = _create_person(
+            distinct_ids=["stopped_after_insightview3"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview3")
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview3",
+        )
+        _create_event(team=self.team, event="crying", distinct_id="stopped_after_insightview3")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview3",
+        )
+
+        person6_did_only_insight_view = _create_person(
+            distinct_ids=["stopped_after_insightview4"], team_id=self.team.pk
+        )
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview4")
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview4",
+        )
+
+        person7_did_only_pageview = _create_person(distinct_ids=["stopped_after_insightview5"], team_id=self.team.pk)
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview5")
+        _create_event(team=self.team, event="blaah blaa", distinct_id="stopped_after_insightview5")
+
+        person8_didnot_signup = _create_person(distinct_ids=["stopped_after_insightview6"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview6",
+        )
+        _create_event(team=self.team, event="$pageview", distinct_id="stopped_after_insightview6")
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[0]["count"], 8)
+        self.assertEqual(results[1]["name"], "Completed 2 steps")
+        self.assertEqual(results[1]["count"], 5)
+        self.assertEqual(results[2]["name"], "Completed 3 steps")
+        self.assertEqual(results[2]["count"], 3)
+        self.assertEqual(results[3]["name"], "Completed 4 steps")
+        self.assertEqual(results[3]["count"], 1)
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1),
+            [
+                person1_stopped_after_signup.uuid,
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+                person6_did_only_insight_view.uuid,
+                person7_did_only_pageview.uuid,
+                person8_didnot_signup.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 2),
+            [
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+                person8_didnot_signup.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 3),
+            [
+                person3_stopped_after_insight_view.uuid,
+                person4_stopped_after_insight_view_reverse_order.uuid,
+                person5_stopped_after_insight_view_random.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 4),
+            [person5_stopped_after_insight_view_random.uuid],
+        )
+
+    def test_basic_unordered_funnel_conversion_times(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "order": 0},
+                {"id": "$pageview", "order": 1},
+                {"id": "insight viewed", "order": 2},
+            ],
+            "date_from": "2021-05-01 00:00:00",
+            "date_to": "2021-05-07 23:59:59",
+            "funnel_window_interval": "1",
+        }
+
+        person1_stopped_after_signup = _create_person(distinct_ids=["stopped_after_signup1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_signup1",
+            timestamp="2021-05-02 00:00:00",
+        )
+
+        person2_stopped_after_one_pageview = _create_person(
+            distinct_ids=["stopped_after_pageview1"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="stopped_after_pageview1",
+            timestamp="2021-05-02 00:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_pageview1",
+            timestamp="2021-05-02 01:00:00",
+        )
+
+        person3_stopped_after_insight_view = _create_person(
+            distinct_ids=["stopped_after_insightview"], team_id=self.team.pk
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-02 00:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-02 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-02 04:00:00",
+        )
+
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-03 00:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-03 03:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_insightview",
+            timestamp="2021-05-03 06:00:00",
+        )
+        # Person 3 completes the funnel 2 times:
+        # First time: 2 hours + 2 hours = total 4 hours.
+        # Second time: 3 hours + 3 hours = total 6 hours.
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[1]["name"], "Completed 2 steps")
+        self.assertEqual(results[2]["name"], "Completed 3 steps")
+        self.assertEqual(results[0]["count"], 3)
+
+        self.assertEqual(results[1]["average_conversion_time"], 6300)
+        # 1 hour for Person 2, (2+3)/2 hours for Person 3, total = 3.5 hours, average = 3.5/2 = 1.75 hours
+
+        self.assertEqual(results[2]["average_conversion_time"], 9000)
+        # (2+3)/2 hours for Person 3 = 2.5 hours
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1),
+            [
+                person1_stopped_after_signup.uuid,
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 2),
+            [
+                person2_stopped_after_one_pageview.uuid,
+                person3_stopped_after_insight_view.uuid,
+            ],
+        )
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 3),
+            [person3_stopped_after_insight_view.uuid],
+        )
+
+    def test_single_event_unordered_funnel(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [{"id": "user signed up", "order": 0}],
+            "date_from": "2021-05-01 00:00:00",
+            "date_to": "2021-05-07 23:59:59",
+        }
+
+        _create_person(distinct_ids=["stopped_after_signup1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_signup1",
+            timestamp="2021-05-02 00:00:00",
+        )
+
+        _create_person(distinct_ids=["stopped_after_pageview1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="stopped_after_pageview1",
+            timestamp="2021-05-02 00:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="stopped_after_pageview1",
+            timestamp="2021-05-02 01:00:00",
+        )
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[0]["count"], 2)
+
+    def test_funnel_exclusions_invalid_params(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "type": "events", "order": 0},
+                {"id": "paid", "type": "events", "order": 1},
+                {"id": "blah", "type": "events", "order": 2},
+            ],
+            "funnel_window_days": 14,
+            "exclusions": [
+                {
+                    "id": "x",
+                    "type": "events",
+                    "funnel_from_step": 1,
+                    "funnel_to_step": 1,
+                }
+            ],
+        }
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        self.assertRaises(ValidationError, lambda: FunnelsQueryRunner(query=query, team=self.team).calculate())
+
+        # partial windows not allowed for unordered
+        filters = {
+            **filters,
+            "exclusions": [
+                {
+                    "id": "x",
+                    "type": "events",
+                    "funnel_from_step": 0,
+                    "funnel_to_step": 1,
+                }
+            ],
+        }
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        self.assertRaises(ValidationError, lambda: FunnelsQueryRunner(query=query, team=self.team).calculate())
+
+    def test_funnel_exclusions_full_window(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "type": "events", "order": 0},
+                {"id": "paid", "type": "events", "order": 1},
+            ],
+            "funnel_window_days": 14,
+            "date_from": "2021-05-01 00:00:00",
+            "date_to": "2021-05-14 00:00:00",
+            "exclusions": [
+                {
+                    "id": "x",
+                    "type": "events",
+                    "funnel_from_step": 0,
+                    "funnel_to_step": 1,
+                }
+            ],
+        }
+
+        # event 1
+        person1 = _create_person(distinct_ids=["person1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person1",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="paid",
+            distinct_id="person1",
+            timestamp="2021-05-01 02:00:00",
+        )
+
+        # event 2
+        person2 = _create_person(distinct_ids=["person2"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person2",
+            timestamp="2021-05-01 03:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person2",
+            timestamp="2021-05-01 03:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="paid",
+            distinct_id="person2",
+            timestamp="2021-05-01 04:00:00",
+        )
+
+        # event 3
+        person3 = _create_person(distinct_ids=["person3"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person3",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="paid",
+            distinct_id="person3",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(len(results), 2)
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[0]["count"], 3)
+        self.assertEqual(results[1]["name"], "Completed 2 steps")
+        self.assertEqual(results[1]["count"], 2)
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1),
+            [person1.uuid, person2.uuid, person3.uuid],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2), [person1.uuid, person3.uuid])
+
+    def test_advanced_funnel_multiple_exclusions_between_steps(self):
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {"id": "user signed up", "type": "events", "order": 0},
+                {"id": "$pageview", "type": "events", "order": 1},
+                {"id": "insight viewed", "type": "events", "order": 2},
+                {"id": "invite teammate", "type": "events", "order": 3},
+                {"id": "pageview2", "type": "events", "order": 4},
+            ],
+            "date_from": "2021-05-01 00:00:00",
+            "date_to": "2021-05-14 00:00:00",
+            "exclusions": [
+                {
+                    "id": "x",
+                    "type": "events",
+                    "funnel_from_step": 0,
+                    "funnel_to_step": 4,
+                },
+                {
+                    "id": "y",
+                    "type": "events",
+                    "funnel_from_step": 0,
+                    "funnel_to_step": 4,
+                },
+            ],
+        }
+
+        person1 = _create_person(distinct_ids=["person1"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person1",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person1",
+            timestamp="2021-05-01 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="person1",
+            timestamp="2021-05-01 03:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="person1",
+            timestamp="2021-05-01 04:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="y",
+            distinct_id="person1",
+            timestamp="2021-05-01 04:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="invite teammate",
+            distinct_id="person1",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="pageview2",
+            distinct_id="person1",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        person2 = _create_person(distinct_ids=["person2"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person2",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="y",
+            distinct_id="person2",
+            timestamp="2021-05-01 01:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="person2",
+            timestamp="2021-05-01 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="person2",
+            timestamp="2021-05-01 04:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="y",
+            distinct_id="person2",
+            timestamp="2021-05-01 04:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="invite teammate",
+            distinct_id="person2",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person2",
+            timestamp="2021-05-01 05:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="pageview2",
+            distinct_id="person2",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        person3 = _create_person(distinct_ids=["person3"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person3",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person3",
+            timestamp="2021-05-01 01:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="person3",
+            timestamp="2021-05-01 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="person3",
+            timestamp="2021-05-01 04:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="invite teammate",
+            distinct_id="person3",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person3",
+            timestamp="2021-05-01 05:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="pageview2",
+            distinct_id="person3",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        person4 = _create_person(distinct_ids=["person4"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person4",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="person4",
+            timestamp="2021-05-01 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="person4",
+            timestamp="2021-05-01 04:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="invite teammate",
+            distinct_id="person4",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="pageview2",
+            distinct_id="person4",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        person5 = _create_person(distinct_ids=["person5"], team_id=self.team.pk)
+        _create_event(
+            team=self.team,
+            event="user signed up",
+            distinct_id="person5",
+            timestamp="2021-05-01 01:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person5",
+            timestamp="2021-05-01 01:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="$pageview",
+            distinct_id="person5",
+            timestamp="2021-05-01 02:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person5",
+            timestamp="2021-05-01 02:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="insight viewed",
+            distinct_id="person5",
+            timestamp="2021-05-01 04:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="y",
+            distinct_id="person5",
+            timestamp="2021-05-01 04:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="invite teammate",
+            distinct_id="person5",
+            timestamp="2021-05-01 05:00:00",
+        )
+        _create_event(
+            team=self.team,
+            event="x",
+            distinct_id="person5",
+            timestamp="2021-05-01 05:30:00",
+        )
+        _create_event(
+            team=self.team,
+            event="pageview2",
+            distinct_id="person5",
+            timestamp="2021-05-01 06:00:00",
+        )
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["name"], "Completed 1 step")
+        self.assertEqual(results[0]["count"], 5)
+        self.assertEqual(results[1]["count"], 2)
+        self.assertEqual(results[2]["count"], 1)
+        self.assertEqual(results[3]["count"], 1)
+        self.assertEqual(results[4]["count"], 1)
+
+        self.assertCountEqual(
+            self._get_actor_ids_at_step(filters, 1),
+            [person1.uuid, person2.uuid, person3.uuid, person4.uuid, person5.uuid],
+        )
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 2), [person1.uuid, person4.uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 3), [person4.uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 4), [person4.uuid])
+        self.assertCountEqual(self._get_actor_ids_at_step(filters, 5), [person4.uuid])
+
+    def test_funnel_unordered_all_events_with_properties(self):
+        _create_person(distinct_ids=["user"], team=self.team)
+        _create_event(event="user signed up", distinct_id="user", team=self.team)
+        _create_event(
+            event="added to card",
+            distinct_id="user",
+            properties={"is_saved": True},
+            team=self.team,
+        )
+        PropertyDefinition.objects.get_or_create(
+            team=self.team,
+            type=PropertyDefinition.Type.EVENT,
+            name="is_saved",
+            defaults={"property_type": "Boolean"},
+        )
+
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {
+                    "type": "events",
+                    "id": "user signed up",
+                    "order": 0,
+                    "name": "user signed up",
+                    "math": "total",
+                },
+                {
+                    "type": "events",
+                    "id": None,
+                    "order": 1,
+                    "name": "All events",
+                    "math": "total",
+                    "properties": [
+                        {
+                            "key": "is_saved",
+                            "value": ["true"],
+                            "operator": "exact",
+                            "type": "event",
+                        }
+                    ],
+                },
+            ],
+            "funnel_window_days": 14,
+        }
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["count"], 1)
+        self.assertEqual(results[1]["count"], 1)
+
+    def test_funnel_unordered_entity_filters(self):
+        _create_person(distinct_ids=["user"], team=self.team)
+        _create_event(
+            event="user signed up",
+            distinct_id="user",
+            properties={"prop_a": "some value"},
+            team=self.team,
+        )
+        _create_event(
+            event="user signed up",
+            distinct_id="user",
+            properties={"prop_b": "another value"},
+            team=self.team,
+        )
+
+        filters = {
+            "insight": INSIGHT_FUNNELS,
+            "funnel_order_type": "unordered",
+            "events": [
+                {
+                    "type": "events",
+                    "id": "user signed up",
+                    "order": 0,
+                    "name": "user signed up",
+                    "math": "total",
+                    "properties": [
+                        {
+                            "key": "prop_a",
+                            "value": ["some value"],
+                            "operator": "exact",
+                            "type": "event",
+                        }
+                    ],
+                },
+                {
+                    "type": "events",
+                    "id": "user signed up",
+                    "order": 1,
+                    "name": "user signed up",
+                    "math": "total",
+                    "properties": [
+                        {
+                            "key": "prop_b",
+                            "value": "another",
+                            "operator": "icontains",
+                            "type": "event",
+                        }
+                    ],
+                },
+            ],
+        }
+
+        query = cast(FunnelsQuery, filter_to_query(filters))
+        results = FunnelsQueryRunner(query=query, team=self.team).calculate().results
+
+        self.assertEqual(results[0]["count"], 1)
+        self.assertEqual(results[1]["count"], 1)
diff --git a/posthog/hogql_queries/insights/funnels/utils.py b/posthog/hogql_queries/insights/funnels/utils.py
index d5e21e219309f..2232ee3f8c7c6 100644
--- a/posthog/hogql_queries/insights/funnels/utils.py
+++ b/posthog/hogql_queries/insights/funnels/utils.py
@@ -1,4 +1,7 @@
+from typing import List
 from posthog.constants import FUNNEL_WINDOW_INTERVAL_TYPES
+from posthog.hogql import ast
+from posthog.hogql.parser import parse_expr
 from posthog.schema import FunnelConversionWindowTimeUnit, FunnelsFilter, StepOrderValue
 from rest_framework.exceptions import ValidationError
 
@@ -7,13 +10,11 @@ def get_funnel_order_class(funnelsFilter: FunnelsFilter):
     from posthog.hogql_queries.insights.funnels import (
         Funnel,
         FunnelStrict,
-        # FunnelUnordered,
-        FunnelBase,
+        FunnelUnordered,
     )
 
     if funnelsFilter.funnelOrderType == StepOrderValue.unordered:
-        return FunnelBase
-        # return FunnelUnordered
+        return FunnelUnordered
     elif funnelsFilter.funnelOrderType == StepOrderValue.strict:
         return FunnelStrict
     return Funnel
@@ -38,3 +39,27 @@ def funnel_window_interval_unit_to_sql(
         return "DAY"
     else:
         raise ValidationError("{funnelWindowIntervalUnit} not supported")
+
+
+def get_breakdown_expr(
+    breakdown: List[str | int] | None, properties_column: str, normalize_url: bool | None = False
+) -> ast.Expr:
+    if isinstance(breakdown, str) or isinstance(breakdown, int) or breakdown is None:
+        return parse_expr(f"ifNull({properties_column}.{breakdown}, '')")
+    else:
+        exprs = []
+        for b in breakdown:
+            expr = parse_expr(normalize_url_breakdown(f"ifNull({properties_column}.{b}, '')", normalize_url))
+            exprs.append(expr)
+        expression = ast.Array(exprs=exprs)
+
+    return expression
+
+
+def normalize_url_breakdown(breakdown_value, breakdown_normalize_url: bool | None):
+    if breakdown_normalize_url:
+        return (
+            f"if( empty(trim(TRAILING '/?#' from {breakdown_value})), '/', trim(TRAILING '/?#' from {breakdown_value}))"
+        )
+
+    return breakdown_value
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
index b55778fa0d1fa..1320f6403b544 100644
--- a/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
+++ b/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
@@ -79,7 +79,7 @@
            WHERE and(equals(events.team_id, 2), greaterOrEquals(toTimeZone(events.timestamp, 'UTC'), minus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), toIntervalDay(1))), less(toTimeZone(events.timestamp, 'UTC'), plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(1))), ifNull(in(person_id,
                                                                                                                                                                                                                                                                                                                                                                                                             (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                              FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 10))
+                                                                                                                                                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 5))
                                                                                                                                                                                                                                                                                                                                                                                                              GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                              HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0), equals(events.event, '$pageview'))
            GROUP BY person_id)
diff --git a/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr b/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
index 64d6dcbc02e7b..210e465f805b0 100644
--- a/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
+++ b/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
@@ -85,7 +85,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-07 23:59:59', 6, 'UTC'))), ifNull(equals(e__pdi__person.`properties___$bool_prop`, 'x'), 0), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                                                                                      (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                                                       FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                                                      WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 11))
+                                                                                                                                                                                                                                                                                                                                                                                                                                      WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 6))
                                                                                                                                                                                                                                                                                                                                                                                                                                       GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                                                       HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
         GROUP BY day_start)
@@ -172,7 +172,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-07 23:59:59', 6, 'UTC'))), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.person_properties, '$bool_prop'), ''), 'null'), '^"|"$', ''), 'x'), 0), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 12))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 7))
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
         GROUP BY day_start)
@@ -688,7 +688,7 @@
      WHERE and(equals(e.team_id, 2), and(equals(e.event, '$pageview'), and(or(ifNull(equals(e__pdi__person.properties___name, 'p1'), 0), ifNull(equals(e__pdi__person.properties___name, 'p2'), 0), ifNull(equals(e__pdi__person.properties___name, 'p3'), 0)), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                             (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                              FROM cohortpeople
-                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 31))
+                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 26))
                                                                                                                                                                                                                                                                              GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                              HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0))))
      GROUP BY value
@@ -757,7 +757,7 @@
               WHERE and(equals(e.team_id, 2), and(and(equals(e.event, '$pageview'), and(or(ifNull(equals(e__pdi__person.properties___name, 'p1'), 0), ifNull(equals(e__pdi__person.properties___name, 'p2'), 0), ifNull(equals(e__pdi__person.properties___name, 'p3'), 0)), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                          (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                           FROM cohortpeople
-                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 31))
+                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 26))
                                                                                                                                                                                                                                                                                           GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                           HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0))), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, 'key'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'val'], ['$$_posthog_breakdown_other_$$', 'val'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, 'key'), ''), 'null'), '^"|"$', ''), 'val'), 0))), ifNull(greaterOrEquals(timestamp, minus(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')), toIntervalDay(7))), 0), ifNull(lessOrEquals(timestamp, assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 23:59:59', 6, 'UTC'))), 0))
               GROUP BY timestamp, actor_id,
@@ -1592,7 +1592,7 @@
      WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                 (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                  FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 44))
+                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 39))
                                                                                                                                                                                                                                                                                                                                                                  GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
      GROUP BY value
@@ -1640,7 +1640,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                    (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                     FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 44))
+                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 39))
                                                                                                                                                                                                                                                                                                                                                                     GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                     HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'value'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'other_value'), 0)))
         GROUP BY day_start,
@@ -1691,7 +1691,7 @@
      WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                 (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                  FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 45))
+                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 40))
                                                                                                                                                                                                                                                                                                                                                                  GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
      GROUP BY value
@@ -1738,7 +1738,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                    (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                     FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 45))
+                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 40))
                                                                                                                                                                                                                                                                                                                                                                     GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                     HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'value'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'other_value'), 0)))
         GROUP BY day_start,
diff --git a/posthog/hogql_queries/legacy_compatibility/filter_to_query.py b/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
index 536f741a3f4b0..fc68d3f26c2f4 100644
--- a/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
+++ b/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
@@ -337,9 +337,10 @@ def _breakdown_filter(_filter: Dict):
         "breakdown_normalize_url": _filter.get("breakdown_normalize_url"),
         "breakdown_group_type_index": _filter.get("breakdown_group_type_index"),
         "breakdown_hide_other_aggregation": _filter.get("breakdown_hide_other_aggregation"),
-        "breakdown_histogram_bin_count": _filter.get("breakdown_histogram_bin_count")
-        if _insight_type(_filter) == "TRENDS"
-        else None,
+        "breakdown_histogram_bin_count": (
+            _filter.get("breakdown_histogram_bin_count") if _insight_type(_filter) == "TRENDS" else None
+        ),
+        "breakdown_limit": _filter.get("breakdown_limit"),
     }
 
     # fix breakdown typo
diff --git a/posthog/hogql_queries/insights/test/test_events_query_runner.py b/posthog/hogql_queries/test/test_events_query_runner.py
similarity index 76%
rename from posthog/hogql_queries/insights/test/test_events_query_runner.py
rename to posthog/hogql_queries/test/test_events_query_runner.py
index d035db141f127..6237d3edc2f34 100644
--- a/posthog/hogql_queries/insights/test/test_events_query_runner.py
+++ b/posthog/hogql_queries/test/test_events_query_runner.py
@@ -1,7 +1,9 @@
-from typing import Tuple, Any
+from typing import Tuple, Any, cast
 
 from freezegun import freeze_time
 
+from posthog.hogql import ast
+from posthog.hogql.ast import CompareOperationOp
 from posthog.hogql_queries.events_query_runner import EventsQueryRunner
 from posthog.models import Person, Team
 from posthog.models.organization import Organization
@@ -123,9 +125,30 @@ def test_person_id_expands_to_distinct_ids(self):
 
         # matching team
         query_ast = EventsQueryRunner(query=query, team=self.team).to_query()
-        self.assertEqual(query_ast.where.exprs[0].right.value, ["id1", "id2"])
+        where_expr = cast(ast.CompareOperation, cast(ast.And, query_ast.where).exprs[0])
+        right_expr = cast(ast.Constant, where_expr.right)
+        self.assertEqual(right_expr.value, ["id1", "id2"])
 
         # another team
         another_team = Team.objects.create(organization=Organization.objects.create())
         query_ast = EventsQueryRunner(query=query, team=another_team).to_query()
-        self.assertEqual(query_ast.where.exprs[0].right.value, [])
+        where_expr = cast(ast.CompareOperation, cast(ast.And, query_ast.where).exprs[0])
+        right_expr = cast(ast.Constant, where_expr.right)
+        self.assertEqual(right_expr.value, [])
+
+    def test_test_account_filters(self):
+        self.team.test_account_filters = [
+            {
+                "key": "email",
+                "type": "person",
+                "value": "posthog.com",
+                "operator": "not_icontains",
+            }
+        ]
+        self.team.save()
+        query = EventsQuery(kind="EventsQuery", select=["*"], filterTestAccounts=True)
+        query_ast = EventsQueryRunner(query=query, team=self.team).to_query()
+        where_expr = cast(ast.CompareOperation, cast(ast.And, query_ast.where).exprs[0])
+        right_expr = cast(ast.Constant, where_expr.right)
+        self.assertEqual(right_expr.value, "%posthog.com%")
+        self.assertEqual(where_expr.op, CompareOperationOp.NotILike)
diff --git a/posthog/hogql_queries/web_analytics/test/test_web_overview.py b/posthog/hogql_queries/web_analytics/test/test_web_overview.py
index 0d560ee6c182e..e4fc03121ab1b 100644
--- a/posthog/hogql_queries/web_analytics/test/test_web_overview.py
+++ b/posthog/hogql_queries/web_analytics/test/test_web_overview.py
@@ -35,10 +35,11 @@ def _create_events(self, data, event="$pageview"):
                 )
         return person_result
 
-    def _run_web_overview_query(self, date_from, date_to):
+    def _run_web_overview_query(self, date_from, date_to, compare=True):
         query = WebOverviewQuery(
             dateRange=DateRange(date_from=date_from, date_to=date_to),
             properties=[],
+            compare=compare,
         )
         runner = WebOverviewQueryRunner(team=self.team, query=query)
         return runner.calculate()
@@ -95,24 +96,24 @@ def test_all_time(self):
             ]
         )
 
-        results = self._run_web_overview_query("all", "2023-12-15").results
+        results = self._run_web_overview_query("all", "2023-12-15", compare=False).results
 
         visitors = results[0]
         self.assertEqual("visitors", visitors.key)
         self.assertEqual(2, visitors.value)
-        self.assertEqual(0, visitors.previous)
+        self.assertEqual(None, visitors.previous)
         self.assertEqual(None, visitors.changeFromPreviousPct)
 
         views = results[1]
         self.assertEqual("views", views.key)
         self.assertEqual(4, views.value)
-        self.assertEqual(0, views.previous)
+        self.assertEqual(None, views.previous)
         self.assertEqual(None, views.changeFromPreviousPct)
 
         sessions = results[2]
         self.assertEqual("sessions", sessions.key)
         self.assertEqual(3, sessions.value)
-        self.assertEqual(0, sessions.previous)
+        self.assertEqual(None, sessions.previous)
         self.assertEqual(None, sessions.changeFromPreviousPct)
 
         duration_s = results[3]
diff --git a/posthog/hogql_queries/web_analytics/web_overview.py b/posthog/hogql_queries/web_analytics/web_overview.py
index 26a9255c940cf..2019803faf78a 100644
--- a/posthog/hogql_queries/web_analytics/web_overview.py
+++ b/posthog/hogql_queries/web_analytics/web_overview.py
@@ -24,8 +24,9 @@ def to_query(self) -> ast.SelectQuery | ast.SelectUnionQuery:
             mid = self.query_date_range.date_from_as_hogql()
             end = self.query_date_range.date_to_as_hogql()
         with self.timings.measure("overview_stats_query"):
-            query = parse_select(
-                """
+            if self.query.compare:
+                return parse_select(
+                    """
 WITH pages_query AS (
         SELECT
         uniq(if(timestamp >= {mid} AND timestamp < {end}, events.person_id, NULL)) AS unique_users,
@@ -86,21 +87,86 @@ def to_query(self) -> ast.SelectQuery | ast.SelectUnionQuery:
 FROM pages_query
 CROSS JOIN sessions_query
                 """,
-                timings=self.timings,
-                placeholders={
-                    "start": start,
-                    "mid": mid,
-                    "end": end,
-                    "event_properties": self.event_properties(),
-                    "session_where": self.session_where(include_previous_period=True),
-                    "session_having": self.session_having(include_previous_period=True),
-                    "sample_rate": self._sample_ratio,
-                    "sample_expr": ast.SampleExpr(sample_value=self._sample_ratio),
-                },
-                backend="cpp",
-            )
+                    timings=self.timings,
+                    placeholders={
+                        "start": start,
+                        "mid": mid,
+                        "end": end,
+                        "event_properties": self.event_properties(),
+                        "session_where": self.session_where(include_previous_period=True),
+                        "session_having": self.session_having(include_previous_period=True),
+                        "sample_rate": self._sample_ratio,
+                    },
+                )
+            else:
+                return parse_select(
+                    """
+WITH pages_query AS (
+        SELECT
+        uniq(events.person_id) AS unique_users,
+        count() AS current_pageviews,
+        uniq(events.properties.$session_id) AS unique_sessions
+    FROM
+        events
+    SAMPLE {sample_rate}
+    WHERE
+        event = '$pageview' AND
+        timestamp >= {mid} AND
+        timestamp < {end} AND
+        {event_properties}
+    ),
+sessions_query AS (
+    SELECT
+        avg(duration_s) AS avg_duration_s,
+        avg(is_bounce) AS bounce_rate
+    FROM (SELECT
+            events.properties.`$session_id` AS session_id,
+            min(events.timestamp) AS min_timestamp,
+            max(events.timestamp) AS max_timestamp,
+            dateDiff('second', min_timestamp, max_timestamp) AS duration_s,
+            countIf(events.event == '$pageview') AS num_pageviews,
+            countIf(events.event == '$autocapture') AS num_autocaptures,
 
-        return query
+            -- definition of a GA4 bounce from here https://support.google.com/analytics/answer/12195621?hl=en
+            (num_autocaptures == 0 AND num_pageviews <= 1 AND duration_s < 10) AS is_bounce
+        FROM
+            events
+        SAMPLE {sample_rate}
+        WHERE
+            session_id IS NOT NULL
+            AND (events.event == '$pageview' OR events.event == '$autocapture' OR events.event == '$pageleave')
+            AND ({session_where})
+        GROUP BY
+            events.properties.`$session_id`
+        HAVING
+            ({session_having})
+        )
+    )
+SELECT
+    unique_users,
+    NULL as previous_unique_users,
+    current_pageviews,
+    NULL as previous_pageviews,
+    unique_sessions,
+    NULL as previous_unique_sessions,
+    avg_duration_s,
+    NULL as prev_avg_duration_s,
+    bounce_rate,
+    NULL as prev_bounce_rate
+FROM pages_query
+CROSS JOIN sessions_query
+                """,
+                    timings=self.timings,
+                    placeholders={
+                        "start": start,
+                        "mid": mid,
+                        "end": end,
+                        "event_properties": self.event_properties(),
+                        "session_where": self.session_where(include_previous_period=False),
+                        "session_having": self.session_having(include_previous_period=False),
+                        "sample_rate": self._sample_ratio,
+                    },
+                )
 
     def calculate(self):
         response = execute_hogql_query(
diff --git a/posthog/models/__init__.py b/posthog/models/__init__.py
index 001e98d076e1e..d9634fbbdd4c1 100644
--- a/posthog/models/__init__.py
+++ b/posthog/models/__init__.py
@@ -56,7 +56,6 @@
     PluginLogEntry,
     PluginSourceFile,
 )
-from .prompt.prompt import Prompt, PromptSequence, UserPromptState
 from .property import Property
 from .property_definition import PropertyDefinition
 from .sharing_configuration import SharingConfiguration
@@ -68,6 +67,8 @@
 from .user import User, UserManager
 from .user_scene_personalisation import UserScenePersonalisation
 
+from ._deprecated_prompts import Prompt, PromptSequence, UserPromptState
+
 __all__ = [
     "Action",
     "ActionStep",
@@ -121,8 +122,6 @@
     "PluginConfig",
     "PluginLogEntry",
     "PluginSourceFile",
-    "Prompt",
-    "PromptSequence",
     "Property",
     "PropertyDefinition",
     "RetentionFilter",
@@ -140,7 +139,10 @@
     "User",
     "UserScenePersonalisation",
     "UserManager",
-    "UserPromptState",
     "DataWarehouseTable",
     "ScheduledChange",
+    # Deprecated models here for backwards compatibility
+    "Prompt",
+    "PromptSequence",
+    "UserPromptState",
 ]
diff --git a/posthog/models/prompt/prompt.py b/posthog/models/_deprecated_prompts.py
similarity index 97%
rename from posthog/models/prompt/prompt.py
rename to posthog/models/_deprecated_prompts.py
index 2d975a54b3e1a..780703017519e 100644
--- a/posthog/models/prompt/prompt.py
+++ b/posthog/models/_deprecated_prompts.py
@@ -3,6 +3,7 @@
 from django.utils import timezone
 
 
+# DEPRECATED - DO NOT USE
 class Prompt(models.Model):
     step: models.IntegerField = models.IntegerField()
     type: models.CharField = models.CharField(max_length=200)  # tooltip, modal, etc
@@ -18,6 +19,7 @@ class Prompt(models.Model):
     icon: models.CharField = models.CharField(max_length=200)  # sync with iconMap in frontend
 
 
+# DEPRECATED - DO NOT USE
 class PromptSequence(models.Model):
     class Meta:
         constraints = [
@@ -39,6 +41,7 @@ class Meta:
     )  # whether to run this sequence automatically for all users
 
 
+# DEPRECATED - DO NOT USE
 class UserPromptState(models.Model):
     class Meta:
         constraints = [models.UniqueConstraint(fields=["user", "sequence"], name="unique_user_prompt_state")]
diff --git a/posthog/models/activity_logging/activity_log.py b/posthog/models/activity_logging/activity_log.py
index a02889b17ce55..074b53b2dd55b 100644
--- a/posthog/models/activity_logging/activity_log.py
+++ b/posthog/models/activity_logging/activity_log.py
@@ -1,6 +1,7 @@
 import dataclasses
 import json
 from datetime import datetime
+from decimal import Decimal
 from typing import Any, Dict, List, Literal, Optional, Union
 
 import structlog
@@ -8,6 +9,7 @@
 from django.db import models
 from django.utils import timezone
 from django.conf import settings
+
 from posthog.models.dashboard import Dashboard
 from posthog.models.dashboard_tile import DashboardTile
 from posthog.models.user import User
@@ -32,6 +34,7 @@
     "EarlyAccessFeature",
     "SessionRecordingPlaylist",
     "Comment",
+    "Team",
 ]
 ChangeAction = Literal["changed", "created", "deleted", "merged", "split", "exported"]
 
@@ -73,6 +76,12 @@ def default(self, obj):
             return str(obj)
         if isinstance(obj, User):
             return {"first_name": obj.first_name, "email": obj.email}
+        if isinstance(obj, float):
+            # more precision than we'll need but avoids rounding too unnecessarily
+            return format(obj, ".6f").rstrip("0").rstrip(".")
+        if isinstance(obj, Decimal):
+            # more precision than we'll need but avoids rounding too unnecessarily
+            return format(obj, ".6f").rstrip("0").rstrip(".")
 
         return json.JSONEncoder.default(self, obj)
 
@@ -186,6 +195,7 @@ class Meta:
         "post_to_slack",
         "property_type_format",
     ],
+    "Team": ["uuid", "updated_at", "api_token", "created_at", "id"],
 }
 
 
diff --git a/posthog/models/person/sql.py b/posthog/models/person/sql.py
index 41cd2e36a54f6..fc70aa0d5a419 100644
--- a/posthog/models/person/sql.py
+++ b/posthog/models/person/sql.py
@@ -1,6 +1,6 @@
 from posthog.clickhouse.base_sql import COPY_ROWS_BETWEEN_TEAMS_BASE_SQL
 from posthog.clickhouse.indexes import index_by_kafka_timestamp
-from posthog.clickhouse.kafka_engine import KAFKA_COLUMNS, STORAGE_POLICY, kafka_engine
+from posthog.clickhouse.kafka_engine import KAFKA_COLUMNS, KAFKA_COLUMNS_WITH_PARTITION, STORAGE_POLICY, kafka_engine
 from posthog.clickhouse.table_engines import CollapsingMergeTree, ReplacingMergeTree
 from posthog.kafka_client.topics import (
     KAFKA_PERSON,
@@ -170,6 +170,7 @@
 
 PERSON_DISTINCT_ID2_TABLE = "person_distinct_id2"
 
+# NOTE: This table base SQL is also used for distinct ID overrides!
 PERSON_DISTINCT_ID2_TABLE_BASE_SQL = """
 CREATE TABLE IF NOT EXISTS {table_name} ON CLUSTER '{cluster}'
 (
@@ -228,6 +229,36 @@
     database=CLICKHOUSE_DATABASE,
 )
 
+#
+# person_distinct_id_overrides: This table contains rows for all (team_id,
+# distinct_id) pairs where the person_id has changed and those updates have not
+# yet been integrated back into the events table via squashing.
+#
+
+PERSON_DISTINCT_ID_OVERRIDES_TABLE = "person_distinct_id_overrides"
+
+PERSON_DISTINCT_ID_OVERRIDES_TABLE_BASE_SQL = PERSON_DISTINCT_ID2_TABLE_BASE_SQL
+
+PERSON_DISTINCT_ID_OVERRIDES_TABLE_ENGINE = lambda: ReplacingMergeTree(
+    PERSON_DISTINCT_ID_OVERRIDES_TABLE, ver="version"
+)
+
+PERSON_DISTINCT_ID_OVERRIDES_TABLE_SQL = lambda: (
+    PERSON_DISTINCT_ID_OVERRIDES_TABLE_BASE_SQL
+    + """
+    ORDER BY (team_id, distinct_id)
+    SETTINGS index_granularity = 512
+    """
+).format(
+    table_name=PERSON_DISTINCT_ID_OVERRIDES_TABLE,
+    cluster=CLICKHOUSE_CLUSTER,
+    engine=PERSON_DISTINCT_ID_OVERRIDES_TABLE_ENGINE(),
+    extra_fields=f"""
+    {KAFKA_COLUMNS_WITH_PARTITION}
+    , {index_by_kafka_timestamp(PERSON_DISTINCT_ID_OVERRIDES_TABLE)}
+    """,
+)
+
 #
 # Static Cohort
 #
diff --git a/posthog/models/prompt/__init__.py b/posthog/models/prompt/__init__.py
deleted file mode 100644
index e93a2091875d9..0000000000000
--- a/posthog/models/prompt/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .constants import *
-from .prompt import *
diff --git a/posthog/models/prompt/constants.py b/posthog/models/prompt/constants.py
deleted file mode 100644
index 98d83bbb4fc28..0000000000000
--- a/posthog/models/prompt/constants.py
+++ /dev/null
@@ -1,17 +0,0 @@
-prompts_config = [
-    {
-        "key": "session-recording-playlist-announcement",
-        "prompts": [
-            {
-                "step": 0,
-                "type": "tooltip",
-                "title": "Save your filters as playlists!",
-                "text": "You can now save your search as a playlist which will keep up to date as new recordings come in matching the filters you set. Sharing with your team has never been easier!",
-                "placement": "bottom-start",
-                "reference": "save-recordings-playlist-button",
-            }
-        ],
-        "rule": {"path": {"must_match": ["/replay/recent"]}},
-        "type": "one-off",
-    },
-]
diff --git a/posthog/models/sharing_configuration.py b/posthog/models/sharing_configuration.py
index 44cc70cbb7be4..48ea711f02a1f 100644
--- a/posthog/models/sharing_configuration.py
+++ b/posthog/models/sharing_configuration.py
@@ -1,8 +1,10 @@
 import secrets
-from typing import List
+from typing import List, cast
 
 from django.db import models
 
+from posthog.models.insight import Insight
+
 
 def get_default_access_token() -> str:
     return secrets.token_urlsafe(22)
@@ -37,6 +39,9 @@ def can_access_object(self, obj: models.Model):
         if obj.team_id != self.team_id:  # type: ignore
             return False
 
+        if obj._meta.object_name == "Insight" and self.dashboard:
+            return cast(Insight, obj).id in self.get_connected_insight_ids()
+
         for comparison in [self.insight, self.dashboard, self.recording]:
             if comparison and comparison == obj:
                 return True
diff --git a/posthog/models/test/test_insight_model.py b/posthog/models/test/test_insight_model.py
index 2519b8a79cb0a..5690a141a0f36 100644
--- a/posthog/models/test/test_insight_model.py
+++ b/posthog/models/test/test_insight_model.py
@@ -144,6 +144,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {},
                 {
                     "dateRange": {"date_from": "-14d", "date_to": "-7d"},
+                    "filterTestAccounts": None,
                     "properties": None,
                 },
             ),
@@ -153,6 +154,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {"date_from": "-14d", "date_to": "-7d"},
                 {
                     "dateRange": {"date_from": "-14d", "date_to": "-7d"},
+                    "filterTestAccounts": None,
                     "properties": None,
                 },
             ),
@@ -162,6 +164,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {"date_from": "-4d", "date_to": "-3d"},
                 {
                     "dateRange": {"date_from": "-4d", "date_to": "-3d"},
+                    "filterTestAccounts": None,
                     "properties": None,
                 },
             ),
@@ -171,6 +174,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {"date_from": "all"},
                 {
                     "dateRange": {"date_from": "all", "date_to": None},
+                    "filterTestAccounts": None,
                     "properties": None,
                 },
             ),
@@ -178,7 +182,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 # test that if no filters are set then none are outputted
                 {},
                 {},
-                {"dateRange": {"date_from": None, "date_to": None}, "properties": None},
+                {"dateRange": {"date_from": None, "date_to": None}, "filterTestAccounts": None, "properties": None},
             ),
             (
                 # test that properties from the query are used when there are no dashboard properties
@@ -186,6 +190,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {},
                 {
                     "dateRange": {"date_from": None, "date_to": None},
+                    "filterTestAccounts": None,
                     "properties": [browser_equals_firefox],
                 },
             ),
@@ -195,6 +200,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {"properties": [browser_equals_chrome]},
                 {
                     "dateRange": {"date_from": None, "date_to": None},
+                    "filterTestAccounts": None,
                     "properties": [browser_equals_chrome],
                 },
             ),
@@ -204,6 +210,7 @@ def test_dashboard_with_query_insight_and_filters(self) -> None:
                 {"properties": [browser_equals_chrome]},
                 {
                     "dateRange": {"date_from": None, "date_to": None},
+                    "filterTestAccounts": None,
                     "properties": [browser_equals_firefox, browser_equals_chrome],
                 },
             ),
diff --git a/posthog/permissions.py b/posthog/permissions.py
index 5d6f713677551..6e941b32b6d0a 100644
--- a/posthog/permissions.py
+++ b/posthog/permissions.py
@@ -1,6 +1,7 @@
 from typing import cast
 
 from django.db.models import Model
+from rest_framework.exceptions import NotFound
 from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAdminUser
 from rest_framework.request import Request
 from rest_framework.views import APIView
@@ -137,6 +138,9 @@ def has_permission(self, request, view) -> bool:
             view.team  # noqa: B018
         except Team.DoesNotExist:
             return True  # This will be handled as a 404 in the viewset
+
+        # NOTE: The naming here is confusing - "current_team" refers to the team that the user_permissions was initialized with
+        # - not the "current_team" property of the user
         requesting_level = view.user_permissions.current_team.effective_membership_level
         return requesting_level is not None
 
@@ -228,6 +232,13 @@ def has_permission(self, request, view) -> bool:
         ), "SharingTokenPermission requires the `sharing_enabled_actions` attribute to be set in the view"
 
         if isinstance(request.successful_authenticator, SharingAccessTokenAuthentication):
+            try:
+                view.team  # noqa: B018
+                if request.successful_authenticator.sharing_configuration.team != view.team:
+                    return False
+            except NotFound:
+                return False
+
             return view.action in view.sharing_enabled_actions
 
         return False
diff --git a/posthog/queries/funnels/base.py b/posthog/queries/funnels/base.py
index 7e60b4fe87ca5..e52880f6a091d 100644
--- a/posthog/queries/funnels/base.py
+++ b/posthog/queries/funnels/base.py
@@ -499,14 +499,14 @@ def _add_breakdown_attribution_subquery(self, inner_query: str) -> str:
             if self._query_has_array_breakdown():
                 default_breakdown_value = f"""[{','.join(["''" for _ in range(len(self._filter.breakdown or []))])}]"""
                 # default is [''] when dealing with a single breakdown array, otherwise ['', '', ...., '']
-                breakdown_selelector = (
+                breakdown_selector = (
                     f"if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, {default_breakdown_value})"
                 )
             else:
-                breakdown_selelector = "prop_vals"
+                breakdown_selector = "prop_vals"
 
             return f"""
-                SELECT *, {breakdown_selelector} as prop
+                SELECT *, {breakdown_selector} as prop
                 FROM ({inner_query})
             """
 
diff --git a/posthog/schema.py b/posthog/schema.py
index 328f61346b2b3..4ebc9c675a703 100644
--- a/posthog/schema.py
+++ b/posthog/schema.py
@@ -64,6 +64,10 @@ class AutocompleteCompletionItem(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    detail: Optional[str] = Field(
+        default=None,
+        description="A human-readable string with additional information about this item, like type or symbol information.",
+    )
     documentation: Optional[str] = Field(
         default=None, description="A human-readable string that represents a doc-comment."
     )
@@ -324,6 +328,7 @@ class HogQLAutocompleteResponse(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    incomplete_list: bool = Field(..., description="Whether or not the suggestions returned are complete")
     suggestions: List[AutocompleteCompletionItem]
 
 
@@ -663,6 +668,7 @@ class QueryResponseAlternative9(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    incomplete_list: bool = Field(..., description="Whether or not the suggestions returned are complete")
     suggestions: List[AutocompleteCompletionItem]
 
 
@@ -1484,6 +1490,7 @@ class SavedInsightNode(BaseModel):
     showSavedQueries: Optional[bool] = Field(default=None, description="Shows a list of saved queries")
     showSearch: Optional[bool] = Field(default=None, description="Include a free text search field (PersonsNode only)")
     showTable: Optional[bool] = None
+    showTestAccountFilters: Optional[bool] = Field(default=None, description="Show filter to exclude test accounts")
     showTimings: Optional[bool] = Field(default=None, description="Show a detailed query timing breakdown")
     suppressSessionAnalysisWarning: Optional[bool] = None
     vizSpecificOptions: Optional[VizSpecificOptions] = None
@@ -1534,6 +1541,7 @@ class WebOverviewQuery(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    compare: Optional[bool] = None
     dateRange: Optional[DateRange] = None
     kind: Literal["WebOverviewQuery"] = "WebOverviewQuery"
     properties: List[Union[EventPropertyFilter, PersonPropertyFilter]]
@@ -1737,6 +1745,7 @@ class EventsQuery(BaseModel):
     after: Optional[str] = Field(default=None, description="Only fetch events that happened after this timestamp")
     before: Optional[str] = Field(default=None, description="Only fetch events that happened before this timestamp")
     event: Optional[str] = Field(default=None, description="Limit to events matching this string")
+    filterTestAccounts: Optional[bool] = Field(default=None, description="Filter test accounts")
     fixedProperties: Optional[
         List[
             Union[
@@ -1897,6 +1906,7 @@ class HogQLFilters(BaseModel):
         extra="forbid",
     )
     dateRange: Optional[DateRange] = None
+    filterTestAccounts: Optional[bool] = None
     properties: Optional[
         List[
             Union[
@@ -2647,6 +2657,7 @@ class DataTableNode(BaseModel):
     showResultsTable: Optional[bool] = Field(default=None, description="Show a results table")
     showSavedQueries: Optional[bool] = Field(default=None, description="Shows a list of saved queries")
     showSearch: Optional[bool] = Field(default=None, description="Include a free text search field (PersonsNode only)")
+    showTestAccountFilters: Optional[bool] = Field(default=None, description="Show filter to exclude test accounts")
     showTimings: Optional[bool] = Field(default=None, description="Show a detailed query timing breakdown")
     source: Union[
         EventsNode,
diff --git a/posthog/session_recordings/queries/session_replay_events.py b/posthog/session_recordings/queries/session_replay_events.py
index fb1f2ea30329e..8667a26d97d66 100644
--- a/posthog/session_recordings/queries/session_replay_events.py
+++ b/posthog/session_recordings/queries/session_replay_events.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Optional, Tuple, List
 
 from django.conf import settings
@@ -124,8 +124,10 @@ def get_events(
         hq = HogQLQuery(
             query=q,
             values={
-                "start_time": metadata["start_time"],
-                "end_time": metadata["end_time"],
+                # add some wiggle room to the timings, to ensure we get all the events
+                # the time range is only to stop CH loading too much data to find the session
+                "start_time": metadata["start_time"] - timedelta(seconds=100),
+                "end_time": metadata["end_time"] + timedelta(seconds=100),
                 "session_id": session_id,
                 "events_to_ignore": events_to_ignore,
             },
diff --git a/posthog/session_recordings/queries/test/test_session_recording_list_from_session_replay.py b/posthog/session_recordings/queries/test/test_session_recording_list_from_session_replay.py
index b86a77dfe0522..b0020d2a5de48 100644
--- a/posthog/session_recordings/queries/test/test_session_recording_list_from_session_replay.py
+++ b/posthog/session_recordings/queries/test/test_session_recording_list_from_session_replay.py
@@ -7,7 +7,6 @@
 
 from posthog.clickhouse.client import sync_execute
 from posthog.clickhouse.log_entries import TRUNCATE_LOG_ENTRIES_TABLE_SQL
-from posthog.cloud_utils import TEST_clear_cloud_cache
 from posthog.constants import AvailableFeature
 from posthog.models import Person, Cohort, GroupTypeMapping
 from posthog.models.action import Action
@@ -690,7 +689,6 @@ def test_event_filter_has_ttl_applied_too(self):
     def test_ttl_days(self):
         assert ttl_days(self.team) == 21
 
-        TEST_clear_cloud_cache()
         with self.is_cloud(True):
             # Far enough in the future from `days_since_blob_ingestion` but not paid
             with freeze_time("2023-09-01T12:00:01Z"):
diff --git a/posthog/session_recordings/session_recording_api.py b/posthog/session_recordings/session_recording_api.py
index 080359a8635a0..acc70bb7e70ed 100644
--- a/posthog/session_recordings/session_recording_api.py
+++ b/posthog/session_recordings/session_recording_api.py
@@ -16,11 +16,10 @@
 from loginas.utils import is_impersonated_session
 from rest_framework import exceptions, request, serializers, viewsets
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from posthog.api.person import MinimalPersonSerializer
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.auth import SharingAccessTokenAuthentication
 from posthog.cloud_utils import is_cloud
 from posthog.constants import SESSION_RECORDINGS_FILTER_IDS
@@ -28,10 +27,6 @@
 from posthog.models.filters.session_recordings_filter import SessionRecordingsFilter
 from posthog.models.person.person import PersonDistinctId
 from posthog.session_recordings.models.session_recording import SessionRecording
-from posthog.permissions import (
-    SharingTokenPermission,
-    TeamMemberAccessPermission,
-)
 from posthog.session_recordings.models.session_recording_event import (
     SessionRecordingViewed,
 )
@@ -49,7 +44,7 @@
 )
 from posthog.session_recordings.queries.session_replay_events import SessionReplayEvents
 from posthog.session_recordings.realtime_snapshots import get_realtime_snapshots, publish_subscription
-from posthog.session_recordings.session_summary.summarize_session import summarize_recording
+from ee.session_recordings.session_summary.summarize_session import summarize_recording
 from posthog.session_recordings.snapshots.convert_legacy_snapshots import (
     convert_original_version_lts_recording,
 )
@@ -179,8 +174,8 @@ def list_recordings_response(
     return response
 
 
-class SessionRecordingViewSet(StructuredViewSetMixin, viewsets.GenericViewSet):
-    permission_classes = [IsAuthenticated, TeamMemberAccessPermission]
+# NOTE: Could we put the sharing stuff in the shared mixin :thinking:
+class SessionRecordingViewSet(TeamAndOrgViewSetMixin, viewsets.GenericViewSet):
     throttle_classes = [ClickHouseBurstRateThrottle, ClickHouseSustainedRateThrottle]
     serializer_class = SessionRecordingSerializer
     # We don't use this
@@ -188,14 +183,6 @@ class SessionRecordingViewSet(StructuredViewSetMixin, viewsets.GenericViewSet):
 
     sharing_enabled_actions = ["retrieve", "snapshots", "snapshot_file"]
 
-    def get_permissions(self):
-        if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication):
-            return [SharingTokenPermission()]
-        return super().get_permissions()
-
-    def get_authenticators(self):
-        return [SharingAccessTokenAuthentication(), *super().get_authenticators()]
-
     def get_serializer_class(self) -> Type[serializers.Serializer]:
         if isinstance(self.request.successful_authenticator, SharingAccessTokenAuthentication):
             return SessionRecordingSharedSerializer
diff --git a/posthog/session_recordings/sql/session_replay_embeddings_sql.py b/posthog/session_recordings/sql/session_replay_embeddings_sql.py
new file mode 100644
index 0000000000000..dd0d26e7aca61
--- /dev/null
+++ b/posthog/session_recordings/sql/session_replay_embeddings_sql.py
@@ -0,0 +1,87 @@
+from django.conf import settings
+
+from posthog.clickhouse.table_engines import (
+    Distributed,
+    ReplicationScheme,
+    MergeTreeEngine,
+)
+
+"""
+We want to use ML to convert session replay data to embeddings, these will let us check similarity between sessions
+and so to cluster sessions. We will store the embeddings in a separate table to the session replay data, so we can
+easily iterate on th schema, and so we don't ever have to join recordings data in Postgres and CH
+
+Expected queries will be to load sets of embeddings, by team and date, and to insert embeddings for a session
+And to allow us to select sessions by similarity
+And to select sessions from session_replay_event which don't have an embedding yet (for processing)
+"""
+
+SESSION_REPLAY_EMBEDDINGS_DATA_TABLE = lambda: "sharded_session_replay_embeddings"
+
+SESSION_REPLAY_EMBEDDINGS_TABLE_BASE_SQL = """
+CREATE TABLE IF NOT EXISTS {table_name} ON CLUSTER '{cluster}'
+(
+    -- part of order by so will aggregate correctly
+    session_id VARCHAR,
+    -- part of order by so will aggregate correctly
+    team_id Int64,
+    embeddings Array(Float32),
+    generation_timestamp DateTime64(6, 'UTC') DEFAULT NOW('UTC'),
+    -- we will insert directly for the first test of this
+    -- so no _timestamp or _offset column
+    --_timestamp SimpleAggregateFunction(max, DateTime)
+) ENGINE = {engine}
+"""
+
+SESSION_REPLAY_EMBEDDINGS_DATA_TABLE_ENGINE = lambda: MergeTreeEngine(
+    "session_replay_embeddings", replication_scheme=ReplicationScheme.SHARDED
+)
+
+SESSION_REPLAY_EMBEDDINGS_TABLE_SQL = lambda: (
+    SESSION_REPLAY_EMBEDDINGS_TABLE_BASE_SQL
+    + """
+    PARTITION BY toYYYYMM(generation_timestamp)
+    -- order by must be in order of increasing cardinality
+    -- so we order by date first, then team_id, then session_id
+    -- hopefully, this is a good balance between the two
+    ORDER BY (toDate(generation_timestamp), team_id, session_id)
+    -- we don't want to keep embeddings forever, so we will set a TTL
+    -- the max any individual recording could survive is 1 year, so...
+    TTL toDate(generation_timestamp) + INTERVAL 1 YEAR
+SETTINGS index_granularity=512
+"""
+).format(
+    table_name=SESSION_REPLAY_EMBEDDINGS_DATA_TABLE(),
+    cluster=settings.CLICKHOUSE_CLUSTER,
+    engine=SESSION_REPLAY_EMBEDDINGS_DATA_TABLE_ENGINE(),
+)
+
+# Distributed engine tables are only created if CLICKHOUSE_REPLICATED
+
+# This table is responsible for writing to sharded_session_replay_embeddings based on a sharding key.
+WRITABLE_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL = lambda: SESSION_REPLAY_EMBEDDINGS_TABLE_BASE_SQL.format(
+    table_name="writable_session_replay_embeddings",
+    cluster=settings.CLICKHOUSE_CLUSTER,
+    engine=Distributed(
+        data_table=SESSION_REPLAY_EMBEDDINGS_DATA_TABLE(),
+        sharding_key="sipHash64(session_id)",
+    ),
+)
+
+# This table is responsible for reading from session_replay_embeddings on a cluster setting
+DISTRIBUTED_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL = lambda: SESSION_REPLAY_EMBEDDINGS_TABLE_BASE_SQL.format(
+    table_name="session_replay_embeddings",
+    cluster=settings.CLICKHOUSE_CLUSTER,
+    engine=Distributed(
+        data_table=SESSION_REPLAY_EMBEDDINGS_DATA_TABLE(),
+        sharding_key="sipHash64(session_id)",
+    ),
+)
+
+DROP_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL = lambda: (
+    f"DROP TABLE IF EXISTS {SESSION_REPLAY_EMBEDDINGS_DATA_TABLE()} ON CLUSTER '{settings.CLICKHOUSE_CLUSTER}'"
+)
+
+TRUNCATE_SESSION_REPLAY_EMBEDDINGS_TABLE_SQL = lambda: (
+    f"TRUNCATE TABLE IF EXISTS {SESSION_REPLAY_EMBEDDINGS_DATA_TABLE()} ON CLUSTER '{settings.CLICKHOUSE_CLUSTER}'"
+)
diff --git a/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr b/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
index 70d5bf0249248..9f681b4f7e3e2 100644
--- a/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
+++ b/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
@@ -707,6 +707,30 @@
   LIMIT 21
   '''
 # ---
+# name: TestSessionRecordings.test_get_session_recordings.30
+  '''
+  SELECT "posthog_persondistinctid"."id",
+         "posthog_persondistinctid"."team_id",
+         "posthog_persondistinctid"."person_id",
+         "posthog_persondistinctid"."distinct_id",
+         "posthog_persondistinctid"."version",
+         "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_persondistinctid"
+  INNER JOIN "posthog_person" ON ("posthog_persondistinctid"."person_id" = "posthog_person"."id")
+  WHERE ("posthog_persondistinctid"."distinct_id" IN ('user2',
+                                                      'user_one_2')
+         AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
 # name: TestSessionRecordings.test_get_session_recordings.4
   '''
   SELECT "posthog_team"."id",
@@ -3143,6 +3167,61 @@
          AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
   '''
 # ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.185
+  '''
+  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='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.186
+  '''
+  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='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.187
+  '''
+  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='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.188
+  '''
+  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='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.189
+  '''
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
 # name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.19
   '''
   SELECT "posthog_instancesetting"."id",
@@ -3154,6 +3233,115 @@
   LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
   '''
 # ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.190
+  '''
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:RECORDINGS_TTL_WEEKS'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.191
+  '''
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.192
+  '''
+  SELECT "posthog_instancesetting"."id",
+         "posthog_instancesetting"."key",
+         "posthog_instancesetting"."raw_value"
+  FROM "posthog_instancesetting"
+  WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
+  ORDER BY "posthog_instancesetting"."id" ASC
+  LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.193
+  '''
+  SELECT "posthog_sessionrecording"."id",
+         "posthog_sessionrecording"."session_id",
+         "posthog_sessionrecording"."team_id",
+         "posthog_sessionrecording"."created_at",
+         "posthog_sessionrecording"."deleted",
+         "posthog_sessionrecording"."object_storage_path",
+         "posthog_sessionrecording"."distinct_id",
+         "posthog_sessionrecording"."duration",
+         "posthog_sessionrecording"."active_seconds",
+         "posthog_sessionrecording"."inactive_seconds",
+         "posthog_sessionrecording"."start_time",
+         "posthog_sessionrecording"."end_time",
+         "posthog_sessionrecording"."click_count",
+         "posthog_sessionrecording"."keypress_count",
+         "posthog_sessionrecording"."mouse_activity_count",
+         "posthog_sessionrecording"."console_log_count",
+         "posthog_sessionrecording"."console_warn_count",
+         "posthog_sessionrecording"."console_error_count",
+         "posthog_sessionrecording"."start_url",
+         "posthog_sessionrecording"."storage_version"
+  FROM "posthog_sessionrecording"
+  WHERE ("posthog_sessionrecording"."session_id" IN ('1',
+                                                     '10',
+                                                     '2',
+                                                     '3',
+                                                     '4',
+                                                     '5',
+                                                     '6',
+                                                     '7',
+                                                     '8',
+                                                     '9')
+         AND "posthog_sessionrecording"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.194
+  '''
+  SELECT "posthog_sessionrecordingviewed"."session_id"
+  FROM "posthog_sessionrecordingviewed"
+  WHERE ("posthog_sessionrecordingviewed"."team_id" = 2
+         AND "posthog_sessionrecordingviewed"."user_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
+# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.195
+  '''
+  SELECT "posthog_persondistinctid"."id",
+         "posthog_persondistinctid"."team_id",
+         "posthog_persondistinctid"."person_id",
+         "posthog_persondistinctid"."distinct_id",
+         "posthog_persondistinctid"."version",
+         "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_persondistinctid"
+  INNER JOIN "posthog_person" ON ("posthog_persondistinctid"."person_id" = "posthog_person"."id")
+  WHERE ("posthog_persondistinctid"."distinct_id" IN ('user1',
+                                                      'user10',
+                                                      'user2',
+                                                      'user3',
+                                                      'user4',
+                                                      'user5',
+                                                      'user6',
+                                                      'user7',
+                                                      'user8',
+                                                      'user9')
+         AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
+  '''
+# ---
 # name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.2
   '''
   SELECT "posthog_organizationmembership"."id",
diff --git a/posthog/settings/base_variables.py b/posthog/settings/base_variables.py
index fa63b80da1789..734ade5e21c36 100644
--- a/posthog/settings/base_variables.py
+++ b/posthog/settings/base_variables.py
@@ -13,7 +13,7 @@
 DEBUG = get_from_env("DEBUG", False, type_cast=str_to_bool)
 TEST = "test" in sys.argv or sys.argv[0].endswith("pytest") or get_from_env("TEST", False, type_cast=str_to_bool)  # type: bool
 DEMO = get_from_env("DEMO", False, type_cast=str_to_bool)  # Whether this is a managed demo environment
-REGION = get_from_env("REGION", "US")  # Whether this is a Cloud US or Cloud EU instance
+CLOUD_DEPLOYMENT = get_from_env("CLOUD_DEPLOYMENT", optional=True)  # "US", "EU", or "DEV" - unset on self-hosted
 SELF_CAPTURE = get_from_env("SELF_CAPTURE", DEBUG and not DEMO, type_cast=str_to_bool)
 E2E_TESTING = get_from_env(
     "E2E_TESTING", False, type_cast=str_to_bool
diff --git a/posthog/settings/sentry.py b/posthog/settings/sentry.py
index 2b5d49fc36212..bc60e13646706 100644
--- a/posthog/settings/sentry.py
+++ b/posthog/settings/sentry.py
@@ -9,6 +9,7 @@
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.logging import LoggingIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
+from posthog.git import get_git_commit
 
 from posthog.settings import get_from_env
 from posthog.settings.base_variables import TEST
@@ -143,15 +144,7 @@ def sentry_init() -> None:
         sentry_logging = LoggingIntegration(level=sentry_logging_level, event_level=None)
         profiles_sample_rate = get_from_env("SENTRY_PROFILES_SAMPLE_RATE", type_cast=float, default=0.0)
 
-        release = None
-        try:
-            # Docker containers should have a commit.txt file in the base directory with the git
-            # commit hash used to generate them.
-            with open("commit.txt") as f:
-                release = f.read()
-        except:
-            # The release isn't required, it's just nice to have.
-            pass
+        release = get_git_commit()
 
         sentry_sdk.init(
             send_default_pii=send_pii,
diff --git a/posthog/settings/session_replay.py b/posthog/settings/session_replay.py
index e76866f599948..943e4466e82d2 100644
--- a/posthog/settings/session_replay.py
+++ b/posthog/settings/session_replay.py
@@ -1,4 +1,6 @@
-from posthog.settings import get_from_env
+from typing import List
+
+from posthog.settings import get_from_env, get_list, DEBUG
 from posthog.utils import str_to_bool
 
 # TRICKY: we saw unusual memory usage behavior in EU clickhouse cluster
@@ -15,3 +17,9 @@
 REALTIME_SNAPSHOTS_FROM_REDIS_ATTEMPT_TIMEOUT_SECONDS = get_from_env(
     "REALTIME_SNAPSHOTS_FROM_REDIS_ATTEMPT_TIMEOUT_SECONDS", 0.2, type_cast=float
 )
+
+REPLAY_EMBEDDINGS_CALCULATION_CELERY_INTERVAL_SECONDS = get_from_env(
+    "REPLAY_EMBEDDINGS_CALCULATION_CELERY_INTERVAL_SECONDS", 30 if DEBUG else 300, type_cast=int
+)
+
+REPLAY_EMBEDDINGS_ALLOWED_TEAMS: List[str] = get_list(get_from_env("REPLAY_EMBEDDINGS_ALLOWED_TEAM", "", type_cast=str))
diff --git a/posthog/settings/web.py b/posthog/settings/web.py
index 08c7f00769619..8514e81365f5b 100644
--- a/posthog/settings/web.py
+++ b/posthog/settings/web.py
@@ -241,7 +241,6 @@
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [
         "posthog.auth.PersonalAPIKeyAuthentication",
-        "rest_framework.authentication.BasicAuthentication",
         "rest_framework.authentication.SessionAuthentication",
     ],
     "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
diff --git a/posthog/tasks/__init__.py b/posthog/tasks/__init__.py
index 2e9fb05dbefa6..5539ffe9eac9d 100644
--- a/posthog/tasks/__init__.py
+++ b/posthog/tasks/__init__.py
@@ -9,7 +9,6 @@
     email,
     exporter,
     process_scheduled_changes,
-    prompts,
     split_person,
     sync_all_organization_available_features,
     tasks,
@@ -28,7 +27,6 @@
     "email",
     "exporter",
     "process_scheduled_changes",
-    "prompts",
     "split_person",
     "sync_all_organization_available_features",
     "tasks",
diff --git a/posthog/tasks/prompts.py b/posthog/tasks/prompts.py
deleted file mode 100644
index 13828740f3e95..0000000000000
--- a/posthog/tasks/prompts.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from celery import shared_task
-from django.db import IntegrityError
-
-from posthog.models.prompt.prompt import PromptSequence, UserPromptState
-from posthog.models.user import User
-
-
-@shared_task()
-def trigger_prompt_for_user(email: str, sequence_id: int) -> None:
-    try:
-        sequence = PromptSequence.objects.get(pk=sequence_id)
-        user = User.objects.get(email=email)
-        UserPromptState.objects.get_or_create(user=user, sequence=sequence, step=None)
-    except (User.DoesNotExist, IntegrityError):
-        pass
diff --git a/posthog/tasks/scheduled.py b/posthog/tasks/scheduled.py
index 85d39d4bcb904..e7b29070db18a 100644
--- a/posthog/tasks/scheduled.py
+++ b/posthog/tasks/scheduled.py
@@ -45,6 +45,7 @@
     update_event_partitions,
     update_quota_limiting,
     verify_persons_data_in_sync,
+    calculate_replay_embeddings,
 )
 from posthog.utils import get_crontab
 
@@ -238,6 +239,16 @@ def setup_periodic_tasks(sender: Celery, **kwargs: Any) -> None:
         )
 
     if settings.EE_AVAILABLE:
+        # every interval seconds, we calculate N replay embeddings
+        # the goal is to process _enough_ every 24 hours that
+        # there is a meaningful playlist to test with
+        add_periodic_task_with_expiry(
+            sender,
+            settings.REPLAY_EMBEDDINGS_CALCULATION_CELERY_INTERVAL_SECONDS,
+            calculate_replay_embeddings.s(),
+            name="calculate replay embeddings",
+        )
+
         sender.add_periodic_task(
             crontab(hour="0", minute=str(randrange(0, 40))),
             clickhouse_send_license_usage.s(),
diff --git a/posthog/tasks/tasks.py b/posthog/tasks/tasks.py
index bc4b3910766ce..d3747fcb102a4 100644
--- a/posthog/tasks/tasks.py
+++ b/posthog/tasks/tasks.py
@@ -14,6 +14,10 @@
 from posthog.redis import get_client
 from posthog.tasks.utils import CeleryQueue
 
+from structlog import get_logger
+
+logger = get_logger(__name__)
+
 
 @shared_task(ignore_result=True)
 def delete_expired_exported_assets() -> None:
@@ -716,3 +720,17 @@ def check_data_import_row_limits() -> None:
         pass
     else:
         check_synced_row_limits()
+
+
+# this task runs a CH query and triggers other tasks
+# it can run on the default queue
+@shared_task(ignore_result=True)
+def calculate_replay_embeddings() -> None:
+    try:
+        from ee.tasks.replay import generate_recordings_embeddings_batch
+
+        generate_recordings_embeddings_batch()
+    except ImportError:
+        pass
+    except Exception as e:
+        logger.error("Failed to calculate replay embeddings", error=e, exc_info=True)
diff --git a/posthog/tasks/utils.py b/posthog/tasks/utils.py
index ecabc29adac79..fa2c33cb2bacb 100644
--- a/posthog/tasks/utils.py
+++ b/posthog/tasks/utils.py
@@ -35,3 +35,4 @@ class CeleryQueue(Enum):
     EXPORTS = "exports"
     SUBSCRIPTION_DELIVERY = "subscription_delivery"
     USAGE_REPORTS = "usage_reports"
+    SESSION_REPLAY_EMBEDDINGS = "session_replay_embeddings"
diff --git a/posthog/temporal/batch_exports/bigquery_batch_export.py b/posthog/temporal/batch_exports/bigquery_batch_export.py
index 5a6adb6f3e23a..3dcbbda66bed5 100644
--- a/posthog/temporal/batch_exports/bigquery_batch_export.py
+++ b/posthog/temporal/batch_exports/bigquery_batch_export.py
@@ -4,13 +4,14 @@
 import datetime as dt
 import json
 
+import pyarrow as pa
 from django.conf import settings
 from google.cloud import bigquery
 from google.oauth2 import service_account
 from temporalio import activity, workflow
 from temporalio.common import RetryPolicy
 
-from posthog.batch_exports.service import BigQueryBatchExportInputs
+from posthog.batch_exports.service import BatchExportField, BatchExportSchema, BigQueryBatchExportInputs
 from posthog.temporal.batch_exports.base import PostHogWorkflow
 from posthog.temporal.batch_exports.batch_exports import (
     BatchExportTemporaryFile,
@@ -28,6 +29,7 @@
     get_bytes_exported_metric,
     get_rows_exported_metric,
 )
+from posthog.temporal.batch_exports.utils import peek_first_and_rewind
 from posthog.temporal.common.logger import bind_temporal_worker_logger
 from posthog.temporal.common.utils import (
     BatchExportHeartbeatDetails,
@@ -57,12 +59,65 @@ async def create_table_in_bigquery(
     """Create a table in BigQuery."""
     fully_qualified_name = f"{project_id}.{dataset_id}.{table_id}"
     table = bigquery.Table(fully_qualified_name, schema=table_schema)
-    table.time_partitioning = bigquery.TimePartitioning(type_=bigquery.TimePartitioningType.DAY, field="timestamp")
+
+    if "timestamp" in [field.name for field in table_schema]:
+        # TODO: Maybe choosing which column to use as parititoning should be a configuration parameter.
+        # 'timestamp' is used for backwards compatibility.
+        table.time_partitioning = bigquery.TimePartitioning(type_=bigquery.TimePartitioningType.DAY, field="timestamp")
+
     table = await asyncio.to_thread(bigquery_client.create_table, table, exists_ok=exists_ok)
 
     return table
 
 
+def get_bigquery_fields_from_record_schema(
+    record_schema: pa.Schema, known_json_columns: list[str]
+) -> list[bigquery.SchemaField]:
+    """Generate a list of supported BigQuery fields from PyArrow schema.
+
+    This function is used to map custom schemas to BigQuery-supported types. Some loss
+    of precision is expected.
+
+    Arguments:
+        record_schema: The schema of a PyArrow RecordBatch from which we'll attempt to
+            derive BigQuery-supported types.
+        known_json_columns: If a string type field is a known JSON column then use JSON
+            as its BigQuery type.
+    """
+    bq_schema: list[bigquery.SchemaField] = []
+
+    for name in record_schema.names:
+        pa_field = record_schema.field(name)
+
+        if pa.types.is_string(pa_field.type):
+            if pa_field.name in known_json_columns:
+                bq_type = "JSON"
+            else:
+                bq_type = "STRING"
+
+        elif pa.types.is_binary(pa_field.type):
+            bq_type = "BYTES"
+
+        elif pa.types.is_signed_integer(pa_field.type):
+            bq_type = "INT64"
+
+        elif pa.types.is_floating(pa_field.type):
+            bq_type = "FLOAT64"
+
+        elif pa.types.is_boolean(pa_field.type):
+            bq_type = "BOOL"
+
+        elif pa.types.is_timestamp(pa_field.type):
+            bq_type = "TIMESTAMP"
+
+        else:
+            raise TypeError(f"Unsupported type: {pa_field.type}")
+
+        bq_schema.append(bigquery.SchemaField(name, bq_type))
+
+    return bq_schema
+
+
 @dataclasses.dataclass
 class BigQueryHeartbeatDetails(BatchExportHeartbeatDetails):
     """The BigQuery batch export details included in every heartbeat."""
@@ -87,6 +142,7 @@ class BigQueryInsertInputs:
     exclude_events: list[str] | None = None
     include_events: list[str] | None = None
     use_json_type: bool = False
+    batch_export_schema: BatchExportSchema | None = None
 
 
 @contextlib.contextmanager
@@ -113,6 +169,28 @@ def bigquery_client(inputs: BigQueryInsertInputs):
         client.close()
 
 
+def bigquery_default_fields() -> list[BatchExportField]:
+    """Default fields for a BigQuery batch export.
+
+    Starting from the common default fields, we add and tweak some fields for
+    backwards compatibility.
+    """
+    batch_export_fields = default_fields()
+    batch_export_fields.append(
+        {
+            "expression": "nullIf(JSONExtractString(properties, '$ip'), '')",
+            "alias": "ip",
+        }
+    )
+    # Fields kept or removed for backwards compatibility with legacy apps schema.
+    batch_export_fields.append({"expression": "toJSONString(elements_chain)", "alias": "elements"})
+    batch_export_fields.append({"expression": "''", "alias": "site_url"})
+    batch_export_fields.append({"expression": "NOW64()", "alias": "bq_ingested_timestamp"})
+    batch_export_fields.pop(batch_export_fields.index({"expression": "created_at", "alias": "created_at"}))
+
+    return batch_export_fields
+
+
 @activity.defn
 async def insert_into_bigquery_activity(inputs: BigQueryInsertInputs):
     """Activity streams data from ClickHouse to BigQuery."""
@@ -155,18 +233,15 @@ async def insert_into_bigquery_activity(inputs: BigQueryInsertInputs):
 
         logger.info("BatchExporting %s rows", count)
 
-        fields = default_fields()
-        fields.append(
-            {
-                "expression": "nullIf(JSONExtractString(properties, '$ip'), '')",
-                "alias": "ip",
-            }
-        )
-        # Fields kept for backwards compatibility with legacy apps schema.
-        fields.append({"expression": "toJSONString(elements_chain)", "alias": "elements"})
-        fields.append({"expression": "''", "alias": "site_url"})
+        if inputs.batch_export_schema is None:
+            fields = bigquery_default_fields()
+            query_parameters = None
+
+        else:
+            fields = inputs.batch_export_schema["fields"]
+            query_parameters = inputs.batch_export_schema["values"]
 
-        record_iterator = iter_records(
+        records_iterator = iter_records(
             client=client,
             team_id=inputs.team_id,
             interval_start=data_interval_start,
@@ -174,31 +249,11 @@ async def insert_into_bigquery_activity(inputs: BigQueryInsertInputs):
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             fields=fields,
+            extra_query_parameters=query_parameters,
         )
 
-        if inputs.use_json_type is True:
-            json_type = "JSON"
-            json_columns = ["properties", "set", "set_once"]
-        else:
-            json_type = "STRING"
-            json_columns = []
-
-        default_table_schema = [
-            bigquery.SchemaField("uuid", "STRING"),
-            bigquery.SchemaField("event", "STRING"),
-            bigquery.SchemaField("properties", json_type),
-            bigquery.SchemaField("elements", "STRING"),
-            bigquery.SchemaField("set", json_type),
-            bigquery.SchemaField("set_once", json_type),
-            bigquery.SchemaField("distinct_id", "STRING"),
-            bigquery.SchemaField("team_id", "INT64"),
-            bigquery.SchemaField("ip", "STRING"),
-            bigquery.SchemaField("site_url", "STRING"),
-            bigquery.SchemaField("timestamp", "TIMESTAMP"),
-            bigquery.SchemaField("bq_ingested_timestamp", "TIMESTAMP"),
-        ]
-
-        result = None
+        bigquery_table = None
+        inserted_at = None
 
         async def worker_shutdown_handler():
             """Handle the Worker shutting down by heart-beating our latest status."""
@@ -215,56 +270,84 @@ async def worker_shutdown_handler():
         asyncio.create_task(worker_shutdown_handler())
 
         with bigquery_client(inputs) as bq_client:
-            bigquery_table = await create_table_in_bigquery(
-                inputs.project_id,
-                inputs.dataset_id,
-                inputs.table_id,
-                default_table_schema,
-                bq_client,
-            )
-
             with BatchExportTemporaryFile() as jsonl_file:
                 rows_exported = get_rows_exported_metric()
                 bytes_exported = get_bytes_exported_metric()
 
-                async def flush_to_bigquery():
+                async def flush_to_bigquery(bigquery_table, table_schema):
                     logger.debug(
                         "Loading %s records of size %s bytes",
                         jsonl_file.records_since_last_reset,
                         jsonl_file.bytes_since_last_reset,
                     )
-                    await load_jsonl_file_to_bigquery_table(jsonl_file, bigquery_table, default_table_schema, bq_client)
+                    await load_jsonl_file_to_bigquery_table(jsonl_file, bigquery_table, table_schema, bq_client)
 
                     rows_exported.add(jsonl_file.records_since_last_reset)
                     bytes_exported.add(jsonl_file.bytes_since_last_reset)
 
-                table_columns = [field.name for field in default_table_schema]
-
-                for record_batch in record_iterator:
-                    for result in record_batch.to_pylist():
-                        row = {k: v for k, v in result.items() if k in table_columns}
+                first_record, records_iterator = peek_first_and_rewind(records_iterator)
+
+                if inputs.use_json_type is True:
+                    json_type = "JSON"
+                    json_columns = ["properties", "set", "set_once", "person_properties"]
+                else:
+                    json_type = "STRING"
+                    json_columns = []
+
+                if inputs.batch_export_schema is None:
+                    schema = [
+                        bigquery.SchemaField("uuid", "STRING"),
+                        bigquery.SchemaField("event", "STRING"),
+                        bigquery.SchemaField("properties", json_type),
+                        bigquery.SchemaField("elements", "STRING"),
+                        bigquery.SchemaField("set", json_type),
+                        bigquery.SchemaField("set_once", json_type),
+                        bigquery.SchemaField("distinct_id", "STRING"),
+                        bigquery.SchemaField("team_id", "INT64"),
+                        bigquery.SchemaField("ip", "STRING"),
+                        bigquery.SchemaField("site_url", "STRING"),
+                        bigquery.SchemaField("timestamp", "TIMESTAMP"),
+                        bigquery.SchemaField("bq_ingested_timestamp", "TIMESTAMP"),
+                    ]
+
+                else:
+                    column_names = [column for column in first_record.schema.names if column != "_inserted_at"]
+                    record_schema = first_record.select(column_names).schema
+                    schema = get_bigquery_fields_from_record_schema(record_schema, known_json_columns=json_columns)
+
+                bigquery_table = await create_table_in_bigquery(
+                    inputs.project_id,
+                    inputs.dataset_id,
+                    inputs.table_id,
+                    schema,
+                    bq_client,
+                )
+
+                # Columns need to be sorted according to BigQuery schema.
+                record_columns = [field.name for field in schema] + ["_inserted_at"]
+
+                for record_batch in records_iterator:
+                    for record in record_batch.select(record_columns).to_pylist():
+                        inserted_at = record.pop("_inserted_at")
 
                         for json_column in json_columns:
-                            if json_column in row and (json_str := row.get(json_column, None)) is not None:
-                                row[json_column] = json.loads(json_str)
-
-                        row["bq_ingested_timestamp"] = dt.datetime.now(dt.timezone.utc)
+                            if json_column in record and (json_str := record.get(json_column, None)) is not None:
+                                record[json_column] = json.loads(json_str)
 
-                        jsonl_file.write_records_to_jsonl([row])
+                        # TODO: Parquet is a much more efficient format to send data to BigQuery.
+                        jsonl_file.write_records_to_jsonl([record])
 
                         if jsonl_file.tell() > settings.BATCH_EXPORT_BIGQUERY_UPLOAD_CHUNK_SIZE_BYTES:
-                            await flush_to_bigquery()
+                            await flush_to_bigquery(bigquery_table, schema)
 
-                            inserted_at = result["_inserted_at"]
                             last_inserted_at = inserted_at.isoformat()
                             activity.heartbeat(last_inserted_at)
 
                             jsonl_file.reset()
 
-                if jsonl_file.tell() > 0 and result is not None:
-                    await flush_to_bigquery()
+                if jsonl_file.tell() > 0 and inserted_at is not None:
+                    await flush_to_bigquery(bigquery_table, schema)
 
-                    inserted_at = result["_inserted_at"]
                     last_inserted_at = inserted_at.isoformat()
                     activity.heartbeat(last_inserted_at)
 
@@ -326,6 +409,7 @@ async def run(self, inputs: BigQueryBatchExportInputs):
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             use_json_type=inputs.use_json_type,
+            batch_export_schema=inputs.batch_export_schema,
         )
 
         await execute_batch_export_insert_activity(
diff --git a/posthog/temporal/batch_exports/postgres_batch_export.py b/posthog/temporal/batch_exports/postgres_batch_export.py
index 8e459bd28fdd5..806bc9e531a05 100644
--- a/posthog/temporal/batch_exports/postgres_batch_export.py
+++ b/posthog/temporal/batch_exports/postgres_batch_export.py
@@ -284,8 +284,6 @@ async def insert_into_postgres_activity(inputs: PostgresInsertInputs):
             extra_query_parameters=query_parameters,
         )
 
-        first_record, record_iterator = peek_first_and_rewind(record_iterator)
-
         if inputs.batch_export_schema is None:
             table_fields = [
                 ("uuid", "VARCHAR(200)"),
@@ -302,6 +300,8 @@ async def insert_into_postgres_activity(inputs: PostgresInsertInputs):
             ]
 
         else:
+            first_record, record_iterator = peek_first_and_rewind(record_iterator)
+
             column_names = [column for column in first_record.schema.names if column != "_inserted_at"]
             record_schema = first_record.select(column_names).schema
             table_fields = get_postgres_fields_from_record_schema(
diff --git a/posthog/temporal/batch_exports/redshift_batch_export.py b/posthog/temporal/batch_exports/redshift_batch_export.py
index c23ac6300ad5c..7f5e44fffd08a 100644
--- a/posthog/temporal/batch_exports/redshift_batch_export.py
+++ b/posthog/temporal/batch_exports/redshift_batch_export.py
@@ -7,11 +7,12 @@
 from dataclasses import dataclass
 
 import psycopg
+import pyarrow as pa
 from psycopg import sql
 from temporalio import activity, workflow
 from temporalio.common import RetryPolicy
 
-from posthog.batch_exports.service import RedshiftBatchExportInputs
+from posthog.batch_exports.service import BatchExportField, RedshiftBatchExportInputs
 from posthog.temporal.batch_exports.base import PostHogWorkflow
 from posthog.temporal.batch_exports.batch_exports import (
     CreateBatchExportRunInputs,
@@ -30,6 +31,7 @@
     create_table_in_postgres,
     postgres_connection,
 )
+from posthog.temporal.batch_exports.utils import peek_first_and_rewind
 from posthog.temporal.common.logger import bind_temporal_worker_logger
 
 
@@ -88,6 +90,80 @@ async def redshift_connection(inputs) -> typing.AsyncIterator[psycopg.AsyncConne
         yield connection
 
 
+def redshift_default_fields() -> list[BatchExportField]:
+    batch_export_fields = default_fields()
+    batch_export_fields.append(
+        {
+            "expression": "nullIf(JSONExtractString(properties, '$ip'), '')",
+            "alias": "ip",
+        }
+    )
+    # Fields kept or removed for backwards compatibility with legacy apps schema.
+    batch_export_fields.append({"expression": "''", "alias": "elements"})
+    batch_export_fields.append({"expression": "''", "alias": "site_url"})
+    batch_export_fields.pop(batch_export_fields.index({"expression": "created_at", "alias": "created_at"}))
+    # Team ID is (for historical reasons) an INTEGER (4 bytes) in PostgreSQL, but in ClickHouse is stored as Int64.
+    # We can't encode it as an Int64, as this includes 4 extra bytes, and PostgreSQL will reject the data with a
+    # 'incorrect binary data format' error on the column, so we cast it to Int32.
+    team_id_field = batch_export_fields.pop(
+        batch_export_fields.index(BatchExportField(expression="team_id", alias="team_id"))
+    )
+    team_id_field["expression"] = "toInt32(team_id)"
+    batch_export_fields.append(team_id_field)
+    return batch_export_fields
+
+
+RedshiftField = tuple[str, str]
+
+
+def get_redshift_fields_from_record_schema(
+    record_schema: pa.Schema, known_super_columns: list[str]
+) -> list[RedshiftField]:
+    """Generate a list of supported PostgreSQL fields from PyArrow schema.
+
+    This function is used to map custom schemas to Redshift-supported types. Some loss of precision is
+    expected.
+    """
+    pg_schema: list[RedshiftField] = []
+
+    for name in record_schema.names:
+        pa_field = record_schema.field(name)
+
+        if pa.types.is_string(pa_field.type):
+            if pa_field.name in known_super_columns:
+                pg_type = "SUPER"
+            else:
+                pg_type = "TEXT"
+
+        elif pa.types.is_signed_integer(pa_field.type):
+            if pa.types.is_int64(pa_field.type):
+                pg_type = "BIGINT"
+            else:
+                pg_type = "INTEGER"
+
+        elif pa.types.is_floating(pa_field.type):
+            if pa.types.is_float64(pa_field.type):
+                pg_type = "DOUBLE PRECISION"
+            else:
+                pg_type = "REAL"
+
+        elif pa.types.is_boolean(pa_field.type):
+            pg_type = "BOOLEAN"
+
+        elif pa.types.is_timestamp(pa_field.type):
+            if pa_field.type.tz is not None:
+                pg_type = "TIMESTAMPTZ"
+            else:
+                pg_type = "TIMESTAMP"
+
+        else:
+            raise TypeError(f"Unsupported type: {pa_field.type}")
+
+        pg_schema.append((name, pg_type))
+
+    return pg_schema
+
+
 async def insert_records_to_redshift(
     records: collections.abc.Iterator[dict[str, typing.Any]],
     redshift_connection: psycopg.AsyncConnection,
@@ -233,10 +309,13 @@ async def insert_into_redshift_activity(inputs: RedshiftInsertInputs):
 
         logger.info("BatchExporting %s rows", count)
 
-        fields = default_fields()
-        # Fields kept for backwards compatibility with legacy apps schema.
-        fields.append({"expression": "nullIf(JSONExtractString(properties, '$ip'), '')", "alias": "ip"})
-        fields.append({"expression": "''", "alias": "site_url"})
+        if inputs.batch_export_schema is None:
+            fields = redshift_default_fields()
+            query_parameters = None
+
+        else:
+            fields = inputs.batch_export_schema["fields"]
+            query_parameters = inputs.batch_export_schema["values"]
 
         record_iterator = iter_records(
             client=client,
@@ -246,52 +325,59 @@ async def insert_into_redshift_activity(inputs: RedshiftInsertInputs):
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             fields=fields,
+            extra_query_parameters=query_parameters,
         )
 
+        known_super_columns = ["properties", "set", "set_once", "person_properties"]
+
         if inputs.properties_data_type != "varchar":
             properties_type = "SUPER"
         else:
             properties_type = "VARCHAR(65535)"
 
+        if inputs.batch_export_schema is None:
+            table_fields = [
+                ("uuid", "VARCHAR(200)"),
+                ("event", "VARCHAR(200)"),
+                ("properties", properties_type),
+                ("elements", "VARCHAR(65535)"),
+                ("set", properties_type),
+                ("set_once", properties_type),
+                ("distinct_id", "VARCHAR(200)"),
+                ("team_id", "INTEGER"),
+                ("ip", "VARCHAR(200)"),
+                ("site_url", "VARCHAR(200)"),
+                ("timestamp", "TIMESTAMP WITH TIME ZONE"),
+            ]
+        else:
+            first_record, record_iterator = peek_first_and_rewind(record_iterator)
+
+            column_names = [column for column in first_record.schema.names if column != "_inserted_at"]
+            record_schema = first_record.select(column_names).schema
+            table_fields = get_redshift_fields_from_record_schema(
+                record_schema, known_super_columns=known_super_columns
+            )
+
         async with redshift_connection(inputs) as connection:
             await create_table_in_postgres(
                 connection,
                 schema=inputs.schema,
                 table_name=inputs.table_name,
-                fields=[
-                    ("uuid", "VARCHAR(200)"),
-                    ("event", "VARCHAR(200)"),
-                    ("properties", properties_type),
-                    ("elements", "VARCHAR(65535)"),
-                    ("set", properties_type),
-                    ("set_once", properties_type),
-                    ("distinct_id", "VARCHAR(200)"),
-                    ("team_id", "INTEGER"),
-                    ("ip", "VARCHAR(200)"),
-                    ("site_url", "VARCHAR(200)"),
-                    ("timestamp", "TIMESTAMP WITH TIME ZONE"),
-                ],
+                fields=table_fields,
             )
 
+        schema_columns = set((field[0] for field in table_fields))
+
         def map_to_record(row: dict) -> dict:
             """Map row to a record to insert to Redshift."""
-            record = {
-                "distinct_id": row["distinct_id"],
-                "elements": "",
-                "event": row["event"],
-                "ip": row["ip"],
-                "properties": json.loads(row["properties"]) if row["properties"] is not None else None,
-                "set": json.loads(row["set"]) if row["set"] is not None else None,
-                "set_once": json.loads(row["set_once"]) if row["set_once"] is not None else None,
-                "site_url": row["site_url"],
-                "team_id": row["team_id"],
-                "timestamp": row["timestamp"],
-                "uuid": row["uuid"],
-            }
-
-            for column in ("properties", "set", "set_once"):
+            record = {k: v for k, v in row.items() if k in schema_columns}
+
+            for column in known_super_columns:
                 if record.get(column, None) is not None:
-                    record[column] = json.dumps(remove_escaped_whitespace_recursive(record[column]), ensure_ascii=False)
+                    # TODO: We should be able to save a json.loads here.
+                    record[column] = json.dumps(
+                        remove_escaped_whitespace_recursive(json.loads(record[column])), ensure_ascii=False
+                    )
 
             return record
 
@@ -364,6 +450,7 @@ async def run(self, inputs: RedshiftBatchExportInputs):
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             properties_data_type=inputs.properties_data_type,
+            batch_export_schema=inputs.batch_export_schema,
         )
 
         await execute_batch_export_insert_activity(
diff --git a/posthog/temporal/batch_exports/s3_batch_export.py b/posthog/temporal/batch_exports/s3_batch_export.py
index be9e27327f837..6a6f4a8404995 100644
--- a/posthog/temporal/batch_exports/s3_batch_export.py
+++ b/posthog/temporal/batch_exports/s3_batch_export.py
@@ -12,7 +12,7 @@
 from temporalio import activity, workflow
 from temporalio.common import RetryPolicy
 
-from posthog.batch_exports.service import S3BatchExportInputs
+from posthog.batch_exports.service import BatchExportField, BatchExportSchema, S3BatchExportInputs
 from posthog.temporal.batch_exports.base import PostHogWorkflow
 from posthog.temporal.batch_exports.batch_exports import (
     BatchExportTemporaryFile,
@@ -304,6 +304,7 @@ class S3InsertInputs:
     include_events: list[str] | None = None
     encryption: str | None = None
     kms_key_id: str | None = None
+    batch_export_schema: BatchExportSchema | None = None
 
 
 async def initialize_and_resume_multipart_upload(inputs: S3InsertInputs) -> tuple[S3MultiPartUpload, str]:
@@ -360,6 +361,25 @@ async def initialize_and_resume_multipart_upload(inputs: S3InsertInputs) -> tupl
     return s3_upload, interval_start
 
 
+def s3_default_fields() -> list[BatchExportField]:
+    """Default fields for an S3 batch export.
+
+    Starting from the common default fields, we add and tweak some fields for
+    backwards compatibility.
+    """
+    batch_export_fields = default_fields()
+    batch_export_fields.append({"expression": "elements_chain", "alias": "elements_chain"})
+    batch_export_fields.append({"expression": "nullIf(person_properties, '')", "alias": "person_properties"})
+    batch_export_fields.append({"expression": "toString(person_id)", "alias": "person_id"})
+    # In contrast to other destinations, we do export this field.
+    batch_export_fields.append({"expression": "COALESCE(inserted_at, _timestamp)", "alias": "inserted_at"})
+
+    # Again, in contrast to other destinations, and for historical reasons, we do not include these fields.
+    not_exported_by_default = {"team_id", "set", "set_once"}
+
+    return [field for field in batch_export_fields if field["alias"] not in not_exported_by_default]
+
+
 @activity.defn
 async def insert_into_s3_activity(inputs: S3InsertInputs):
     """Activity to batch export data from PostHog's ClickHouse to S3.
@@ -403,11 +423,13 @@ async def insert_into_s3_activity(inputs: S3InsertInputs):
 
         s3_upload, interval_start = await initialize_and_resume_multipart_upload(inputs)
 
-        fields = default_fields()
-        # Fields kept for backwards compatibility with legacy apps schema.
-        fields.append({"expression": "elements_chain", "alias": "elements_chain"})
-        fields.append({"expression": "nullIf(person_properties, '')", "alias": "person_properties"})
-        fields.append({"expression": "toString(person_id)", "alias": "person_id"})
+        if inputs.batch_export_schema is None:
+            fields = s3_default_fields()
+            query_parameters = None
+
+        else:
+            fields = inputs.batch_export_schema["fields"]
+            query_parameters = inputs.batch_export_schema["values"]
 
         record_iterator = iter_records(
             client=client,
@@ -417,9 +439,9 @@ async def insert_into_s3_activity(inputs: S3InsertInputs):
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             fields=fields,
+            extra_query_parameters=query_parameters,
         )
 
-        result = None
         last_uploaded_part_timestamp: str | None = None
 
         async def worker_shutdown_handler():
@@ -437,6 +459,8 @@ async def worker_shutdown_handler():
 
         asyncio.create_task(worker_shutdown_handler())
 
+        record = None
+
         async with s3_upload as s3_upload:
             with BatchExportTemporaryFile(compression=inputs.compression) as local_results_file:
                 rows_exported = get_rows_exported_metric()
@@ -444,7 +468,7 @@ async def worker_shutdown_handler():
 
                 async def flush_to_s3(last_uploaded_part_timestamp: str, last=False):
                     logger.debug(
-                        "Uploading %spart %s containing %s records with size %s bytes",
+                        "Uploading %s part %s containing %s records with size %s bytes",
                         "last " if last else "",
                         s3_upload.part_number + 1,
                         local_results_file.records_since_last_reset,
@@ -458,33 +482,22 @@ async def flush_to_s3(last_uploaded_part_timestamp: str, last=False):
                     activity.heartbeat(last_uploaded_part_timestamp, s3_upload.to_state())
 
                 for record_batch in record_iterator:
-                    for result in record_batch.to_pylist():
-                        record = {
-                            "created_at": result["created_at"],
-                            "distinct_id": result["distinct_id"],
-                            "elements_chain": result["elements_chain"],
-                            "event": result["event"],
-                            "inserted_at": result["_inserted_at"],
-                            "person_id": result["person_id"],
-                            "person_properties": json.loads(result["person_properties"])
-                            if result["person_properties"] is not None
-                            else None,
-                            "properties": json.loads(result["properties"])
-                            if result["properties"] is not None
-                            else None,
-                            "timestamp": result["timestamp"],
-                            "uuid": result["uuid"],
-                        }
+                    for record in record_batch.to_pylist():
+                        for json_column in ("properties", "person_properties", "set", "set_once"):
+                            if (json_str := record.get(json_column, None)) is not None:
+                                record[json_column] = json.loads(json_str)
+
+                        inserted_at = record.pop("_inserted_at")
 
                         local_results_file.write_records_to_jsonl([record])
 
                         if local_results_file.tell() > settings.BATCH_EXPORT_S3_UPLOAD_CHUNK_SIZE_BYTES:
-                            last_uploaded_part_timestamp = str(result["_inserted_at"])
+                            last_uploaded_part_timestamp = str(inserted_at)
                             await flush_to_s3(last_uploaded_part_timestamp)
                             local_results_file.reset()
 
-                if local_results_file.tell() > 0 and result is not None:
-                    last_uploaded_part_timestamp = str(result["_inserted_at"])
+                if local_results_file.tell() > 0 and record is not None:
+                    last_uploaded_part_timestamp = str(inserted_at)
                     await flush_to_s3(last_uploaded_part_timestamp, last=True)
 
             await s3_upload.complete()
@@ -548,6 +561,7 @@ async def run(self, inputs: S3BatchExportInputs):
             include_events=inputs.include_events,
             encryption=inputs.encryption,
             kms_key_id=inputs.kms_key_id,
+            batch_export_schema=inputs.batch_export_schema,
         )
 
         await execute_batch_export_insert_activity(
diff --git a/posthog/temporal/batch_exports/snowflake_batch_export.py b/posthog/temporal/batch_exports/snowflake_batch_export.py
index 47a45ca55b6c3..425f71767eb76 100644
--- a/posthog/temporal/batch_exports/snowflake_batch_export.py
+++ b/posthog/temporal/batch_exports/snowflake_batch_export.py
@@ -7,13 +7,14 @@
 import json
 import typing
 
+import pyarrow as pa
 import snowflake.connector
 from django.conf import settings
 from snowflake.connector.connection import SnowflakeConnection
 from temporalio import activity, workflow
 from temporalio.common import RetryPolicy
 
-from posthog.batch_exports.service import SnowflakeBatchExportInputs
+from posthog.batch_exports.service import BatchExportField, BatchExportSchema, SnowflakeBatchExportInputs
 from posthog.temporal.batch_exports.base import PostHogWorkflow
 from posthog.temporal.batch_exports.batch_exports import (
     BatchExportTemporaryFile,
@@ -31,6 +32,7 @@
     get_bytes_exported_metric,
     get_rows_exported_metric,
 )
+from posthog.temporal.batch_exports.utils import peek_first_and_rewind
 from posthog.temporal.common.logger import bind_temporal_worker_logger
 from posthog.temporal.common.utils import (
     BatchExportHeartbeatDetails,
@@ -104,6 +106,7 @@ class SnowflakeInsertInputs:
     role: str | None = None
     exclude_events: list[str] | None = None
     include_events: list[str] | None = None
+    batch_export_schema: BatchExportSchema | None = None
 
 
 def use_namespace(connection: SnowflakeConnection, database: str, schema: str) -> None:
@@ -172,25 +175,112 @@ async def execute_async_query(
     return query_id
 
 
-async def create_table_in_snowflake(connection: SnowflakeConnection, table_name: str) -> None:
+def snowflake_default_fields() -> list[BatchExportField]:
+    """Default fields for a Snowflake batch export.
+
+    Starting from the common default fields, we add and tweak some fields for
+    backwards compatibility.
+    """
+    batch_export_fields = default_fields()
+    batch_export_fields.append(
+        {
+            "expression": "nullIf(JSONExtractString(properties, '$ip'), '')",
+            "alias": "ip",
+        }
+    )
+    # Fields kept for backwards compatibility with legacy apps schema.
+    batch_export_fields.append({"expression": "elements_chain", "alias": "elements"})
+    batch_export_fields.append({"expression": "''", "alias": "site_url"})
+    batch_export_fields.pop(batch_export_fields.index({"expression": "created_at", "alias": "created_at"}))
+
+    # For historical reasons, 'set' and 'set_once' are prefixed with 'people_'.
+    set_field = batch_export_fields.pop(
+        batch_export_fields.index(
+            BatchExportField(expression="nullIf(JSONExtractString(properties, '$set'), '')", alias="set")
+        )
+    )
+    set_field["alias"] = "people_set"
+
+    set_once_field = batch_export_fields.pop(
+        batch_export_fields.index(
+            BatchExportField(expression="nullIf(JSONExtractString(properties, '$set_once'), '')", alias="set_once")
+        )
+    )
+    set_once_field["alias"] = "people_set_once"
+
+    batch_export_fields.append(set_field)
+    batch_export_fields.append(set_once_field)
+
+    return batch_export_fields
+
+
+SnowflakeField = tuple[str, str]
+
+
+def get_snowflake_fields_from_record_schema(
+    record_schema: pa.Schema, known_variant_columns: list[str]
+) -> list[SnowflakeField]:
+    """Generate a list of supported Snowflake fields from PyArrow schema.
+    This function is used to map custom schemas to Snowflake-supported types. Some loss
+    of precision is expected.
+
+    Arguments:
+        record_schema: The schema of a PyArrow RecordBatch from which we'll attempt to
+            derive Snowflake-supported types.
+        known_variant_columns: If a string type field is a known VARIANT column then use VARIANT
+            as its Snowflake type.
+    """
+    snowflake_schema: list[SnowflakeField] = []
+
+    for name in record_schema.names:
+        pa_field = record_schema.field(name)
+
+        if pa.types.is_string(pa_field.type):
+            if pa_field.name in known_variant_columns:
+                snowflake_type = "VARIANT"
+            else:
+                snowflake_type = "STRING"
+
+        elif pa.types.is_binary(pa_field.type):
+            snowflake_type = "BYNARY"
+
+        elif pa.types.is_signed_integer(pa_field.type):
+            snowflake_type = "INTEGER"
+
+        elif pa.types.is_floating(pa_field.type):
+            snowflake_type = "FLOAT"
+
+        elif pa.types.is_boolean(pa_field.type):
+            snowflake_type = "BOOL"
+
+        elif pa.types.is_timestamp(pa_field.type):
+            snowflake_type = "TIMESTAMP"
+
+        else:
+            raise TypeError(f"Unsupported type: {pa_field.type}")
+
+        snowflake_schema.append((name, snowflake_type))
+
+    return snowflake_schema
+
+
+async def create_table_in_snowflake(
+    connection: SnowflakeConnection, table_name: str, fields: list[SnowflakeField]
+) -> None:
     """Asynchronously create the table if it doesn't exist.
 
-    Note that we use the same schema as the snowflake-plugin for backwards compatibility."""
+    Arguments:
+        connection:
+        table_name:
+        fields: An iterable of (name, type) tuples representing the fields of the table.
+    """
+    field_ddl = ", ".join((f'"{field[0]}" {field[1]}' for field in fields))
+
     await execute_async_query(
         connection,
         f"""
         CREATE TABLE IF NOT EXISTS "{table_name}" (
-            "uuid" STRING,
-            "event" STRING,
-            "properties" VARIANT,
-            "elements" VARIANT,
-            "people_set" VARIANT,
-            "people_set_once" VARIANT,
-            "distinct_id" STRING,
-            "team_id" INTEGER,
-            "ip" STRING,
-            "site_url" STRING,
-            "timestamp" TIMESTAMP
+            {field_ddl}
         )
         COMMENT = 'PostHog generated events table'
         """,
@@ -365,16 +455,13 @@ async def flush_to_snowflake(
             rows_exported.add(file.records_since_last_reset)
             bytes_exported.add(file.bytes_since_last_reset)
 
-        fields = default_fields()
-        fields.append(
-            {
-                "expression": "nullIf(JSONExtractString(properties, '$ip'), '')",
-                "alias": "ip",
-            }
-        )
-        # Fields kept for backwards compatibility with legacy apps schema.
-        fields.append({"expression": "toJSONString(elements_chain)", "alias": "elements"})
-        fields.append({"expression": "''", "alias": "site_url"})
+        if inputs.batch_export_schema is None:
+            fields = snowflake_default_fields()
+            query_parameters = None
+
+        else:
+            fields = inputs.batch_export_schema["fields"]
+            query_parameters = inputs.batch_export_schema["values"]
 
         record_iterator = iter_records(
             client=client,
@@ -384,12 +471,37 @@ async def flush_to_snowflake(
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
             fields=fields,
+            extra_query_parameters=query_parameters,
         )
 
-        with snowflake_connection(inputs) as connection:
-            await create_table_in_snowflake(connection, inputs.table_name)
+        known_variant_columns = ["properties", "people_set", "people_set_once", "person_properties"]
+        if inputs.batch_export_schema is None:
+            table_fields = [
+                ("uuid", "STRING"),
+                ("event", "STRING"),
+                ("properties", "VARIANT"),
+                ("elements", "VARIANT"),
+                ("people_set", "VARIANT"),
+                ("people_set_once", "VARIANT"),
+                ("distinct_id", "STRING"),
+                ("team_id", "INTEGER"),
+                ("ip", "STRING"),
+                ("site_url", "STRING"),
+                ("timestamp", "TIMESTAMP"),
+            ]
+
+        else:
+            first_record, record_iterator = peek_first_and_rewind(record_iterator)
+
+            column_names = [column for column in first_record.schema.names if column != "_inserted_at"]
+            record_schema = first_record.select(column_names).schema
+            table_fields = get_snowflake_fields_from_record_schema(
+                record_schema,
+                known_variant_columns=known_variant_columns,
+            )
 
-            result = None
+        with snowflake_connection(inputs) as connection:
+            await create_table_in_snowflake(connection, inputs.table_name, table_fields)
 
             async def worker_shutdown_handler():
                 """Handle the Worker shutting down by heart-beating our latest status."""
@@ -405,43 +517,35 @@ async def worker_shutdown_handler():
 
             asyncio.create_task(worker_shutdown_handler())
 
+            record_columns = [field[0] for field in table_fields] + ["_inserted_at"]
+            record = None
+            inserted_at = None
+
             with BatchExportTemporaryFile() as local_results_file:
                 for record_batch in record_iterator:
-                    for result in record_batch.to_pylist():
-                        record = {
-                            "uuid": result["uuid"],
-                            "event": result["event"],
-                            "properties": json.loads(result["properties"])
-                            if result["properties"] is not None
-                            else None,
-                            "elements": result["elements"],
-                            # For now, we are not passing in any custom fields, we update the alias for backwards compatibility.
-                            "people_set": json.loads(result["set"]) if result["set"] is not None else None,
-                            "people_set_once": json.loads(result["set_once"])
-                            if result["set_once"] is not None
-                            else None,
-                            "distinct_id": result["distinct_id"],
-                            "team_id": result["team_id"],
-                            "ip": result["ip"],
-                            "site_url": result["site_url"],
-                            "timestamp": result["timestamp"],
-                        }
+                    for record in record_batch.select(record_columns).to_pylist():
+                        inserted_at = record.pop("_inserted_at")
+
+                        for variant_column in known_variant_columns:
+                            if (json_str := record.get(variant_column, None)) is not None:
+                                record[variant_column] = json.loads(json_str)
+
                         local_results_file.write_records_to_jsonl([record])
 
                         if local_results_file.tell() > settings.BATCH_EXPORT_SNOWFLAKE_UPLOAD_CHUNK_SIZE_BYTES:
                             await flush_to_snowflake(connection, local_results_file, inputs.table_name, file_no)
 
-                            last_inserted_at = result["_inserted_at"]
+                            last_inserted_at = inserted_at
                             file_no += 1
 
                             activity.heartbeat(str(last_inserted_at), file_no)
 
                             local_results_file.reset()
 
-                if local_results_file.tell() > 0 and result is not None:
+                if local_results_file.tell() > 0 and record is not None and inserted_at is not None:
                     await flush_to_snowflake(connection, local_results_file, inputs.table_name, file_no, last=True)
 
-                    last_inserted_at = result["_inserted_at"]
+                    last_inserted_at = inserted_at
                     file_no += 1
 
                     activity.heartbeat(str(last_inserted_at), file_no)
@@ -508,6 +612,7 @@ async def run(self, inputs: SnowflakeBatchExportInputs):
             role=inputs.role,
             exclude_events=inputs.exclude_events,
             include_events=inputs.include_events,
+            batch_export_schema=inputs.batch_export_schema,
         )
 
         await execute_batch_export_insert_activity(
diff --git a/posthog/temporal/data_imports/pipelines/hubspot/__init__.py b/posthog/temporal/data_imports/pipelines/hubspot/__init__.py
index 1ca0d9972ce5b..f23b305d00a13 100644
--- a/posthog/temporal/data_imports/pipelines/hubspot/__init__.py
+++ b/posthog/temporal/data_imports/pipelines/hubspot/__init__.py
@@ -112,11 +112,11 @@ def crm_objects(
 
     props = ",".join(sorted(list(set(props))))
 
-    if len(props) > 5000:
+    if len(props) > 10000:
         raise ValueError(
             (
                 "Your request to Hubspot is too long to process. "
-                "Maximum allowed query length is 2000 symbols, while "
+                "Maximum allowed query length is 10000 symbols, while "
                 f"your list of properties `{props[:200]}`... is {len(props)} "
                 "symbols long. Use the `props` argument of the resource to "
                 "set the list of properties to extract from the endpoint."
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 24724d7cb6d4f..e8b05e9a2bd71 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
@@ -1,11 +1,13 @@
 import asyncio
 import datetime as dt
 import json
+import operator
 import os
 import typing
 from random import randint
 from uuid import uuid4
 
+import pyarrow as pa
 import pytest
 import pytest_asyncio
 from django.conf import settings
@@ -17,16 +19,20 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
+from posthog.batch_exports.service import BatchExportSchema, BigQueryBatchExportInputs
 from posthog.temporal.batch_exports.batch_exports import (
     create_export_run,
+    iter_records,
     update_export_run_status,
 )
 from posthog.temporal.batch_exports.bigquery_batch_export import (
-    BigQueryBatchExportInputs,
     BigQueryBatchExportWorkflow,
     BigQueryInsertInputs,
+    bigquery_default_fields,
+    get_bigquery_fields_from_record_schema,
     insert_into_bigquery_activity,
 )
+from posthog.temporal.batch_exports.clickhouse import ClickHouseClient
 from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
 from posthog.temporal.tests.utils.models import (
     acreate_batch_export,
@@ -44,64 +50,105 @@
 TEST_TIME = dt.datetime.now(dt.timezone.utc)
 
 
-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 event, timestamp")
+def assert_clickhouse_records_in_bigquery(
+    bigquery_client: bigquery.Client,
+    clickhouse_client: ClickHouseClient,
+    team_id: int,
+    table_id: str,
+    dataset_id: str,
+    data_interval_start: dt.datetime,
+    data_interval_end: dt.datetime,
+    min_ingested_timestamp: dt.datetime,
+    exclude_events: list[str] | None = None,
+    include_events: list[str] | None = None,
+    batch_export_schema: BatchExportSchema | None = None,
+    use_json_type: bool = False,
+    sort_key: str = "event",
+) -> None:
+    """Assert ClickHouse records are written to a given BigQuery table.
+
+    Arguments:
+        bigquery_connection: A BigQuery connection used to read inserted records.
+        clickhouse_client: A ClickHouseClient used to read records that are expected to be exported.
+        team_id: The ID of the team that we are testing for.
+        table_id: BigQuery table id where records are exported to.
+        dataset_id: BigQuery dataset containing the table where records are exported to.
+        data_interval_start: Start of the batch period for exported records.
+        data_interval_end: End of the batch period for exported records.
+        min_ingested_timestamp: A datetime used to assert a minimum bound for 'bq_ingested_timestamp'.
+        exclude_events: Event names to be excluded from the export.
+        include_events: Event names to be included in the export.
+        batch_export_schema: Custom schema used in the batch export.
+        use_json_type: Whether to use JSON type for known fields.
+    """
+    if use_json_type is True:
+        json_columns = ["properties", "set", "set_once", "person_properties"]
+    else:
+        json_columns = []
+
+    query_job = bigquery_client.query(f"SELECT * FROM {dataset_id}.{table_id}")
     result = query_job.result()
 
-    inserted_events = []
-    json_columns = ("properties", "set", "set_once")
+    inserted_records = []
+    inserted_bq_ingested_timestamp = []
 
     for row in result:
-        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,
-    )
+        inserted_record = {}
+
+        for k, v in row.items():
+            if k == "bq_ingested_timestamp":
+                inserted_bq_ingested_timestamp.append(v)
+                continue
+
+            inserted_record[k] = json.loads(v) if k in json_columns and v is not None else v
+
+        inserted_records.append(inserted_record)
+
+    if batch_export_schema is not None:
+        schema_column_names = [field["alias"] for field in batch_export_schema["fields"]]
+    else:
+        schema_column_names = [field["alias"] for field in bigquery_default_fields()]
+
+    expected_records = []
+    for records in iter_records(
+        client=clickhouse_client,
+        team_id=team_id,
+        interval_start=data_interval_start.isoformat(),
+        interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
+        include_events=include_events,
+        fields=batch_export_schema["fields"] if batch_export_schema is not None else bigquery_default_fields(),
+        extra_query_parameters=batch_export_schema["values"] if batch_export_schema is not None else None,
+    ):
+        for record in records.select(schema_column_names).to_pylist():
+            expected_record = {}
+
+            for k, v in record.items():
+                if k not in schema_column_names or k == "_inserted_at" or k == "bq_ingested_timestamp":
+                    # _inserted_at is not exported, only used for tracking progress.
+                    # bq_ingested_timestamp cannot be compared as it comes from an unstable function.
+                    continue
+
+                if k in json_columns and v is not None:
+                    expected_record[k] = json.loads(v)
+                elif isinstance(v, dt.datetime):
+                    expected_record[k] = v.replace(tzinfo=dt.timezone.utc)
+                else:
+                    expected_record[k] = v
 
-    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_name,
-            "ip": properties.get("$ip", None) if properties else None,
-            "properties": event.get("properties"),
-            "set": properties.get("$set", None) if properties else None,
-            "set_once": properties.get("$set_once", None) if properties else None,
-            "site_url": "",
-            # For compatibility with CH which doesn't parse timezone component, so we add it here assuming UTC.
-            "timestamp": dt.datetime.fromisoformat(event.get("timestamp") + "+00:00"),
-            "team_id": event.get("team_id"),
-            "uuid": event.get("uuid"),
-        }
-        expected_events.append(expected_event)
-
-    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 inserted_events == expected_events
+            expected_records.append(expected_record)
+
+    assert len(inserted_records) == len(expected_records)
+
+    # Ordering is not guaranteed, so we sort before comparing.
+    inserted_records.sort(key=operator.itemgetter(sort_key))
+    expected_records.sort(key=operator.itemgetter(sort_key))
+
+    assert inserted_records[0] == expected_records[0]
+    assert inserted_records == expected_records
+
+    if len(inserted_bq_ingested_timestamp) > 0:
+        assert all(ts >= min_ingested_timestamp for ts in inserted_bq_ingested_timestamp)
 
 
 @pytest.fixture
@@ -155,8 +202,31 @@ def use_json_type(request) -> bool:
         return False
 
 
+TEST_SCHEMAS = [
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_0)s), '')", "alias": "browser"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_1)s), '')", "alias": "os"},
+            {"expression": "nullIf(properties, '')", "alias": "all_properties"},
+        ],
+        "values": {"hogql_val_0": "$browser", "hogql_val_1": "$os"},
+    },
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "inserted_at", "alias": "inserted_at"},
+            {"expression": "toInt8(1 + 1)", "alias": "two"},
+        ],
+        "values": {},
+    },
+    None,
+]
+
+
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 @pytest.mark.parametrize("use_json_type", [False, True], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SCHEMAS)
 async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
     clickhouse_client,
     activity_environment,
@@ -165,6 +235,7 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
     exclude_events,
     bigquery_dataset,
     use_json_type,
+    batch_export_schema,
 ):
     """Test that the insert_into_bigquery_activity function inserts data into a BigQuery table.
 
@@ -186,7 +257,7 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    (events, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -199,7 +270,7 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
         person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -209,6 +280,7 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
         count_other_team=0,
         properties=None,
         person_properties=None,
+        event_name="test-no-prop-{i}",
     )
 
     if exclude_events:
@@ -232,6 +304,7 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
         data_interval_end=data_interval_end.isoformat(),
         exclude_events=exclude_events,
         use_json_type=use_json_type,
+        batch_export_schema=batch_export_schema,
         **bigquery_config,
     )
 
@@ -240,13 +313,19 @@ async def test_insert_into_bigquery_activity_inserts_data_into_bigquery_table(
 
         ingested_timestamp = frozen_time().replace(tzinfo=dt.timezone.utc)
 
-        assert_events_in_bigquery(
-            client=bigquery_client,
+        assert_clickhouse_records_in_bigquery(
+            bigquery_client=bigquery_client,
+            clickhouse_client=clickhouse_client,
             table_id=f"test_insert_activity_table_{team_id}",
             dataset_id=bigquery_dataset.dataset_id,
-            events=events + events_with_no_properties,
-            bq_ingested_timestamp=ingested_timestamp,
+            team_id=team_id,
+            data_interval_start=data_interval_start,
+            data_interval_end=data_interval_end,
             exclude_events=exclude_events,
+            include_events=None,
+            batch_export_schema=batch_export_schema,
+            use_json_type=use_json_type,
+            min_ingested_timestamp=ingested_timestamp,
         )
 
 
@@ -291,6 +370,7 @@ async def bigquery_batch_export(
 @pytest.mark.parametrize("interval", ["hour", "day"])
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
 @pytest.mark.parametrize("use_json_type", [False, True], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SCHEMAS)
 async def test_bigquery_export_workflow(
     clickhouse_client,
     bigquery_client,
@@ -299,6 +379,8 @@ async def test_bigquery_export_workflow(
     exclude_events,
     ateam,
     table_id,
+    use_json_type,
+    batch_export_schema,
 ):
     """Test BigQuery Export Workflow end-to-end.
 
@@ -308,7 +390,7 @@ async def test_bigquery_export_workflow(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -340,6 +422,7 @@ async def test_bigquery_export_workflow(
         batch_export_id=str(bigquery_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **bigquery_batch_export.destination.config,
     )
 
@@ -372,13 +455,19 @@ async def test_bigquery_export_workflow(
         assert run.status == "Completed"
 
         ingested_timestamp = frozen_time().replace(tzinfo=dt.timezone.utc)
-        assert_events_in_bigquery(
-            client=bigquery_client,
+        assert_clickhouse_records_in_bigquery(
+            bigquery_client=bigquery_client,
+            clickhouse_client=clickhouse_client,
             table_id=table_id,
             dataset_id=bigquery_batch_export.destination.config["dataset_id"],
-            events=events,
-            bq_ingested_timestamp=ingested_timestamp,
+            team_id=ateam.pk,
+            data_interval_start=data_interval_start,
+            data_interval_end=data_interval_end,
             exclude_events=exclude_events,
+            include_events=None,
+            batch_export_schema=batch_export_schema,
+            use_json_type=use_json_type,
+            min_ingested_timestamp=ingested_timestamp,
         )
 
 
@@ -479,3 +568,45 @@ async def never_finish_activity(_: BigQueryInsertInputs) -> str:
     run = runs[0]
     assert run.status == "Cancelled"
     assert run.latest_error == "Cancelled"
+
+
+@pytest.mark.parametrize(
+    "pyrecords,expected_schema",
+    [
+        ([{"test": 1}], [bigquery.SchemaField("test", "INT64")]),
+        ([{"test": "a string"}], [bigquery.SchemaField("test", "STRING")]),
+        ([{"test": b"a bytes"}], [bigquery.SchemaField("test", "BYTES")]),
+        ([{"test": 6.0}], [bigquery.SchemaField("test", "FLOAT64")]),
+        ([{"test": True}], [bigquery.SchemaField("test", "BOOL")]),
+        ([{"test": dt.datetime.now()}], [bigquery.SchemaField("test", "TIMESTAMP")]),
+        ([{"test": dt.datetime.now(tz=dt.timezone.utc)}], [bigquery.SchemaField("test", "TIMESTAMP")]),
+        (
+            [
+                {
+                    "test_int": 1,
+                    "test_str": "a string",
+                    "test_bytes": b"a bytes",
+                    "test_float": 6.0,
+                    "test_bool": False,
+                    "test_timestamp": dt.datetime.now(),
+                    "test_timestamptz": dt.datetime.now(tz=dt.timezone.utc),
+                }
+            ],
+            [
+                bigquery.SchemaField("test_int", "INT64"),
+                bigquery.SchemaField("test_str", "STRING"),
+                bigquery.SchemaField("test_bytes", "BYTES"),
+                bigquery.SchemaField("test_float", "FLOAT64"),
+                bigquery.SchemaField("test_bool", "BOOL"),
+                bigquery.SchemaField("test_timestamp", "TIMESTAMP"),
+                bigquery.SchemaField("test_timestamptz", "TIMESTAMP"),
+            ],
+        ),
+    ],
+)
+def test_get_bigquery_fields_from_record_schema(pyrecords, expected_schema):
+    """Test BigQuery schema fields generated from record match expected."""
+    record_batch = pa.RecordBatch.from_pylist(pyrecords)
+    schema = get_bigquery_fields_from_record_schema(record_batch.schema, known_json_columns=[])
+
+    assert schema == expected_schema
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 3bef8fa426b1b..08dd999427029 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
@@ -1,5 +1,6 @@
 import datetime as dt
 import json
+import operator
 import os
 import warnings
 from random import randint
@@ -15,15 +16,19 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
+from posthog.batch_exports.service import BatchExportSchema
 from posthog.temporal.batch_exports.batch_exports import (
     create_export_run,
+    iter_records,
     update_export_run_status,
 )
+from posthog.temporal.batch_exports.clickhouse import ClickHouseClient
 from posthog.temporal.batch_exports.redshift_batch_export import (
     RedshiftBatchExportInputs,
     RedshiftBatchExportWorkflow,
     RedshiftInsertInputs,
     insert_into_redshift_activity,
+    redshift_default_fields,
     remove_escaped_whitespace_recursive,
 )
 from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
@@ -45,55 +50,98 @@
 pytestmark = [pytest.mark.django_db, pytest.mark.asyncio]
 
 
-async 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 = []
+async def assert_clickhouse_records_in_redshfit(
+    redshift_connection,
+    clickhouse_client: ClickHouseClient,
+    schema_name: str,
+    table_name: str,
+    team_id: int,
+    batch_export_schema: BatchExportSchema | None,
+    data_interval_start: dt.datetime,
+    data_interval_end: dt.datetime,
+    exclude_events: list[str] | None = None,
+    include_events: list[str] | None = None,
+    use_super_type: bool = False,
+):
+    """Assert expected records are written to a given Redshift table.
+
+    The steps this function takes to assert records are written are:
+    1. Read all records inserted into given PostgreSQL table.
+    2. Cast records read from PostgreSQL to a Python list of dicts.
+    3. Assert records read from PostgreSQL have the expected column names.
+    4. Read all records that were supposed to be inserted from ClickHouse.
+    5. Cast records returned by ClickHouse to a Python list of dicts.
+    6. Compare each record returned by ClickHouse to each record read from PostgreSQL.
+
+    Caveats:
+    * Casting records to a Python list of dicts means losing some type precision.
+    * Reading records from ClickHouse could be hiding bugs in the `iter_records` function and related.
+        * `iter_records` has its own set of related unit tests to control for this.
+
+    Arguments:
+        postgres_connection: A PostgreSQL connection used to read inserted events.
+        clickhouse_client: A ClickHouseClient used to read events that are expected to be inserted.
+        schema_name: PostgreSQL schema name.
+        table_name: PostgreSQL table name.
+        team_id: The ID of the team that we are testing events for.
+        batch_export_schema: Custom schema used in the batch export.
+    """
+    inserted_records = []
 
-    async with connection.cursor() as cursor:
-        await cursor.execute(
-            sql.SQL("SELECT * FROM {} ORDER BY event, timestamp").format(sql.Identifier(schema, table_name))
-        )
+    async with redshift_connection.cursor() as cursor:
+        await cursor.execute(sql.SQL("SELECT * FROM {}").format(sql.Identifier(schema_name, table_name)))
         columns = [column.name for column in cursor.description]
 
         for row in await cursor.fetchall():
             event = dict(zip(columns, row))
-            event["timestamp"] = dt.datetime.fromisoformat(event["timestamp"].isoformat())
-            inserted_events.append(event)
-
-    expected_events = []
-    for event in events:
-        event_name = event.get("event")
-
-        if exclude_events is not None and event_name in exclude_events:
-            continue
-
-        raw_properties = event.get("properties", None)
-        properties = remove_escaped_whitespace_recursive(raw_properties) if raw_properties else None
-        expected_event = {
-            "distinct_id": event.get("distinct_id"),
-            "elements": "",
-            "event": event_name,
-            "ip": properties.get("$ip", None) if properties else None,
-            "properties": json.dumps(properties, ensure_ascii=False) if properties else None,
-            "set": properties.get("$set", None) if properties else None,
-            "set_once": properties.get("$set_once", None) if properties else None,
-            # Kept for backwards compatibility, but not exported anymore.
-            "site_url": "",
-            # For compatibility with CH which doesn't parse timezone component, so we add it here assuming UTC.
-            "timestamp": dt.datetime.fromisoformat(event.get("timestamp") + "+00:00"),
-            "team_id": event.get("team_id"),
-            "uuid": event.get("uuid"),
-        }
-        expected_events.append(expected_event)
-
-    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]
-    assert inserted_events == expected_events
+            inserted_records.append(event)
+
+    if batch_export_schema is not None:
+        schema_column_names = [field["alias"] for field in batch_export_schema["fields"]]
+    else:
+        schema_column_names = [field["alias"] for field in redshift_default_fields()]
+
+    super_columns = ["properties", "set", "set_once", "person_properties"]
+
+    expected_records = []
+    for records in iter_records(
+        client=clickhouse_client,
+        team_id=team_id,
+        interval_start=data_interval_start.isoformat(),
+        interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
+        include_events=include_events,
+        fields=batch_export_schema["fields"] if batch_export_schema is not None else redshift_default_fields(),
+        extra_query_parameters=batch_export_schema["values"] if batch_export_schema is not None else None,
+    ):
+        for record in records.select(schema_column_names).to_pylist():
+            expected_record = {}
+
+            for k, v in record.items():
+                if k not in schema_column_names or k == "_inserted_at":
+                    # _inserted_at is not exported, only used for tracking progress.
+                    continue
+
+                if k in super_columns and v is not None:
+                    expected_record[k] = json.dumps(
+                        remove_escaped_whitespace_recursive(json.loads(v)), ensure_ascii=False
+                    )
+                elif isinstance(v, dt.datetime):
+                    expected_record[k] = v.replace(tzinfo=dt.timezone.utc)  # type: ignore
+                else:
+                    expected_record[k] = v
+
+            expected_records.append(expected_record)
+
+    inserted_column_names = [column_name for column_name in inserted_records[0].keys()].sort()
+    expected_column_names = [column_name for column_name in expected_records[0].keys()].sort()
+
+    inserted_records.sort(key=operator.itemgetter("event"))
+    expected_records.sort(key=operator.itemgetter("event"))
+
+    assert inserted_column_names == expected_column_names
+    assert inserted_records[0] == expected_records[0]
+    assert inserted_records == expected_records
 
 
 @pytest.fixture
@@ -152,9 +200,31 @@ async def psycopg_connection(redshift_config, setup_postgres_test_db):
     await connection.close()
 
 
+TEST_SCHEMAS = [
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_0)s), '')", "alias": "browser"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_1)s), '')", "alias": "os"},
+        ],
+        "values": {"hogql_val_0": "$browser", "hogql_val_1": "$os"},
+    },
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "inserted_at", "alias": "inserted_at"},
+            {"expression": "toInt8(1 + 1)", "alias": "two"},
+        ],
+        "values": {},
+    },
+    None,
+]
+
+
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SCHEMAS)
 async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
-    clickhouse_client, activity_environment, psycopg_connection, redshift_config, exclude_events
+    clickhouse_client, activity_environment, psycopg_connection, redshift_config, exclude_events, batch_export_schema
 ):
     """Test that the insert_into_redshift_activity function inserts data into a Redshift table.
 
@@ -176,7 +246,7 @@ async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    (events, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -196,7 +266,7 @@ async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
         person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -206,6 +276,7 @@ async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
         count_other_team=0,
         properties=None,
         person_properties=None,
+        event_name="test-no-prop-{i}",
     )
 
     if exclude_events:
@@ -227,16 +298,21 @@ async def test_insert_into_redshift_activity_inserts_data_into_redshift_table(
         data_interval_start=data_interval_start.isoformat(),
         data_interval_end=data_interval_end.isoformat(),
         exclude_events=exclude_events,
+        batch_export_schema=batch_export_schema,
         **redshift_config,
     )
 
     await activity_environment.run(insert_into_redshift_activity, insert_inputs)
 
-    await assert_events_in_redshift(
-        connection=psycopg_connection,
-        schema=redshift_config["schema"],
+    await assert_clickhouse_records_in_redshfit(
+        redshift_connection=psycopg_connection,
+        clickhouse_client=clickhouse_client,
+        schema_name=redshift_config["schema"],
         table_name="test_table",
-        events=events + events_with_no_properties,
+        team_id=team_id,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
     )
 
@@ -272,6 +348,7 @@ async def redshift_batch_export(ateam, table_name, redshift_config, interval, ex
 
 @pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SCHEMAS)
 async def test_redshift_export_workflow(
     clickhouse_client,
     redshift_config,
@@ -281,6 +358,7 @@ async def test_redshift_export_workflow(
     ateam,
     exclude_events,
     table_name,
+    batch_export_schema,
 ):
     """Test Redshift Export Workflow end-to-end.
 
@@ -290,7 +368,7 @@ async def test_redshift_export_workflow(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -322,6 +400,7 @@ async def test_redshift_export_workflow(
         batch_export_id=str(redshift_batch_export.id),
         data_interval_end="2023-04-25 14:30:00.000000",
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **redshift_batch_export.destination.config,
     )
 
@@ -353,11 +432,15 @@ async def test_redshift_export_workflow(
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_redshift(
-        psycopg_connection,
-        redshift_config["schema"],
-        table_name,
-        events=events,
+    await assert_clickhouse_records_in_redshfit(
+        redshift_connection=psycopg_connection,
+        clickhouse_client=clickhouse_client,
+        schema_name=redshift_config["schema"],
+        table_name=table_name,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         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 ab8871b3545e7..e8392b5e4fb5b 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
@@ -22,10 +22,13 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
+from posthog.batch_exports.service import BatchExportSchema
 from posthog.temporal.batch_exports.batch_exports import (
     create_export_run,
+    iter_records,
     update_export_run_status,
 )
+from posthog.temporal.batch_exports.clickhouse import ClickHouseClient
 from posthog.temporal.batch_exports.s3_batch_export import (
     HeartbeatDetails,
     S3BatchExportInputs,
@@ -33,10 +36,9 @@
     S3InsertInputs,
     get_s3_key,
     insert_into_s3_activity,
+    s3_default_fields,
 )
-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 (
@@ -138,15 +140,34 @@ async def minio_client(bucket_name):
         await minio_client.delete_bucket(Bucket=bucket_name)
 
 
-async def assert_events_in_s3(
+async def assert_clickhouse_records_in_s3(
     s3_compatible_client,
+    clickhouse_client: ClickHouseClient,
     bucket_name: str,
     key_prefix: str,
-    events: list[EventValues],
-    compression: str | None = None,
+    team_id: int,
+    data_interval_start: dt.datetime,
+    data_interval_end: dt.datetime,
     exclude_events: list[str] | None = None,
+    include_events: list[str] | None = None,
+    batch_export_schema: BatchExportSchema | None = None,
+    compression: str | None = None,
 ):
-    """Assert provided events written to JSON in key_prefix in S3 bucket_name."""
+    """Assert ClickHouse records are written to JSON in key_prefix in S3 bucket_name.
+
+    Arguments:
+        s3_compatible_client: An S3 client used to read records; can be MinIO if doing local testing.
+        clickhouse_client: A ClickHouseClient used to read records that are expected to be exported.
+        team_id: The ID of the team that we are testing for.
+        bucket_name: S3 bucket name where records are exported to.
+        key_prefix: S3 key prefix where records are exported to.
+        data_interval_start: Start of the batch period for exported records.
+        data_interval_end: End of the batch period for exported records.
+        exclude_events: Event names to be excluded from the export.
+        include_events: Event names to be included in the export.
+        batch_export_schema: Custom schema used in the batch export.
+        compression: Optional compression used in upload.
+    """
     # List the objects in the bucket with the prefix.
     objects = await s3_compatible_client.list_objects_v2(Bucket=bucket_name, Prefix=key_prefix)
 
@@ -171,50 +192,79 @@ 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["event"], x["created_at"]))
-
-    # Remove team_id, _timestamp from events
-    if exclude_events is None:
-        exclude_events = []
-
-    def to_expected_event(event):
-        mapping_functions = {
-            "timestamp": to_isoformat,
-            "inserted_at": to_isoformat,
-            "created_at": to_isoformat,
-        }
-        # 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"}
-        expected_event = {
-            k: mapping_functions.get(k, lambda x: x)(v) for k, v in event.items() if k not in not_exported
-        }
-
-        if expected_event["inserted_at"] is None:
-            expected_event["inserted_at"] = (
-                dt.datetime.fromisoformat(event["_timestamp"]).replace(tzinfo=dt.timezone.utc).isoformat()
-            )
-        return expected_event
-
-    expected_events = list(
-        map(
-            to_expected_event,
-            (event for event in events if event["event"] not in exclude_events),
-        )
-    )
+    if batch_export_schema is not None:
+        schema_column_names = [field["alias"] for field in batch_export_schema["fields"]]
+    else:
+        schema_column_names = [field["alias"] for field in s3_default_fields()]
 
-    expected_events.sort(key=lambda x: (x["event"], x["created_at"]))
+    json_columns = ("properties", "person_properties", "set", "set_once")
 
-    # First check one event, the first one, so that we can get a nice diff if
-    # the included data is different.
-    assert json_data[0] == expected_events[0]
-    assert json_data == expected_events
+    expected_records = []
+    for record_batch in iter_records(
+        client=clickhouse_client,
+        team_id=team_id,
+        interval_start=data_interval_start.isoformat(),
+        interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
+        include_events=include_events,
+        fields=batch_export_schema["fields"] if batch_export_schema is not None else s3_default_fields(),
+        extra_query_parameters=batch_export_schema["values"] if batch_export_schema is not None else None,
+    ):
+        for record in record_batch.to_pylist():
+            expected_record = {}
+            for k, v in record.items():
+                if k not in schema_column_names or k == "_inserted_at":
+                    # _inserted_at is not exported, only used for tracking progress.
+                    continue
+
+                if k in json_columns and v is not None:
+                    expected_record[k] = json.loads(v)
+                elif isinstance(v, dt.datetime):
+                    # Some type precision is lost when json dumping to S3, so we have to cast this to str to match.
+                    expected_record[k] = v.isoformat()
+                else:
+                    expected_record[k] = v
+
+            expected_records.append(expected_record)
+
+    assert len(json_data) == len(expected_records)
+    assert json_data[0] == expected_records[0]
+    assert json_data == expected_records
+
+
+TEST_S3_SCHEMAS: list[BatchExportSchema | None] = [
+    {
+        "fields": [
+            {"expression": "event", "alias": "my_event_name"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_0)s), '')", "alias": "browser"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_1)s), '')", "alias": "os"},
+            {"expression": "nullIf(properties, '')", "alias": "all_properties"},
+        ],
+        "values": {"hogql_val_0": "$browser", "hogql_val_1": "$os"},
+    },
+    {
+        "fields": [
+            {"expression": "event", "alias": "my_event_name"},
+            {"expression": "inserted_at", "alias": "inserted_at"},
+            {"expression": "1 + 1", "alias": "two"},
+        ],
+        "values": {},
+    },
+    None,
+]
 
 
 @pytest.mark.parametrize("compression", [None, "gzip", "brotli"], indirect=True)
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_S3_SCHEMAS)
 async def test_insert_into_s3_activity_puts_data_into_s3(
-    clickhouse_client, bucket_name, minio_client, activity_environment, compression, exclude_events
+    clickhouse_client,
+    bucket_name,
+    minio_client,
+    activity_environment,
+    compression,
+    exclude_events,
+    batch_export_schema: BatchExportSchema | None,
 ):
     """Test that the insert_into_s3_activity function ends up with data into S3.
 
@@ -226,7 +276,7 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
     * 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
+    Once we have these events, we pass them to the assert_clickhouse_records_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)
@@ -236,7 +286,7 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
     # but it's very small.
     team_id = randint(1, 1000000)
 
-    (events, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -249,7 +299,7 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
         person_properties={"utm_medium": "referral", "$initial_os": "Linux"},
     )
 
-    (events_with_no_properties, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -289,6 +339,7 @@ async def test_insert_into_s3_activity_puts_data_into_s3(
         aws_secret_access_key="object_storage_root_password",
         compression=compression,
         exclude_events=exclude_events,
+        batch_export_schema=batch_export_schema,
     )
 
     with override_settings(
@@ -300,13 +351,18 @@ 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(
-        minio_client,
-        bucket_name,
-        prefix,
-        events=events + events_with_no_properties,
-        compression=compression,
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=prefix,
+        team_id=team_id,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
+        include_events=None,
+        compression=compression,
     )
 
 
@@ -350,6 +406,7 @@ async def s3_batch_export(
 @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)
+@pytest.mark.parametrize("batch_export_schema", TEST_S3_SCHEMAS)
 async def test_s3_export_workflow_with_minio_bucket(
     clickhouse_client,
     minio_client,
@@ -360,6 +417,7 @@ async def test_s3_export_workflow_with_minio_bucket(
     compression,
     exclude_events,
     s3_key_prefix,
+    batch_export_schema,
 ):
     """Test S3BatchExport Workflow end-to-end by using a local MinIO bucket instead of S3.
 
@@ -373,7 +431,7 @@ async def test_s3_export_workflow_with_minio_bucket(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -405,6 +463,7 @@ async def test_s3_export_workflow_with_minio_bucket(
         batch_export_id=str(s3_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **s3_batch_export.destination.config,
     )
 
@@ -440,13 +499,17 @@ async def test_s3_export_workflow_with_minio_bucket(
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(
-        minio_client,
-        bucket_name,
-        s3_key_prefix,
-        events=events,
-        compression=compression,
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
+        compression=compression,
     )
 
 
@@ -475,6 +538,7 @@ async def s3_client(bucket_name, s3_key_prefix):
 @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)
+@pytest.mark.parametrize("batch_export_schema", TEST_S3_SCHEMAS)
 async def test_s3_export_workflow_with_s3_bucket(
     s3_client,
     clickhouse_client,
@@ -486,6 +550,7 @@ async def test_s3_export_workflow_with_s3_bucket(
     encryption,
     exclude_events,
     ateam,
+    batch_export_schema,
 ):
     """Test S3 Export Workflow end-to-end by using an S3 bucket.
 
@@ -503,7 +568,7 @@ async def test_s3_export_workflow_with_s3_bucket(
     data_interval_end = dt.datetime.fromisoformat("2023-04-25T14:30:00.000000")
     data_interval_start = data_interval_end - s3_batch_export.interval_time_delta
 
-    (events, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -535,6 +600,7 @@ async def test_s3_export_workflow_with_s3_bucket(
         batch_export_id=str(s3_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **s3_batch_export.destination.config,
     )
 
@@ -574,13 +640,18 @@ async def create_minio_client(*args, **kwargs):
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(
-        s3_client,
-        bucket_name,
-        s3_key_prefix,
-        events=events,
-        compression=compression,
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
+        include_events=None,
+        compression=compression,
     )
 
 
@@ -603,12 +674,12 @@ async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(
     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(
+    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=100000,
         count_outside_range=1000,
         count_other_team=1000,
         duplicate=True,
@@ -656,13 +727,16 @@ async def test_s3_export_workflow_with_minio_bucket_and_a_lot_of_data(
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(
-        minio_client,
-        bucket_name,
-        s3_key_prefix,
-        events=events,
-        compression=compression,
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
         exclude_events=exclude_events,
+        compression=compression,
     )
 
 
@@ -678,7 +752,7 @@ async def test_s3_export_workflow_defaults_to_timestamp_on_null_inserted_at(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -732,12 +806,15 @@ async def test_s3_export_workflow_defaults_to_timestamp_on_null_inserted_at(
     run = runs[0]
     assert run.status == "Completed"
 
-    await assert_events_in_s3(
-        minio_client,
-        bucket_name,
-        s3_key_prefix,
-        events,
-        compression,
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        compression=compression,
     )
 
 
@@ -764,7 +841,7 @@ async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -832,7 +909,16 @@ async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix(
     assert len(objects.get("Contents", [])) == 1
     assert key.startswith(expected_key_prefix)
 
-    await assert_events_in_s3(minio_client, bucket_name, expected_key_prefix, events, compression)
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        compression=compression,
+    )
 
 
 async def test_s3_export_workflow_handles_insert_activity_errors(ateam, s3_batch_export, interval):
@@ -956,7 +1042,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="/",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -965,7 +1051,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -975,7 +1061,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="gzip",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.gz",
         ),
@@ -985,7 +1071,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="brotli",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.br",
         ),
@@ -994,7 +1080,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="my-fancy-prefix",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1003,7 +1089,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="/my-fancy-prefix",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1013,7 +1099,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="gzip",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.gz",
         ),
@@ -1023,7 +1109,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="brotli",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.br",
         ),
@@ -1032,7 +1118,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="my-fancy-prefix-with-a-forwardslash/",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix-with-a-forwardslash/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1041,7 +1127,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="/my-fancy-prefix-with-a-forwardslash/",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "my-fancy-prefix-with-a-forwardslash/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1050,7 +1136,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="nested/prefix/",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "nested/prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1059,7 +1145,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 prefix="/nested/prefix/",
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "nested/prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl",
         ),
@@ -1069,7 +1155,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="gzip",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "nested/prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.gz",
         ),
@@ -1079,7 +1165,7 @@ async def never_finish_activity(_: S3InsertInputs) -> str:
                 data_interval_start="2023-01-01 00:00:00",
                 data_interval_end="2023-01-01 01:00:00",
                 compression="brotli",
-                **base_inputs,
+                **base_inputs,  # type: ignore
             ),
             "nested/prefix/2023-01-01 00:00:00-2023-01-01 01:00:00.jsonl.br",
         ),
@@ -1101,13 +1187,12 @@ async def test_insert_into_s3_activity_heartbeats(
     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(
+        await generate_test_events_in_clickhouse(
             client=clickhouse_client,
             team_id=ateam.pk,
             start_time=data_interval_start,
@@ -1120,7 +1205,6 @@ async def test_insert_into_s3_activity_heartbeats(
             properties={"$chonky": ("a" * 5 * 1024**2)},
             inserted_at=part_inserted_at,
         )
-        events_in_parts += events
 
     current_part_number = 1
 
@@ -1159,4 +1243,13 @@ def assert_heartbeat_details(*details):
     # 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)
+
+    await assert_clickhouse_records_in_s3(
+        s3_compatible_client=minio_client,
+        clickhouse_client=clickhouse_client,
+        bucket_name=bucket_name,
+        key_prefix=s3_key_prefix,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+    )
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 deb440fc3da12..3ddec5bbd969e 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
@@ -2,6 +2,7 @@
 import datetime as dt
 import gzip
 import json
+import operator
 import os
 import random
 import re
@@ -23,15 +24,19 @@
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import UnsandboxedWorkflowRunner, Worker
 
+from posthog.batch_exports.service import BatchExportSchema
 from posthog.temporal.batch_exports.batch_exports import (
     create_export_run,
+    iter_records,
     update_export_run_status,
 )
+from posthog.temporal.batch_exports.clickhouse import ClickHouseClient
 from posthog.temporal.batch_exports.snowflake_batch_export import (
     SnowflakeBatchExportInputs,
     SnowflakeBatchExportWorkflow,
     SnowflakeInsertInputs,
     insert_into_snowflake_activity,
+    snowflake_default_fields,
 )
 from posthog.temporal.tests.utils.events import generate_test_events_in_clickhouse
 from posthog.temporal.tests.utils.models import (
@@ -743,21 +748,41 @@ async def never_finish_activity(_: SnowflakeInsertInputs) -> str:
     assert run.latest_error == "Cancelled"
 
 
-def assert_events_in_snowflake(
-    cursor: snowflake.connector.cursor.SnowflakeCursor, table_name: str, events: list, exclude_events: list[str]
+def assert_clickhouse_records_in_snowflake(
+    snowflake_cursor: snowflake.connector.cursor.SnowflakeCursor,
+    clickhouse_client: ClickHouseClient,
+    table_name: str,
+    team_id: int,
+    data_interval_start: dt.datetime,
+    data_interval_end: dt.datetime,
+    exclude_events: list[str] | None = None,
+    include_events: list[str] | None = None,
+    batch_export_schema: BatchExportSchema | None = None,
 ):
-    """Assert provided events are present in Snowflake table."""
-    cursor.execute(f'SELECT * FROM "{table_name}"')
+    """Assert ClickHouse records are written to Snowflake table.
+
+    Arguments:
+        snowflake_cursor: A SnowflakeCursor used to read records.
+        clickhouse_client: A ClickHouseClient used to read records that are expected to be exported.
+        team_id: The ID of the team that we are testing for.
+        table_name: Snowflake table name where records are exported to.
+        data_interval_start: Start of the batch period for exported records.
+        data_interval_end: End of the batch period for exported records.
+        exclude_events: Event names to be excluded from the export.
+        include_events: Event names to be included in the export.
+        batch_export_schema: Custom schema used in the batch export.
+    """
+    snowflake_cursor.execute(f'SELECT * FROM "{table_name}"')
 
-    rows = cursor.fetchall()
+    rows = snowflake_cursor.fetchall()
 
-    columns = {index: metadata.name for index, metadata in enumerate(cursor.description)}
-    json_columns = ("properties", "elements", "people_set", "people_set_once")
+    columns = {index: metadata.name for index, metadata in enumerate(snowflake_cursor.description)}
+    json_columns = ("properties", "person_properties", "people_set", "people_set_once")
 
     # Rows are tuples, so we construct a dictionary using the metadata from cursor.description.
     # We rely on the order of the columns in each row matching the order set in cursor.description.
     # This seems to be the case, at least for now.
-    inserted_events = [
+    inserted_records = [
         {
             columns[index]: json.loads(row[index])
             if columns[index] in json_columns and row[index] is not None
@@ -766,36 +791,54 @@ def assert_events_in_snowflake(
         }
         for row in rows
     ]
-    inserted_events.sort(key=lambda x: (x["event"], x["timestamp"]))
-
-    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),
-            "event": event_name,
-            "ip": properties.get("$ip", None) if properties else None,
-            "properties": event.get("properties"),
-            "people_set": properties.get("$set", None) if properties else None,
-            "people_set_once": properties.get("$set_once", None) if properties else None,
-            "site_url": "",
-            "timestamp": dt.datetime.fromisoformat(event.get("timestamp")),
-            "team_id": event.get("team_id"),
-            "uuid": event.get("uuid"),
-        }
-        expected_events.append(expected_event)
 
-    expected_events.sort(key=lambda x: (x["event"], x["timestamp"]))
+    if batch_export_schema is not None:
+        schema_column_names = [field["alias"] for field in batch_export_schema["fields"]]
+    else:
+        schema_column_names = [field["alias"] for field in snowflake_default_fields()]
 
-    assert inserted_events[0] == expected_events[0]
-    assert inserted_events == expected_events
+    expected_records = []
+    for record_batch in iter_records(
+        client=clickhouse_client,
+        team_id=team_id,
+        interval_start=data_interval_start.isoformat(),
+        interval_end=data_interval_end.isoformat(),
+        exclude_events=exclude_events,
+        include_events=include_events,
+        fields=batch_export_schema["fields"] if batch_export_schema is not None else snowflake_default_fields(),
+        extra_query_parameters=batch_export_schema["values"] if batch_export_schema is not None else None,
+    ):
+        for record in record_batch.to_pylist():
+            expected_record = {}
+            for k, v in record.items():
+                if k not in schema_column_names or k == "_inserted_at":
+                    # _inserted_at is not exported, only used for tracking progress.
+                    continue
+
+                if k in json_columns and v is not None:
+                    expected_record[k] = json.loads(v)
+                elif isinstance(v, dt.datetime):
+                    # By default, Snowflake's `TIMESTAMP` doesn't include a timezone component.
+                    expected_record[k] = v.replace(tzinfo=None)
+                elif k == "elements":
+                    # Happens transparently when uploading elements as a variant field.
+                    expected_record[k] = json.dumps(v)
+                else:
+                    expected_record[k] = v
+
+            expected_records.append(expected_record)
+
+    inserted_column_names = [column_name for column_name in inserted_records[0].keys()].sort()
+    expected_column_names = [column_name for column_name in expected_records[0].keys()].sort()
+
+    # Ordering is not guaranteed, so we sort before comparing.
+    inserted_records.sort(key=operator.itemgetter("event"))
+    expected_records.sort(key=operator.itemgetter("event"))
+
+    assert inserted_column_names == expected_column_names
+    assert len(inserted_records) == len(expected_records)
+    assert inserted_records[0] == expected_records[0]
+    assert inserted_records == expected_records
 
 
 REQUIRED_ENV_VARS = (
@@ -830,10 +873,38 @@ def snowflake_cursor(snowflake_config):
         cursor.execute(f"DROP DATABASE IF EXISTS \"{snowflake_config['database']}\" CASCADE")
 
 
+TEST_SNOWFLAKE_SCHEMAS: list[BatchExportSchema | None] = [
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_0)s), '')", "alias": "browser"},
+            {"expression": "nullIf(JSONExtractString(properties, %(hogql_val_1)s), '')", "alias": "os"},
+            {"expression": "nullIf(properties, '')", "alias": "all_properties"},
+        ],
+        "values": {"hogql_val_0": "$browser", "hogql_val_1": "$os"},
+    },
+    {
+        "fields": [
+            {"expression": "event", "alias": "event"},
+            {"expression": "inserted_at", "alias": "inserted_at"},
+            {"expression": "toInt32(1 + 1)", "alias": "two"},
+        ],
+        "values": {},
+    },
+    None,
+]
+
+
 @SKIP_IF_MISSING_REQUIRED_ENV_VARS
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SNOWFLAKE_SCHEMAS)
 async def test_insert_into_snowflake_activity_inserts_data_into_snowflake_table(
-    clickhouse_client, activity_environment, snowflake_cursor, snowflake_config, exclude_events
+    clickhouse_client,
+    activity_environment,
+    snowflake_cursor,
+    snowflake_config,
+    exclude_events,
+    batch_export_schema,
 ):
     """Test that the insert_into_snowflake_activity function inserts data into a PostgreSQL table.
 
@@ -853,7 +924,7 @@ async def test_insert_into_snowflake_activity_inserts_data_into_snowflake_table(
     data_interval_end = dt.datetime(2023, 4, 25, 15, 0, 0, tzinfo=dt.timezone.utc)
 
     team_id = random.randint(1, 1000000)
-    (events, _, _) = await generate_test_events_in_clickhouse(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=team_id,
         start_time=data_interval_start,
@@ -886,22 +957,28 @@ async def test_insert_into_snowflake_activity_inserts_data_into_snowflake_table(
         data_interval_start=data_interval_start.isoformat(),
         data_interval_end=data_interval_end.isoformat(),
         exclude_events=exclude_events,
+        batch_export_schema=batch_export_schema,
         **snowflake_config,
     )
 
     await activity_environment.run(insert_into_snowflake_activity, insert_inputs)
 
-    assert_events_in_snowflake(
-        cursor=snowflake_cursor,
+    assert_clickhouse_records_in_snowflake(
+        snowflake_cursor=snowflake_cursor,
+        clickhouse_client=clickhouse_client,
         table_name=table_name,
-        events=events,
+        team_id=team_id,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
         exclude_events=exclude_events,
+        batch_export_schema=batch_export_schema,
     )
 
 
 @SKIP_IF_MISSING_REQUIRED_ENV_VARS
 @pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SNOWFLAKE_SCHEMAS)
 async def test_snowflake_export_workflow(
     clickhouse_client,
     snowflake_cursor,
@@ -909,6 +986,7 @@ async def test_snowflake_export_workflow(
     snowflake_batch_export,
     ateam,
     exclude_events,
+    batch_export_schema,
 ):
     """Test Redshift Export Workflow end-to-end.
 
@@ -918,7 +996,7 @@ async def test_snowflake_export_workflow(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -950,6 +1028,7 @@ async def test_snowflake_export_workflow(
         batch_export_id=str(snowflake_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **snowflake_batch_export.destination.config,
     )
 
@@ -980,10 +1059,14 @@ async def test_snowflake_export_workflow(
     run = runs[0]
     assert run.status == "Completed"
 
-    assert_events_in_snowflake(
-        cursor=snowflake_cursor,
+    assert_clickhouse_records_in_snowflake(
+        snowflake_cursor=snowflake_cursor,
+        clickhouse_client=clickhouse_client,
+        team_id=ateam.pk,
         table_name=snowflake_batch_export.destination.config["table_name"],
-        events=events,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
     )
 
@@ -991,6 +1074,7 @@ async def test_snowflake_export_workflow(
 @SKIP_IF_MISSING_REQUIRED_ENV_VARS
 @pytest.mark.parametrize("interval", ["hour", "day"], indirect=True)
 @pytest.mark.parametrize("exclude_events", [None, ["test-exclude"]], indirect=True)
+@pytest.mark.parametrize("batch_export_schema", TEST_SNOWFLAKE_SCHEMAS)
 async def test_snowflake_export_workflow_with_many_files(
     clickhouse_client,
     snowflake_cursor,
@@ -998,6 +1082,7 @@ async def test_snowflake_export_workflow_with_many_files(
     snowflake_batch_export,
     ateam,
     exclude_events,
+    batch_export_schema,
 ):
     """Test Snowflake Export Workflow end-to-end with multiple file uploads.
 
@@ -1009,7 +1094,7 @@ async def test_snowflake_export_workflow_with_many_files(
     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(
+    await generate_test_events_in_clickhouse(
         client=clickhouse_client,
         team_id=ateam.pk,
         start_time=data_interval_start,
@@ -1028,6 +1113,7 @@ async def test_snowflake_export_workflow_with_many_files(
         batch_export_id=str(snowflake_batch_export.id),
         data_interval_end=data_interval_end.isoformat(),
         interval=interval,
+        batch_export_schema=batch_export_schema,
         **snowflake_batch_export.destination.config,
     )
 
@@ -1059,10 +1145,14 @@ async def test_snowflake_export_workflow_with_many_files(
     run = runs[0]
     assert run.status == "Completed"
 
-    assert_events_in_snowflake(
-        cursor=snowflake_cursor,
+    assert_clickhouse_records_in_snowflake(
+        snowflake_cursor=snowflake_cursor,
+        clickhouse_client=clickhouse_client,
+        team_id=ateam.pk,
         table_name=snowflake_batch_export.destination.config["table_name"],
-        events=events,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+        batch_export_schema=batch_export_schema,
         exclude_events=exclude_events,
     )
 
@@ -1150,13 +1240,12 @@ async def test_insert_into_snowflake_activity_heartbeats(
     data_interval_end = dt.datetime.fromisoformat("2023-04-20T14:30:00.000000+00:00")
     data_interval_start = data_interval_end - snowflake_batch_export.interval_time_delta
 
-    events_in_files = []
     n_expected_files = 3
 
-    for i in range(1, n_expected_files + 1):
-        part_inserted_at = data_interval_end - snowflake_batch_export.interval_time_delta / i
+    for n_expected_file in range(1, n_expected_files + 1):
+        part_inserted_at = data_interval_end - snowflake_batch_export.interval_time_delta / n_expected_file
 
-        (events, _, _) = await generate_test_events_in_clickhouse(
+        await generate_test_events_in_clickhouse(
             client=clickhouse_client,
             team_id=ateam.pk,
             start_time=data_interval_start,
@@ -1166,8 +1255,8 @@ async def test_insert_into_snowflake_activity_heartbeats(
             count_other_team=0,
             duplicate=False,
             inserted_at=part_inserted_at,
+            event_name=f"test-event-{n_expected_file}-{{i}}",
         )
-        events_in_files += events
 
     captured_details = []
 
@@ -1199,4 +1288,11 @@ def capture_heartbeat_details(*details):
         ) == data_interval_end - snowflake_batch_export.interval_time_delta / (index + 1)
         assert details_captured[1] == index + 1
 
-    assert_events_in_snowflake(snowflake_cursor, table_name, events_in_files, exclude_events=[])
+    assert_clickhouse_records_in_snowflake(
+        snowflake_cursor=snowflake_cursor,
+        clickhouse_client=clickhouse_client,
+        table_name=table_name,
+        team_id=ateam.pk,
+        data_interval_start=data_interval_start,
+        data_interval_end=data_interval_end,
+    )
diff --git a/posthog/test/base.py b/posthog/test/base.py
index 76968dc2efceb..8aecfdd604873 100644
--- a/posthog/test/base.py
+++ b/posthog/test/base.py
@@ -3,10 +3,11 @@
 import re
 import resource
 import threading
+import time
 import uuid
 from contextlib import contextmanager
 from functools import wraps
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union, Generator
 from unittest.mock import patch
 
 import freezegun
@@ -20,7 +21,7 @@
 from django.core.cache import cache
 from django.db import connection, connections
 from django.db.migrations.executor import MigrationExecutor
-from django.test import TestCase, TransactionTestCase, override_settings
+from django.test import SimpleTestCase, TestCase, TransactionTestCase, override_settings
 from django.test.utils import CaptureQueriesContext
 from rest_framework.test import APITestCase as DRFTestCase
 
@@ -29,9 +30,7 @@
 from posthog.clickhouse.client.connection import ch_pool
 from posthog.clickhouse.plugin_log_entries import TRUNCATE_PLUGIN_LOG_ENTRIES_TABLE_SQL
 from posthog.cloud_utils import (
-    TEST_clear_cloud_cache,
     TEST_clear_instance_license_cache,
-    is_cloud,
 )
 from posthog.models import Dashboard, DashboardTile, Insight, Organization, Team, User
 from posthog.models.channel_type.sql import (
@@ -185,7 +184,7 @@ def validation_error_response(
         }
 
 
-class TestMixin:
+class PostHogTestCase(SimpleTestCase):
     CONFIG_ORGANIZATION_NAME: str = "Test"
     CONFIG_EMAIL: Optional[str] = "user1@posthog.com"
     CONFIG_PASSWORD: Optional[str] = "testpassword12345"
@@ -233,17 +232,36 @@ def tearDown(self):
             )
         global persons_ordering_int
         persons_ordering_int = 0
-        super().tearDown()  # type: ignore
+        super().tearDown()
 
     def validate_basic_html(self, html_message, site_url, preheader=None):
         # absolute URLs are used
-        self.assertIn(f"{site_url}/static/posthog-logo.png", html_message)  # type: ignore
+        self.assertIn(f"{site_url}/static/posthog-logo.png", html_message)
 
         # CSS is inlined
-        self.assertIn('style="display: none;', html_message)  # type: ignore
+        self.assertIn('style="display: none;', html_message)
 
         if preheader:
-            self.assertIn(preheader, html_message)  # type: ignore
+            self.assertIn(preheader, html_message)
+
+    @contextmanager
+    def is_cloud(self, value: bool):
+        with self.settings(CLOUD_DEPLOYMENT="US" if value else None):
+            yield value
+
+    @contextmanager
+    def retry_assertion(self, max_retries=5, delay=0.1) -> Generator[None, None, None]:
+        for _ in range(max_retries):
+            try:
+                yield
+                break  # If the assertion passed, break the loop
+            except AssertionError:
+                time.sleep(delay)  # If the assertion failed, wait before retrying
+        else:
+            # If we've exhausted all retries and the test is still failing, fail the test
+            # we want to raise the test assertion not some generic error, so run the assertion
+            # one last time
+            yield
 
 
 class MemoryLeakTestMixin:
@@ -281,24 +299,17 @@ def _callTestMethod(self, method):
         )
 
 
-class BaseTest(TestMixin, ErrorResponsesMixin, TestCase):
+class BaseTest(PostHogTestCase, ErrorResponsesMixin, TestCase):
     """
     Base class for performing Postgres-based backend unit tests on.
     Each class and each test is wrapped inside an atomic block to rollback DB commits after each test.
     Read more: https://docs.djangoproject.com/en/3.1/topics/testing/tools/#testcase
     """
 
-    @contextmanager
-    def is_cloud(self, value: bool):
-        previous_value = is_cloud()
-        try:
-            TEST_clear_cloud_cache(value)
-            yield value
-        finally:
-            TEST_clear_cloud_cache(previous_value)
+    pass
 
 
-class NonAtomicBaseTest(TestMixin, ErrorResponsesMixin, TransactionTestCase):
+class NonAtomicBaseTest(PostHogTestCase, ErrorResponsesMixin, TransactionTestCase):
     """
     Django wraps tests in TestCase inside atomic transactions to speed up the run time. TransactionTestCase is the base
     class for TestCase that doesn't implement this atomic wrapper.
@@ -310,18 +321,15 @@ def setUpClass(cls):
         cls.setUpTestData()
 
 
-class APIBaseTest(TestMixin, ErrorResponsesMixin, DRFTestCase):
+class APIBaseTest(PostHogTestCase, ErrorResponsesMixin, DRFTestCase):
     """
     Functional API tests using Django REST Framework test suite.
     """
 
-    initial_cloud_mode: Optional[bool] = False
-
     def setUp(self):
         super().setUp()
 
         cache.clear()
-        TEST_clear_cloud_cache(self.initial_cloud_mode)
         TEST_clear_instance_license_cache()
 
         # Sets the cloud mode to stabilise things tests, especially num query counts
@@ -342,16 +350,6 @@ def assertFasterThan(self, duration_ms: float):
         with assert_faster_than(duration_ms):
             yield
 
-    @contextmanager
-    def is_cloud(self, value: bool):
-        # Typically the is_cloud setting is controlled by License but we need to be able to override it for tests
-        previous_value = is_cloud()
-        try:
-            TEST_clear_cloud_cache(value)
-            yield value
-        finally:
-            TEST_clear_cloud_cache(previous_value)
-
 
 def stripResponse(response, remove=("action", "label", "persons_urls", "filter")):
     if len(response):
diff --git a/posthog/test/test_cloud_utils.py b/posthog/test/test_cloud_utils.py
index a8c6eb5d3c9b9..efa080ff56fec 100644
--- a/posthog/test/test_cloud_utils.py
+++ b/posthog/test/test_cloud_utils.py
@@ -4,10 +4,8 @@
 
 from ee.models.license import License
 from posthog.cloud_utils import (
-    TEST_clear_cloud_cache,
     TEST_clear_instance_license_cache,
     get_cached_instance_license,
-    is_cloud,
 )
 from posthog.test.base import BaseTest
 
@@ -16,29 +14,6 @@ class TestCloudUtils(BaseTest):
     def setUp(self):
         assert License.objects.count() == 0
 
-    @pytest.mark.ee
-    def test_is_cloud_returns_correctly(self):
-        TEST_clear_cloud_cache()
-        assert is_cloud() is False
-
-    @pytest.mark.ee
-    def test_is_cloud_checks_license(self):
-        assert is_cloud() is False
-        License.objects.create(key="key", plan="cloud", valid_until=datetime.now() + timedelta(days=30))
-
-        TEST_clear_cloud_cache()
-        assert is_cloud()
-
-    @pytest.mark.ee
-    def test_is_cloud_caches_result(self):
-        TEST_clear_cloud_cache()
-        assert not is_cloud()
-        assert not is_cloud()
-
-        License.objects.create(key="key", plan="cloud", valid_until=datetime.now() + timedelta(days=30))
-
-        assert not is_cloud()
-
     @pytest.mark.ee
     def test_get_cached_instance_license_returns_correctly(self):
         TEST_clear_instance_license_cache()
diff --git a/posthog/test/test_middleware.py b/posthog/test/test_middleware.py
index c75f47a4cf69f..a4c31c281211f 100644
--- a/posthog/test/test_middleware.py
+++ b/posthog/test/test_middleware.py
@@ -311,8 +311,8 @@ def test_project_unchanged_when_accessing_missing_project_by_id(self):
         assert response_users_api.json().get("team", {}).get("id") == self.team.id
 
 
+@override_settings(CLOUD_DEPLOYMENT="US")  # As PostHog Cloud
 class TestPostHogTokenCookieMiddleware(APIBaseTest):
-    initial_cloud_mode = True
     CONFIG_AUTO_LOGIN = False
 
     def test_logged_out_client(self):
diff --git a/posthog/urls.py b/posthog/urls.py
index 17c2751a745c9..b047f897307e4 100644
--- a/posthog/urls.py
+++ b/posthog/urls.py
@@ -41,7 +41,6 @@
 )
 from posthog.api.decide import hostname_in_allowed_url_list
 from posthog.api.early_access_feature import early_access_features
-from posthog.api.prompt import prompt_webhook
 from posthog.api.survey import surveys
 from posthog.demo.legacy import demo_route
 from posthog.models import User
@@ -182,7 +181,6 @@ def opt_slash_path(route: str, view: Callable, name: Optional[str] = None) -> UR
     opt_slash_path("api/user/redirect_to_site", user.redirect_to_site),
     opt_slash_path("api/user/redirect_to_website", user.redirect_to_website),
     opt_slash_path("api/user/test_slack_webhook", user.test_slack_webhook),
-    opt_slash_path("api/prompts/webhook", prompt_webhook),
     opt_slash_path("api/early_access_features", early_access_features),
     opt_slash_path("api/surveys", surveys),
     opt_slash_path("api/signup", signup.SignupViewset.as_view()),
diff --git a/posthog/utils.py b/posthog/utils.py
index 57415aa4ee0ba..65e7ea2bda5b7 100644
--- a/posthog/utils.py
+++ b/posthog/utils.py
@@ -815,11 +815,9 @@ def get_instance_realm() -> str:
 
 def get_instance_region() -> Optional[str]:
     """
-    Returns the region for the current instance. `US` or 'EU'.
+    Returns the region for the current Cloud instance. `US` or 'EU'.
     """
-    if is_cloud():
-        return settings.REGION
-    return None
+    return settings.CLOUD_DEPLOYMENT
 
 
 def get_can_create_org(user: Union["AbstractBaseUser", "AnonymousUser"]) -> bool:
diff --git a/posthog/warehouse/api/external_data_schema.py b/posthog/warehouse/api/external_data_schema.py
index f69a34efcc4b7..a2f5bb9e1bc86 100644
--- a/posthog/warehouse/api/external_data_schema.py
+++ b/posthog/warehouse/api/external_data_schema.py
@@ -1,10 +1,8 @@
 from rest_framework import serializers
 from posthog.warehouse.models import ExternalDataSchema
 from typing import Optional
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from rest_framework import viewsets, filters
-from rest_framework.permissions import IsAuthenticated
-from posthog.permissions import OrganizationMemberPermissions
 from rest_framework.exceptions import NotAuthenticated
 from posthog.models import User
 
@@ -29,10 +27,9 @@ class Meta:
         fields = ["id", "name", "should_sync", "last_synced_at"]
 
 
-class ExternalDataSchemaViewset(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ExternalDataSchemaViewset(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     queryset = ExternalDataSchema.objects.all()
     serializer_class = ExternalDataSchemaSerializer
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_backends = [filters.SearchFilter]
     search_fields = ["name"]
     ordering = "-created_at"
diff --git a/posthog/warehouse/api/external_data_source.py b/posthog/warehouse/api/external_data_source.py
index faf884d6c8b3b..6b59b2f01637a 100644
--- a/posthog/warehouse/api/external_data_source.py
+++ b/posthog/warehouse/api/external_data_source.py
@@ -5,13 +5,11 @@
 from rest_framework import filters, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotAuthenticated
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.models import User
-from posthog.permissions import OrganizationMemberPermissions
 from posthog.warehouse.data_load.service import (
     sync_external_data_job_workflow,
     trigger_external_data_workflow,
@@ -87,14 +85,13 @@ class Meta:
         read_only_fields = ["id", "created_by", "created_at", "status", "source_type"]
 
 
-class ExternalDataSourceViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ExternalDataSourceViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Create, Read, Update and Delete External data Sources.
     """
 
     queryset = ExternalDataSource.objects.all()
     serializer_class = ExternalDataSourceSerializers
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_backends = [filters.SearchFilter]
     search_fields = ["source_id"]
     ordering = "-created_at"
diff --git a/posthog/warehouse/api/saved_query.py b/posthog/warehouse/api/saved_query.py
index 1b624d44159a6..b87499e056295 100644
--- a/posthog/warehouse/api/saved_query.py
+++ b/posthog/warehouse/api/saved_query.py
@@ -3,9 +3,8 @@
 from django.conf import settings
 from rest_framework import exceptions, filters, serializers, viewsets
 from rest_framework.exceptions import NotAuthenticated
-from rest_framework.permissions import IsAuthenticated
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.hogql.context import HogQLContext
 from posthog.hogql.database.database import SerializedField, serialize_fields
@@ -14,7 +13,6 @@
 from posthog.hogql.parser import parse_select
 from posthog.hogql.printer import print_ast
 from posthog.models import User
-from posthog.permissions import OrganizationMemberPermissions
 from posthog.warehouse.models import DataWarehouseSavedQuery
 
 
@@ -73,6 +71,7 @@ def validate_query(self, query):
         _is_valid_view = is_valid_view(select_ast)
         if not _is_valid_view:
             raise exceptions.ValidationError(detail="Ensure all fields are aliased")
+
         try:
             print_ast(
                 node=select_ast,
@@ -92,14 +91,13 @@ def validate_query(self, query):
         return query
 
 
-class DataWarehouseSavedQueryViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class DataWarehouseSavedQueryViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Create, Read, Update and Delete Warehouse Tables.
     """
 
     queryset = DataWarehouseSavedQuery.objects.all()
     serializer_class = DataWarehouseSavedQuerySerializer
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_backends = [filters.SearchFilter]
     search_fields = ["name"]
     ordering = "-created_at"
diff --git a/posthog/warehouse/api/table.py b/posthog/warehouse/api/table.py
index aa4d23e2ecd01..1fbb36f05b564 100644
--- a/posthog/warehouse/api/table.py
+++ b/posthog/warehouse/api/table.py
@@ -2,13 +2,11 @@
 
 from rest_framework import filters, request, response, serializers, status, viewsets
 from rest_framework.exceptions import NotAuthenticated
-from rest_framework.permissions import IsAuthenticated
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.hogql.database.database import SerializedField, serialize_fields
 from posthog.models import User
-from posthog.permissions import OrganizationMemberPermissions
 from posthog.warehouse.models import (
     DataWarehouseCredential,
     DataWarehouseSavedQuery,
@@ -93,14 +91,13 @@ def get_columns(self, table: DataWarehouseTable) -> List[SerializedField]:
         return serialize_fields(table.hogql_definition().fields)
 
 
-class TableViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class TableViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Create, Read, Update and Delete Warehouse Tables.
     """
 
     queryset = DataWarehouseTable.objects.all()
     serializer_class = TableSerializer
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_backends = [filters.SearchFilter]
     search_fields = ["name"]
     ordering = "-created_at"
diff --git a/posthog/warehouse/api/test/test_external_data_source.py b/posthog/warehouse/api/test/test_external_data_source.py
index 07ce645788d58..ba97dc6b4562e 100644
--- a/posthog/warehouse/api/test/test_external_data_source.py
+++ b/posthog/warehouse/api/test/test_external_data_source.py
@@ -7,7 +7,6 @@
 )
 from django.test import override_settings
 from django.conf import settings
-from posthog.cloud_utils import TEST_clear_cloud_cache
 from posthog.models import Team
 import psycopg
 
@@ -194,9 +193,7 @@ def test_database_schema(self):
     def test_internal_postgres(self, patch_get_postgres_schemas):
         patch_get_postgres_schemas.return_value = ["table_1"]
 
-        TEST_clear_cloud_cache(True)
-
-        with override_settings(REGION="US"):
+        with override_settings(CLOUD_DEPLOYMENT="US"):
             team_2, _ = Team.objects.get_or_create(id=2, organization=self.team.organization)
             response = self.client.get(
                 f"/api/projects/{team_2.id}/external_data_sources/database_schema/",
@@ -228,7 +225,7 @@ def test_internal_postgres(self, patch_get_postgres_schemas):
             self.assertEqual(response.status_code, 400)
             self.assertEqual(response.json(), {"message": "Cannot use internal Postgres database"})
 
-        with override_settings(REGION="EU"):
+        with override_settings(CLOUD_DEPLOYMENT="EU"):
             team_1, _ = Team.objects.get_or_create(id=1, organization=self.team.organization)
             response = self.client.get(
                 f"/api/projects/{team_1.id}/external_data_sources/database_schema/",
diff --git a/posthog/warehouse/api/view_link.py b/posthog/warehouse/api/view_link.py
index dcda8aeda6ede..82edd17f87e1d 100644
--- a/posthog/warehouse/api/view_link.py
+++ b/posthog/warehouse/api/view_link.py
@@ -2,13 +2,11 @@
 
 from rest_framework import filters, serializers, viewsets
 from rest_framework.exceptions import NotAuthenticated
-from rest_framework.permissions import IsAuthenticated
 
-from posthog.api.routing import StructuredViewSetMixin
+from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.shared import UserBasicSerializer
 from posthog.hogql.database.database import create_hogql_database
 from posthog.models import User
-from posthog.permissions import OrganizationMemberPermissions
 from posthog.warehouse.models import DataWarehouseSavedQuery, DataWarehouseViewLink
 
 
@@ -84,14 +82,13 @@ def _validate_join_key(self, join_key: Optional[str], table: Optional[str], team
         return
 
 
-class ViewLinkViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
+class ViewLinkViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
     """
     Create, Read, Update and Delete View Columns.
     """
 
     queryset = DataWarehouseViewLink.objects.all()
     serializer_class = ViewLinkSerializer
-    permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     filter_backends = [filters.SearchFilter]
     search_fields = ["name"]
     ordering = "-created_at"