From 1e4e1b1166d1409962c94842354ddd29fa01075f Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 20 Nov 2023 22:54:58 +0530
Subject: [PATCH 01/14] Playwright tests (wip)

---
 .github/workflows/playwright.yml              | 27 +++++++
 .gitignore                                    |  1 +
 funnel/templates/account.html.jinja2          | 14 ++--
 .../templates/account_formlayout.html.jinja2  |  2 +-
 funnel/templates/account_menu.html.jinja2     | 10 +--
 .../account_organizations.html.jinja2         |  2 +-
 .../templates/collaborator_list.html.jinja2   |  6 +-
 funnel/templates/forms.html.jinja2            |  4 +-
 .../img_upload_formlayout.html.jinja2         |  2 +-
 funnel/templates/js/comments.js.jinja2        | 34 ++++----
 funnel/templates/js/event_checkin.js.jinja2   | 12 +--
 funnel/templates/js/membership.js.jinja2      | 18 ++---
 funnel/templates/js/schedule.js.jinja2        |  4 +-
 funnel/templates/js/update.js.jinja2          |  4 +-
 funnel/templates/labels.html.jinja2           |  4 +-
 funnel/templates/labels_form.html.jinja2      |  2 +-
 funnel/templates/layout.html.jinja2           | 12 +--
 funnel/templates/login.html.jinja2            |  2 +-
 funnel/templates/macros.html.jinja2           | 32 ++++----
 .../notifications/layout_web.html.jinja2      |  2 +-
 funnel/templates/otpform.html.jinja2          |  4 +-
 .../templates/password_login_form.html.jinja2 |  8 +-
 funnel/templates/profile.html.jinja2          |  4 +-
 funnel/templates/profile_layout.html.jinja2   | 34 ++++----
 funnel/templates/project_admin.html.jinja2    | 14 ++--
 funnel/templates/project_cfp.html.jinja2      |  2 +-
 funnel/templates/project_layout.html.jinja2   | 70 ++++++++--------
 .../templates/project_rsvp_list.html.jinja2   |  4 +-
 funnel/templates/project_settings.html.jinja2 | 24 +++---
 .../project_sponsor_popup.html.jinja2         |  4 +-
 .../templates/project_submissions.html.jinja2 |  2 +-
 funnel/templates/project_updates.html.jinja2  |  2 +-
 funnel/templates/rsvp_modal.html.jinja2       |  4 +-
 funnel/templates/schedule_edit.html.jinja2    |  8 +-
 .../templates/schedule_subscribe.html.jinja2  |  4 +-
 .../templates/session_view_popup.html.jinja2  | 18 ++---
 funnel/templates/submission.html.jinja2       | 40 +++++-----
 .../submission_admin_panel.html.jinja2        |  6 +-
 funnel/templates/submission_form.html.jinja2  | 24 +++---
 funnel/templates/ticket_event.html.jinja2     |  8 +-
 funnel/templates/unread_comments.html.jinja2  |  6 +-
 funnel/templates/venues.html.jinja2           | 12 +--
 funnel/views/login.py                         |  2 +-
 playwright.config.js                          | 80 +++++++++++++++++++
 tests/cypress/cypress_initdb_test.py          |  1 +
 tests/cypress/e2e/00_addProfile.cy.js         | 10 +--
 tests/cypress/e2e/01_addCrewtoProfile.cy.js   | 24 +++---
 tests/cypress/e2e/02_verifyAdminRoles.cy.js   | 22 ++---
 tests/cypress/e2e/03_createProject.cy.js      | 12 +--
 tests/cypress/e2e/04_addCrewtoProject.cy.js   |  8 +-
 tests/cypress/e2e/05_publishProject.cy.js     | 30 +++----
 tests/cypress/e2e/06_manageVenue.cy.js        | 26 +++---
 tests/cypress/e2e/07_addCFP.cy.js             | 22 ++---
 tests/cypress/e2e/08_addSubmission.cy.js      | 46 +++++------
 tests/cypress/e2e/09_confirmSubmission.cy.js  | 62 +++++++-------
 tests/cypress/e2e/10_updateSchedule.cy.js     | 34 ++++----
 tests/cypress/e2e/11_respondToAttend.cy.js    | 20 ++---
 tests/cypress/e2e/12_verifyPromotorRole.cy.js | 22 ++---
 tests/cypress/e2e/13_verifyattendeeList.cy.js |  8 +-
 tests/cypress/e2e/14_viewSchedule.cy.js       | 38 ++++-----
 tests/cypress/e2e/15_addSessionVideo.cy.js    | 22 ++---
 tests/cypress/e2e/16_viewVideos.cy.js         |  6 +-
 tests/cypress/e2e/17_removeSessionVideo.cy.js | 12 +--
 tests/cypress/e2e/18_viewCrew.cy.js           | 18 ++---
 tests/cypress/e2e/20_postComment.cy.js        | 38 ++++-----
 tests/cypress/e2e/21_postUpdate.cy.js         | 22 ++---
 .../cypress/e2e/22_commentSubscription.cy.js  | 58 +++++++-------
 tests/cypress/e2e/23_addSponsor.cy.js         | 18 ++---
 .../e2e/eventsetup-tests/1_setupEvent.cy.js   | 12 +--
 .../e2e/eventsetup-tests/2_synctickets.cy.js  | 26 +++---
 .../e2e/eventsetup-tests/3_checkin.cy.js      | 28 +++----
 .../eventsetup-tests/4_verifyUsherRoles.cy.js | 22 ++---
 .../e2e/eventsetup-tests/5_badge.cy.js        | 14 ++--
 .../e2e/eventsetup-tests/6_printbadge.cy.js   | 12 +--
 .../7_updatebadgeprintstatus.cy.js            | 12 +--
 tests/cypress/support.js                      | 26 +++---
 tests/playwright/fixtures/boxoffice.js        |  8 ++
 tests/playwright/fixtures/cfp.json            |  3 +
 tests/playwright/fixtures/labels.json         | 22 +++++
 tests/playwright/fixtures/profile.json        |  6 ++
 tests/playwright/fixtures/project.json        | 18 +++++
 tests/playwright/fixtures/proposal.json       | 14 ++++
 tests/playwright/fixtures/session.json        | 10 +++
 tests/playwright/fixtures/sponsor.json        |  7 ++
 tests/playwright/fixtures/ticket_events.json  | 10 +++
 .../fixtures/ticket_participants.json         | 26 ++++++
 tests/playwright/fixtures/user.json           | 42 ++++++++++
 tests/playwright/fixtures/venues.json         | 24 ++++++
 tests/playwright/page/create-project.js       | 27 +++++++
 tests/playwright/page/login.js                | 29 +++++++
 tests/playwright/page/profile-crew-form.js    | 53 ++++++++++++
 tests/playwright/page/project-crew-form.js    | 49 ++++++++++++
 .../playwright/tests/add-crew-project.spec.js | 32 ++++++++
 .../tests/add-venue-project.spec.js           | 72 +++++++++++++++++
 tests/playwright/tests/create-profile.spec.js | 60 ++++++++++++++
 tests/playwright/tests/create-project.spec.js | 42 ++++++++++
 96 files changed, 1263 insertions(+), 600 deletions(-)
 create mode 100644 .github/workflows/playwright.yml
 create mode 100644 playwright.config.js
 create mode 100644 tests/playwright/fixtures/boxoffice.js
 create mode 100644 tests/playwright/fixtures/cfp.json
 create mode 100644 tests/playwright/fixtures/labels.json
 create mode 100644 tests/playwright/fixtures/profile.json
 create mode 100644 tests/playwright/fixtures/project.json
 create mode 100644 tests/playwright/fixtures/proposal.json
 create mode 100644 tests/playwright/fixtures/session.json
 create mode 100644 tests/playwright/fixtures/sponsor.json
 create mode 100644 tests/playwright/fixtures/ticket_events.json
 create mode 100644 tests/playwright/fixtures/ticket_participants.json
 create mode 100644 tests/playwright/fixtures/user.json
 create mode 100644 tests/playwright/fixtures/venues.json
 create mode 100644 tests/playwright/page/create-project.js
 create mode 100644 tests/playwright/page/login.js
 create mode 100644 tests/playwright/page/profile-crew-form.js
 create mode 100644 tests/playwright/page/project-crew-form.js
 create mode 100644 tests/playwright/tests/add-crew-project.spec.js
 create mode 100644 tests/playwright/tests/add-venue-project.spec.js
 create mode 100644 tests/playwright/tests/create-profile.spec.js
 create mode 100644 tests/playwright/tests/create-project.spec.js

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
new file mode 100644
index 000000000..90b6b700d
--- /dev/null
+++ b/.github/workflows/playwright.yml
@@ -0,0 +1,27 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test
+    - uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30
diff --git a/.gitignore b/.gitignore
index ca291c340..2d48b9b7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ tests/cypress/videos
 tests/screenshots
 tests/unit/utils/markdown/data/output.html
 coverage/
+tests/playwright/test-results
 
 # Instance files that should not be checked-in
 instance/development.py
diff --git a/funnel/templates/account.html.jinja2 b/funnel/templates/account.html.jinja2
index d7cf48be3..6fb90efed 100644
--- a/funnel/templates/account.html.jinja2
+++ b/funnel/templates/account.html.jinja2
@@ -33,11 +33,11 @@
                 <p class="mui--text-subhead mui--text-light user__box__userid">@{{ current_auth.user.username }}</p>
               {% else %}
                 <p class="mui--text-subhead mui--text-light user__box__userid">
-                  {{ faicon(icon='info-circle', icon_size='body2', baseline=true) }} <a href="{{ url_for('account_edit') }}" data-cy="add-username">{% trans %}Add username{% endtrans %} <span class="circle-icon">{{ faicon(icon='plus', icon_size='caption', baseline=false) }}</span></a>
+                  {{ faicon(icon='info-circle', icon_size='body2', baseline=true) }} <a href="{{ url_for('account_edit') }}" data-testid="add-username">{% trans %}Add username{% endtrans %} <span class="circle-icon">{{ faicon(icon='plus', icon_size='caption', baseline=false) }}</span></a>
                 </p>
               {%- endif %}
               <a href="{{ current_auth.user.absolute_url }}"
-                  data-cy="my-profile"
+                  data-testid="my-profile"
                   class="nounderline">
                 {%- trans %}Go to account{% endtrans %}
                 <span class="circle-icon">{{ faicon(icon='arrow-right', icon_size='caption', baseline=false) }}</span>
@@ -91,7 +91,7 @@
                  href="{{ url_for('account_edit') }}">{% trans %}Edit{% endtrans %}</a>
               <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent"
                  href="{{ url_for('change_password') }}"
-                 data-cy="change-password">
+                 data-testid="change-password">
                 {% if user_has_password %}
                   {% trans %}Change password{% endtrans %}
                 {% else %}
@@ -100,7 +100,7 @@
               </a>
               <button class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent"
                       type="submit"
-                      data-cy="Logout">
+                      data-testid="logout">
                 {% trans %}Logout{% endtrans %}
               </button>
             </div>
@@ -202,7 +202,7 @@
                   </button>
                 {% endif %}
                 <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent"
-                   href="{{ url_for('add_email') }}" data-cy="add-new-email">{% trans %}Add an email address{% endtrans %}</a>
+                   href="{{ url_for('add_email') }}" data-testid="add-new-email">{% trans %}Add an email address{% endtrans %}</a>
                 <span class="loading mui--hide"></span>
               </div>
             </form>
@@ -253,7 +253,7 @@
                   </button>
                 {% endif %}
                 <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent"
-                   href="{{ url_for('add_phone') }}" data-cy="add-new-phone">{% trans %}Add a mobile number{% endtrans %}</a>
+                   href="{{ url_for('add_phone') }}" data-testid="add-new-phone">{% trans %}Add a mobile number{% endtrans %}</a>
                 <span class="loading mui--hide"></span>
               </div>
             </form>
@@ -388,7 +388,7 @@
         </div>
         <div class="mui-divider"></div>
         <div class="card__footer">
-          <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--danger" href="{{ url_for('account_delete') }}" data-cy="change-password">{% trans %}Delete this account{% endtrans %}</a>
+          <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--danger" href="{{ url_for('account_delete') }}" data-testid="change-password">{% trans %}Delete this account{% endtrans %}</a>
         </div>
       </div>
     </div>
diff --git a/funnel/templates/account_formlayout.html.jinja2 b/funnel/templates/account_formlayout.html.jinja2
index 29cca39ee..2a8167981 100644
--- a/funnel/templates/account_formlayout.html.jinja2
+++ b/funnel/templates/account_formlayout.html.jinja2
@@ -23,7 +23,7 @@
     <p class="alert__text">{% trans %}Cookies are required to login. Please enable cookies in your browser’s settings and reload this page{% endtrans %}</p>
   </div>
 
-  <div class="login-page-wrapper" data-cy="login-form-wrapper">
+  <div class="login-page-wrapper" data-testid="login-form-wrapper">
     <div class="login-page__box">
       <div class="login-page__back">
         <a class="js-popup-back" href="{% if current_auth.is_authenticated %}{{ url_for('account') }}{% else %}{{ url_for('index') }}{% endif %}" aria-label="{% trans %}Close{% endtrans %}">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
diff --git a/funnel/templates/account_menu.html.jinja2 b/funnel/templates/account_menu.html.jinja2
index fcaf35c39..4b533eba5 100644
--- a/funnel/templates/account_menu.html.jinja2
+++ b/funnel/templates/account_menu.html.jinja2
@@ -8,7 +8,7 @@
             {{ useravatar(current_auth.user, add_profile_link=true, size='big') }}
             <a href="{{ current_auth.user.absolute_url }}"
               class="user__box__header nounderline"
-              data-cy="profile">
+              data-testid="profile">
               <div class="user__box__header__details">
                 <p class="mui--text-title text-bold mui--text-dark zero-bottom-margin">{{ current_auth.user.fullname }}</p>
                 {% if current_auth.user.username %}
@@ -32,7 +32,7 @@
       <li>
         <a href="{{ url_for('organizations') }}"
            class="header__dropdown__item header__dropdown__item--flex mui--text-dark nounderline mui--text-subhead mui--text-light"
-           data-cy="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
+           data-testid="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
       </li>
       {%- for orgmem in orgmemlist.recent %}
         <li>
@@ -75,7 +75,7 @@
     <li>
       <a href="{{ url_for('account') }}"
          class="header__dropdown__item header__dropdown__item--flex mui--text-subhead mui--text-light nounderline"
-         data-cy="account"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Account settings{% endtrans %}</a>
+         data-testid="account"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Account settings{% endtrans %}</a>
     </li>
     <li>
       <a href="{{ url_for('notification_preferences') }}"
@@ -85,7 +85,7 @@
       <li>
         <a href="{{ url_for('organizations') }}"
            class="header__dropdown__item header__dropdown__item--flex mui--text-subhead mui--text-light nounderline"
-           data-cy="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
+           data-testid="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
       </li>
     {%- endif %}
   {%- endwith %}
@@ -100,7 +100,7 @@
       {{ csrf_tag() }}
       <button class="mui-btn mui-btn--nostyle text-capitalize header__dropdown__item header__dropdown__item--flex mui--text-subhead mui--text-light"
               type="submit"
-              data-cy="Logout">
+              data-testid="logout">
         <span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sign-out', baseline=false) }}</span>{% trans %}Logout{% endtrans %}
       </button>
     </form>
diff --git a/funnel/templates/account_organizations.html.jinja2 b/funnel/templates/account_organizations.html.jinja2
index 1a5aec647..c653401c1 100644
--- a/funnel/templates/account_organizations.html.jinja2
+++ b/funnel/templates/account_organizations.html.jinja2
@@ -20,7 +20,7 @@
             <li class="bottom-padding">
               <a href="{{ url_for('new_organization') }}"
                  class="flex-wrapper flex-wrapper flex-wrapper--center nounderline"
-                 data-cy="new">
+                 data-testid="new">
                 <span class="profile-avatar profile-avatar--bigger profile-avatar--new margin-right">
                   {{ faicon(icon='plus', icon_size='title', baseline=false) }}
                 </span>
diff --git a/funnel/templates/collaborator_list.html.jinja2 b/funnel/templates/collaborator_list.html.jinja2
index 81da026b2..8c6878dc1 100644
--- a/funnel/templates/collaborator_list.html.jinja2
+++ b/funnel/templates/collaborator_list.html.jinja2
@@ -24,10 +24,10 @@
           {% endif %}
         </span>
         <div class="margin-left mui-dropdown display-inlineblock">
-          <button class="mui-btn mui-btn--nostyle mui--align-middle" data-mui-toggle="dropdown" data-cy="collaborator-menu" aria-label="{% trans %}Collaborator menu{% endtrans %}" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='ellipsis-v', icon_size='title', baseline=false) }}</button>
+          <button class="mui-btn mui-btn--nostyle mui--align-middle" data-mui-toggle="dropdown" data-testid="collaborator-menu" aria-label="{% trans %}Collaborator menu{% endtrans %}" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='ellipsis-v', icon_size='title', baseline=false) }}</button>
           <ul class="mui-dropdown__menu mui-dropdown__menu--right" role="menu">
-            <li><a href="{{ membership.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Edit collaborator" data-cy="edit-collaborator" role="button" aria-haspopup="true">{% trans %}Change role{% endtrans %}</a></li>
-            <li><a class="js-remove-collaborator" data-href="{{ membership.url_for('remove') }}" href="#" onclick="return false;" aria-label="{% trans %}Remove collaborator{% endtrans %}" data-ga="Remove collaborator" data-cy="remove-collaborator" role="button" aria-haspopup="true" title="{{ membership.member.pickername }}">{% trans %}Remove{% endtrans %}</a></li>
+            <li><a href="{{ membership.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Edit collaborator" data-testid="edit-collaborator" role="button" aria-haspopup="true">{% trans %}Change role{% endtrans %}</a></li>
+            <li><a class="js-remove-collaborator" data-href="{{ membership.url_for('remove') }}" href="#" onclick="return false;" aria-label="{% trans %}Remove collaborator{% endtrans %}" data-ga="Remove collaborator" data-testid="remove-collaborator" role="button" aria-haspopup="true" title="{{ membership.member.pickername }}">{% trans %}Remove{% endtrans %}</a></li>
           </ul>
         </div>
       </div>
diff --git a/funnel/templates/forms.html.jinja2 b/funnel/templates/forms.html.jinja2
index c024698dd..8cd61b7c3 100644
--- a/funnel/templates/forms.html.jinja2
+++ b/funnel/templates/forms.html.jinja2
@@ -144,10 +144,10 @@
         {%- if name %} name="{{ name|e }}"{% else %} {% endif -%}
         class="mui-btn mui-btn--raised {% if widget_class %} {{ widget_class|e }}{% else %} mui-btn--primary{% endif -%}"
         {%- if tabindex %} tabindex="{{ tabindex }}" {% endif -%}
-        data-cy="form-submit-btn"
+        data-testid="form-submit-btn"
         >{{ value|e }}</button>
     {% endfor %}
-    {% if cancel_url %}<a href="{{ cancel_url }}" class="mui-btn mui-btn--raised mui-btn" data-cy="form-cancel-btn">{% trans %}Cancel{% endtrans %}</a>{% endif %}
+    {% if cancel_url %}<a href="{{ cancel_url }}" class="mui-btn mui-btn--raised mui-btn" data-testid="form-cancel-btn">{% trans %}Cancel{% endtrans %}</a>{% endif %}
     <span class="loading mui--hide">&nbsp;</span>
     {% if csrf_error -%}
       <div>
diff --git a/funnel/templates/img_upload_formlayout.html.jinja2 b/funnel/templates/img_upload_formlayout.html.jinja2
index fd015f930..9d07d4f0e 100644
--- a/funnel/templates/img_upload_formlayout.html.jinja2
+++ b/funnel/templates/img_upload_formlayout.html.jinja2
@@ -6,7 +6,7 @@
 <div class="modal__inner img-upload-modal">
   {% block content %}
     <div class="modal__header">
-      <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
+      <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
       {%- if title -%}
         <p class="mui--text-title text-bold mui--text-dark">{{ title }}</p>
       {%- endif -%}
diff --git a/funnel/templates/js/comments.js.jinja2 b/funnel/templates/js/comments.js.jinja2
index 4703291d7..671e042d9 100644
--- a/funnel/templates/js/comments.js.jinja2
+++ b/funnel/templates/js/comments.js.jinja2
@@ -1,8 +1,8 @@
 {% macro comments_tree() %}
   {% raw %}
     <div id="comments-wrapper" v-cloak>
-      <p v-if="!isuserloggedin"><a class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" :href="loginUrl" data-cy="login-btn">{{ gettext('Login to leave a comment') }}</a></p>
-      <a href="#" onclick="return false;" class="post-form-block nounderline js-new-comment-form" :class="[commentForm ? 'mui--hide' : '']" @click="showNewCommentForm($event, 'comment_message')" :aria-label="gettext('Post comment')" data-cy="post-comment" v-else role="button">
+      <p v-if="!isuserloggedin"><a class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" :href="loginUrl" data-testid="login-btn">{{ gettext('Login to leave a comment') }}</a></p>
+      <a href="#" onclick="return false;" class="post-form-block nounderline js-new-comment-form" :class="[commentForm ? 'mui--hide' : '']" @click="showNewCommentForm($event, 'comment_message')" :aria-label="gettext('Post comment')" data-testid="post-comment" v-else role="button">
         <span class="post-form mui--hidden-xs mui--hidden-sm">{{ gettext('Post a comment…') }}</span>
         <div class="user mui--hidden-xs mui--hidden-sm">
           <div class="user__box">
@@ -17,11 +17,11 @@
         </div>
       </div>
       <div class="ajax-form" :class="[showmodal ? 'ajax-form--mob' : '']" v-if="commentForm">
-        <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('new-comment-form', newCommentUrl, COMMENTACTIONS.NEW)" id="new-comment-form" data-cy="new-form">
+        <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('new-comment-form', newCommentUrl, COMMENTACTIONS.NEW)" id="new-comment-form" data-testid="new-form">
           <div class="mui-form__fields">
             <textarea id="comment_message" name="message" required="required" class="field-comment_message" v-model="textarea"></textarea>
           </div>
-          <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="textarea" data-cy="submit-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" :baseline=false :css_class="'mui--text-hyperlink'"></faicon></button>
+          <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="textarea" data-testid="submit-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" :baseline=false :css_class="'mui--text-hyperlink'"></faicon></button>
           <div class="user" v-else>
             <div class="user__box">
               <useravatar :user='user' :addprofilelink=false></useravatar>
@@ -75,26 +75,26 @@
               <a class="mui--text-caption mui--text-light comment--permalink hg-link-btn" :href="'#c-' + comment.uuid_b58">Posted {{ created_at_age }}</a>
               <span class="mui--text-caption mui--text-light" v-if="comment.edited_at">({{ gettext('edited %s', edited_at_age) }})</span>
               <div class="js-comment-form">
-                <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-cy="reply" v-if="isuserloggedin" @click="activateSubForm($event, COMMENTACTIONS.REPLY, 'reply-comment-textarea-' + comment.uuid_b58)"><faicon :icon="'comment-alt'" :baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Reply') }}</span></a>
-                <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-cy="report-spam" v-if="isuserloggedin" @click="activateSubForm($event, COMMENTACTIONS.REPORTSPAM)"><faicon :icon="'flag-alt'":baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Report') }}</span></a>
+                <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-testid="reply" v-if="isuserloggedin" @click="activateSubForm($event, COMMENTACTIONS.REPLY, 'reply-comment-textarea-' + comment.uuid_b58)"><faicon :icon="'comment-alt'" :baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Reply') }}</span></a>
+                <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-testid="report-spam" v-if="isuserloggedin" @click="activateSubForm($event, COMMENTACTIONS.REPORTSPAM)"><faicon :icon="'flag-alt'":baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Report') }}</span></a>
                 <div class="mui-dropdown">
-                  <a href="#" onclick="return false;" class="link-icon project-links mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project" role="button" aria-haspopup="true" aria-expanded="false"><faicon :icon="'share-alt'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Share') }}</span></a>
+                  <a href="#" onclick="return false;" class="link-icon project-links mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-testid="share-project" role="button" aria-haspopup="true" aria-expanded="false"><faicon :icon="'share-alt'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Share') }}</span></a>
                   <sharedropdown :url='comment.urls.view' :title='comment.title'></sharedropdown>
                 </div>
                 <a href="#" onclick="return false;" class="link-icon mui--text-light hg-link-btn mui--hide link comment__body__links" :data-title="comment.title" :data-url="comment.absolute_url + '?utm_source=webshare'" :data-text=comment.message.text><faicon :icon="'share-alt'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon></a>
                 <div class="mui-dropdown" v-if="comment.urls.edit || comment.urls.delete">
-                  <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-cy="comment-menu" role="button" aria-haspopup="true" aria-expanded="false"><faicon :icon="'ellipsis-v'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('More') }}</span></a>
-                  <ul class="mui-dropdown__menu mui-dropdown__menu--hg-link mui-dropdown__menu--small" data-cy="share-dropdown">
-                    <li><a href="#" onclick="return false;" class="mui--text-body2 comment__body__links" data-cy="edit" v-if="comment.urls.edit" @click="activateSubForm($event, COMMENTACTIONS.EDIT, 'edit-comment-textarea-' + comment.uuid_b58)"><faicon :icon="'edit'" :icon_size="'caption'" :baseline=false :css_class="'mui--text-light fa-icon--right-margin'"></faicon>{{ gettext('Edit') }}</a></li>
-                    <li><a href="#" onclick="return false;" class="mui--text-body2 comment__body__links" data-cy="delete" v-if="comment.urls.delete" @click="activateSubForm($event, COMMENTACTIONS.DELETE)"><faicon :icon="'trash-alt'" :icon_size="'caption'" :baseline=false :css_class="'mui--text-light fa-icon--right-margin'"></faicon>{{ gettext('Delete') }}</a></li>
+                  <a href="#" onclick="return false;" class="link-icon mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-testid="comment-menu" role="button" aria-haspopup="true" aria-expanded="false"><faicon :icon="'ellipsis-v'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('More') }}</span></a>
+                  <ul class="mui-dropdown__menu mui-dropdown__menu--hg-link mui-dropdown__menu--small" data-testid="share-dropdown">
+                    <li><a href="#" onclick="return false;" class="mui--text-body2 comment__body__links" data-testid="edit" v-if="comment.urls.edit" @click="activateSubForm($event, COMMENTACTIONS.EDIT, 'edit-comment-textarea-' + comment.uuid_b58)"><faicon :icon="'edit'" :icon_size="'caption'" :baseline=false :css_class="'mui--text-light fa-icon--right-margin'"></faicon>{{ gettext('Edit') }}</a></li>
+                    <li><a href="#" onclick="return false;" class="mui--text-body2 comment__body__links" data-testid="delete" v-if="comment.urls.delete" @click="activateSubForm($event, COMMENTACTIONS.DELETE)"><faicon :icon="'trash-alt'" :icon_size="'caption'" :baseline=false :css_class="'mui--text-light fa-icon--right-margin'"></faicon>{{ gettext('Delete') }}</a></li>
                   </ul>
                 </div>
                 <div class="ajax-form" :class="[formOpened ? 'ajax-form--mob' : '']" v-if="replyForm">
-                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('reply-comment-form-' + comment.uuid_b58, comment.urls.reply, COMMENTACTIONS.REPLY)" :id="'reply-comment-form-' + comment.uuid_b58" data-cy="reply-form">
+                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('reply-comment-form-' + comment.uuid_b58, comment.urls.reply, COMMENTACTIONS.REPLY)" :id="'reply-comment-form-' + comment.uuid_b58" data-testid="reply-form">
                     <div class="mui-form__fields">
                       <textarea :id="'reply-comment-textarea-' + comment.uuid_b58" name="message" required="required" class="field-comment_message" v-model="reply"></textarea>
                     </div>
-                    <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="reply" data-cy="reply-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" css_class="mui--text-hyperlink"></faicon></button>
+                    <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="reply" data-testid="reply-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" css_class="mui--text-hyperlink"></faicon></button>
                     <div class="user" v-else>
                       <div class="user__box">
                         <useravatar :user='user' :addprofilelink=false></useravatar>
@@ -104,11 +104,11 @@
                   <p class="mui--text-subhead mui--text-danger mui--text-right" v-if="errorMsg">{{ errorMsg }}</p>
                 </div>
                 <div class="ajax-form" :class="[formOpened ? 'ajax-form--mob' : '']" v-if="editForm">
-                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('edit-comment-form-' + comment.uuid_b58, comment.urls.edit, COMMENTACTIONS.EDIT)" :id="'edit-comment-form-' + comment.uuid_b58" data-cy="edit-form">
+                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('edit-comment-form-' + comment.uuid_b58, comment.urls.edit, COMMENTACTIONS.EDIT)" :id="'edit-comment-form-' + comment.uuid_b58" data-testid="edit-form">
                     <div class="mui-form__fields">
                       <textarea :id="'edit-comment-textarea-' + comment.uuid_b58" name="message" required="required" class="field-comment_message" v-model="textarea"></textarea>
                     </div>
-                    <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="textarea" data-cy="edit-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" css_class="mui--text-hyperlink"></faicon></button>
+                    <button type="submit" class="mui-btn mui-btn--raised mui-btn--primary icon-btn" v-if="textarea" data-testid="edit-comment"><faicon :icon="'paper-plane'" :icon_size="'subhead'" css_class="mui--text-hyperlink"></faicon></button>
                     <div class="user" v-else>
                       <div class="user__box">
                         <useravatar :user='user' :addprofilelink=false></useravatar>
@@ -118,9 +118,9 @@
                   <p class="mui--text-subhead mui--text-danger mui--text-right" v-if="errorMsg">{{ errorMsg }}</p>
                 </div>
                 <div class="ajax-form ajax-form--block" :class="[formOpened ? 'ajax-form--mob' : '']" v-if="deleteForm">
-                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('delete-comment-form-' + comment.uuid_b58, comment.urls.delete, 2)" :id="'delete-comment-form-' + comment.uuid_b58" data-cy="delete-form">
+                  <form method="post" accept-charset="UTF-8" class="mui-form" @submit.prevent="submitCommentForm('delete-comment-form-' + comment.uuid_b58, comment.urls.delete, 2)" :id="'delete-comment-form-' + comment.uuid_b58" data-testid="delete-form">
                     <p class="ajax-form__title">Delete this comment?</p>
-                    <button type="submit" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-cy="confirm-delete-btn">Confirm</button>
+                    <button type="submit" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-testid="confirm-delete-btn">Confirm</button>
                     <button class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent ajax-form__cancelbtn" @click="closeAllForms($event, 'deleteForm')">Cancel</button>
                   </form>
                   <p class="mui--text-subhead mui--text-danger mui--text-right" v-if="errorMsg">{{ errorMsg }}</p>
diff --git a/funnel/templates/js/event_checkin.js.jinja2 b/funnel/templates/js/event_checkin.js.jinja2
index 36edfbdc2..7abf76de5 100644
--- a/funnel/templates/js/event_checkin.js.jinja2
+++ b/funnel/templates/js/event_checkin.js.jinja2
@@ -15,7 +15,7 @@
     <script id='ticket-participant-row' type='text/ractive'>
     {{#each ticket_participants}}
       <tr id="p-{{ puuid_b58 }}">
-        <td class='js-searchable' data-th="Name" data-cy="ticket-participant">{{#if has_user }}<faicon icon='user-check' icon_size='subhead' baseline=true css_class="mui--text-success fa-icon--right-margin"></faicon>{{/if}}{{ fullname }}</td>
+        <td class='js-searchable' data-th="Name" data-testid="ticket-participant">{{#if has_user }}<faicon icon='user-check' icon_size='subhead' baseline=true css_class="mui--text-success fa-icon--right-margin"></faicon>{{/if}}{{ fullname }}</td>
         <td class='js-searchable' data-th="Tickets">{{ ticket_type_titles }}</td>
         <td class='js-searchable' data-th="Email">{{ email }}</td>
         <td class='js-searchable' data-th="Company">{{ company }}</td>
@@ -23,10 +23,10 @@
           <ul class="mui-list--unstyled">
             {{#if isUsher || IsPromoter}}
             <li>
-              <a href="{{ badge_url }}" {{#badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" {{/badge_printed}} {{^badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--default" {{/badge_printed}} target="_blank" rel="noopener" data-cy="show-badge">{{ gettext('Show badge') }}</a>
+              <a href="{{ badge_url }}" {{#badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" {{/badge_printed}} {{^badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--default" {{/badge_printed}} target="_blank" rel="noopener" data-testid="show-badge">{{ gettext('Show badge') }}</a>
             </li>
             <li>
-              <a href="{{ label_badge_url }}" {{#badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" {{/badge_printed}} {{^badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--default" {{/badge_printed}} target="_blank" rel="noopener" data-cy="show-label-badge">{{ gettext('Show label badge') }}</a>
+              <a href="{{ label_badge_url }}" {{#badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" {{/badge_printed}} {{^badge_printed}} class="mui-btn mui-btn--small mui-btn--raised mui-btn--default" {{/badge_printed}} target="_blank" rel="noopener" data-testid="show-label-badge">{{ gettext('Show label badge') }}</a>
             </li>
             {{/if}}
             <li>
@@ -36,15 +36,15 @@
                 </div>
                 <input type="hidden" name="puuid_b58" value="{{ puuid_b58 }}">
                 {{#if checked_in}}
-                  <button class="mui-btn mui-btn--small mui-btn--raised mui-btn--danger" on-click="handleCheckIn(event, 0)" {{#submitting}}disabled{{/submitting}} aria-label="{{ gettext('Cancel check-in') }}" data-cy="cancel-checkin">{{ gettext('Cancel Check-in') }} {{#submitting}}<span class="loading"></span>{{/submitting}}</button>
+                  <button class="mui-btn mui-btn--small mui-btn--raised mui-btn--danger" on-click="handleCheckIn(event, 0)" {{#submitting}}disabled{{/submitting}} aria-label="{{ gettext('Cancel check-in') }}" data-testid="cancel-checkin">{{ gettext('Cancel Check-in') }} {{#submitting}}<span class="loading"></span>{{/submitting}}</button>
                 {{else}}
-                  <button class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" on-click="handleCheckIn(event, 1)" {{#submitting}}disabled{{/submitting}} aria-label="{{ gettext('Check-in') }}" data-cy="checkin">{{ gettext('Check-in') }} {{#submitting}}<span class="loading"></span>{{/submitting}}</button>
+                  <button class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" on-click="handleCheckIn(event, 1)" {{#submitting}}disabled{{/submitting}} aria-label="{{ gettext('Check-in') }}" data-testid="checkin">{{ gettext('Check-in') }} {{#submitting}}<span class="loading"></span>{{/submitting}}</button>
                 {{/if}}
               </form>
             </li>
             {{#if IsPromoter}}
             <li>
-              <a href="{{ edit_url }}" class="mui--text-hyperlink" target="_blank" rel="noopener" data-cy="edit-attendee-details">{{ gettext('Edit participant details') }}</a>
+              <a href="{{ edit_url }}" class="mui--text-hyperlink" target="_blank" rel="noopener" data-testid="edit-attendee-details">{{ gettext('Edit participant details') }}</a>
             </li>
             {{/if}}
           </ul>
diff --git a/funnel/templates/js/membership.js.jinja2 b/funnel/templates/js/membership.js.jinja2
index 1b81de1be..e2a9e4c7c 100644
--- a/funnel/templates/js/membership.js.jinja2
+++ b/funnel/templates/js/membership.js.jinja2
@@ -4,7 +4,7 @@
       <div class="membership-wrapper" v-if="ready">
         <div class="mui--clearfix">
           <div class="btn-wrapper membership-wrapper--half" v-if="isUserProfileAdmin">
-            <button class="mui-btn mui-btn--raised mui-btn--primary full-width-btn" @click="fetchForm($event, newMemberUrl)" :aria-label="gettext('Add new member')" data-cy-btn="add-member"><faicon :icon="'plus'"></faicon> {{ gettext('Add new member') }}</button>
+            <button class="mui-btn mui-btn--raised mui-btn--primary full-width-btn" @click="fetchForm($event, newMemberUrl)" :aria-label="gettext('Add new member')" data-testid="add-member"><faicon :icon="'plus'"></faicon> {{ gettext('Add new member') }}</button>
           </div>
           <div class="membership-wrapper--half" v-if="members">
             <form class="display-inlineblock search search--small search--icon mui--z1" v-on:submit.prevent>
@@ -76,7 +76,7 @@
             <button class="mui-btn mui-btn--nostyle mui--text-light" @click="closeForm($event)">{{ gettext('Cancel') }}</button>
           </div>
           <div v-if="activeMember" class="modal--form__action-box--revoke mui--text-center">
-            <button @click="fetchForm($event, deleteURL)" class="mui-btn mui-btn--nostyle mui--text-subhead mui--text-light text-bold" data-cy-btn="revoke">{{ gettext('Remove this member') }}</button>
+            <button @click="fetchForm($event, deleteURL)" class="mui-btn mui-btn--nostyle mui--text-subhead mui--text-light text-bold" data-testid="revoke-btn">{{ gettext('Remove this member') }}</button>
           </div>
         </div>
       </div>
@@ -92,12 +92,12 @@
           <useravatar :user='membership.member' :addprofilelink=true></useravatar>
           <div class="user__box__header">
             <h3 class="mui--text-body2 user__box__fullname">{{ membership.member.fullname }}</h3>
-            <h3 v-if="membership.member.username" class="mui--text-caption user__box__userid"><span  data-cy="member">@{{ membership.member.username }}</span></h3>
+            <h3 v-if="membership.member.username" class="mui--text-caption user__box__userid"><span  data-testid="member">@{{ membership.member.username }}</span></h3>
           </div>
         </div>
         <ul class="mui-list--inline mui--text-subhead zero-bottom-margin membership-wrapper__members__list__roles mui--pull-right">
-          <li v-if="membership.is_owner" class="membership-wrapper__members__list__roles__role mui--text-body2" data-cy="role">{{ gettext('Owner') }}</li>
-          <li v-else class="membership-wrapper__members__list__roles__role mui--text-body2" data-cy="role">{{ gettext('Admin') }}</li>
+          <li v-if="membership.is_owner" class="membership-wrapper__members__list__roles__role mui--text-body2" data-testid="role">{{ gettext('Owner') }}</li>
+          <li v-else class="membership-wrapper__members__list__roles__role mui--text-body2" data-testid="role">{{ gettext('Admin') }}</li>
         </ul>
       </div>
     </script>
@@ -112,13 +112,13 @@
           <useravatar :user='membership.member' :addprofilelink=true></useravatar>
           <div class="user__box__header">
             <h3 class="mui--text-body2 user__box__fullname">{{ membership.member.fullname }} <span v-if="membership.label" class="badge">{{ membership.label }}</span></h3>
-            <h3 v-if="membership.member.username" class="mui--text-caption user__box__userid"><span  data-cy="member">@{{ membership.member.username }}</span></h3>
+            <h3 v-if="membership.member.username" class="mui--text-caption user__box__userid"><span  data-testid="member">@{{ membership.member.username }}</span></h3>
           </div>
         </div>
         <ul class="mui-list--inline mui--text-subhead zero-bottom-margin membership-wrapper__members__list__roles mui--pull-right">
-          <li v-if="membership.is_editor" class="membership-wrapper__members__list__roles__role mui--text-body2" data-cy="role">{{ gettext('Editor') }}</li>
-          <li v-if="membership.is_promoter" class="membership-wrapper__members__list__roles__role mui--text-body2" data-cy="role">{{ gettext('Promoter') }}</li>
-          <li v-if="membership.is_usher" class="membership-wrapper__members__list__roles__role mui--text-body2" data-cy="role">{{ gettext('Usher') }}</li>
+          <li v-if="membership.is_editor" class="membership-wrapper__members__list__roles__role mui--text-body2" data-testid="role">{{ gettext('Editor') }}</li>
+          <li v-if="membership.is_promoter" class="membership-wrapper__members__list__roles__role mui--text-body2" data-testid="role">{{ gettext('Promoter') }}</li>
+          <li v-if="membership.is_usher" class="membership-wrapper__members__list__roles__role mui--text-body2" data-testid="role">{{ gettext('Usher') }}</li>
           <li class="mui--text-light membership-wrapper__members__list__roles__count mui--text-caption" v-if="rolesCount(membership) > 0 && rolesCount(membership) < 3">{{ gettext('+ %d more role', rolesCount(membership)) }}</li>
         </ul>
       </div>
diff --git a/funnel/templates/js/schedule.js.jinja2 b/funnel/templates/js/schedule.js.jinja2
index 1c5be13b6..d4b512935 100644
--- a/funnel/templates/js/schedule.js.jinja2
+++ b/funnel/templates/js/schedule.js.jinja2
@@ -27,9 +27,9 @@
                 <p class="schedule__row__column schedule__row__column--time" :style="{minWidth: timeSlotWidth + 'px'}" v-else-if="(view === 'calendar')"></p>
               <div class="schedule__row__column" :id="(view === 'agenda') ? 't' + key : ''" :class="['schedule__row__column--' + rowWidth, room.talk ? 'schedule__row__column--talks' : '', room.talk ? roomkey : '', room.talk && activeTab == roomkey ? 'js-active': '']" @click="showSessionModal(room.talk)" :style="(getColumnWidth('content') > 0) ? {width: 'calc(100% - ' + getColumnWidth('content') + 'px)'} : {width: '100%'}" v-for="(room, roomkey, roomindex) in session.rooms">
                 <div class="schedule__row__column__content" :class="[view === 'calendar' ? 'schedule__row__column__content--calendar schedule__row__column__content--overflow' : '']" :style="(view == 'calendar') ? {height: getColumnHeight(room.talk.duration, rowHeight) + 'px'} : ''" :id="room.talk.url_name_uuid_b58" v-if="room.talk">
-                  <p class="mui--text-body2 schedule__row__column__content__title__duration" data-cy="session-time">{{ getTimeStr(room.talk.startTime) }}–{{ getTimeStr(room.talk.endTime) }}</p>
+                  <p class="mui--text-body2 schedule__row__column__content__title__duration" data-testid="session-time">{{ getTimeStr(room.talk.startTime) }}–{{ getTimeStr(room.talk.endTime) }}</p>
                   <div class="schedule__row__column__content__title">
-                    <p class="mui--text-body2 schedule__row__column__content__title__heading" v-if="room.talk.title" data-cy="session-title">{{ room.talk.title }}</p>
+                    <p class="mui--text-body2 schedule__row__column__content__title__heading" v-if="room.talk.title" data-testid="session-title">{{ room.talk.title }}</p>
                     <p class="mui--text-caption mui--text-light schedule__row__column__content__title__speaker" v-if="room.talk.speaker">{{ room.talk.speaker }}</p>
                     <div class="schedule__row__column__content__description mui--text-caption" v-html="removeImg(room.talk.description.html)" v-if="view == 'calendar' && room.talk.description.html"></div>
                   </div>
diff --git a/funnel/templates/js/update.js.jinja2 b/funnel/templates/js/update.js.jinja2
index e437b3031..4973f7eb2 100644
--- a/funnel/templates/js/update.js.jinja2
+++ b/funnel/templates/js/update.js.jinja2
@@ -31,13 +31,13 @@
             </div>
             <div class="update__action-btn">
               <div class="mui-dropdown">
-                <a href="#" onclick="return false;" class="mui--text-subhead nounderline mui--text-light project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project" role="button" aria-haspopup="true" aria-expanded="false" :aria-label="gettext('Share')"><faicon :icon="'share-alt'" :icon_size="'subhead'" :baseline=true></faicon></a>
+                <a href="#" onclick="return false;" class="mui--text-subhead nounderline mui--text-light project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-testid="share-project" role="button" aria-haspopup="true" aria-expanded="false" :aria-label="gettext('Share')"><faicon :icon="'share-alt'" :icon_size="'subhead'" :baseline=true></faicon></a>
                 <sharedropdown :url='update.urls.view' :title='update.title'></sharedropdown>
               </div>
               <a href="#" onclick="return false;" class="mui--text-subhead nounderline mui--text-light hg-link-btn mui--hide" :data-title="update.title" :data-url="update.urls.view + '?utm_source=webshare'"><faicon :icon="'share-alt'" :icon_size="'subhead'" :baseline=true></faicon></a>
               <div class="mui-dropdown mui-dropdown--update" v-if="iseditor">
                 <a href="#" onclick="return false;" class="mui--text-light" data-mui-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" :aria-label="gettext('Menu')"><faicon :icon="'ellipsis-v'" :icon_size="'subhead'" css_class="fa-icon--left-margin"></faicon></a>
-                <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link mui-dropdown__menu--small" data-cy="share-dropdown">
+                <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link mui-dropdown__menu--small" data-testid="share-dropdown">
                   <li><a class="mui--text-body2 nounderline" v-if="update.urls.edit" :href="update.urls.edit"><faicon :icon="'edit'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Edit</a></li>
                   <li><a class="mui--text-body2 nounderline" v-if="update.urls.delete" :href="update.urls.delete"><faicon :icon="'trash-alt'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Delete</a></li>
                 </ul>
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 8c72b2d47..f8f823090 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -30,7 +30,7 @@
           <a class="mui--text-light"
             href="{{ project.url_for('new_label') }}"
             aria-label="{% trans %}Create new label{% endtrans %}"
-            data-cy="add-labels"
+            data-testid="add-labels"
             data-ga="Create new label">{{ faicon(icon='plus', icon_size='title') }} <span class="mui--text-headline">{% trans %}Create new label{% endtrans %}</span>
           </a>
         </div>
@@ -95,7 +95,7 @@
                     name="submit"
                     class="mui-btn mui-btn--raised mui-btn--primary"
                     value="reject"
-                    data-cy="save-label-seq">
+                    data-testid="save-label-seq">
               {% trans %}Save label sequence{% endtrans %}
             </button>
             <span class="loading mui--hide"></span>
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 8af2c7eb5..285481b79 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -63,7 +63,7 @@
     {%- endfor %}
     <div class="mui-form form-actions clearfix">
       <div>
-        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" data-cy-submit="save-label">{% trans %}Done{% endtrans %}</button>
+        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" data-testid="save-label">{% trans %}Done{% endtrans %}</button>
         <span class="loading mui--hide"></span>
       </div>
     </div>
diff --git a/funnel/templates/layout.html.jinja2 b/funnel/templates/layout.html.jinja2
index a1d8ac9dc..b06d3faff 100644
--- a/funnel/templates/layout.html.jinja2
+++ b/funnel/templates/layout.html.jinja2
@@ -111,7 +111,7 @@
                 <div class="header__site-title__title">
                   <a href="{{ url_for('index') }}"
                     class="header__site-title__title__home mui--hidden-xs mui--hidden-sm"
-                    data-cy="home-desktop"
+                    data-testid="home-desktop"
                     data-ga="Home"
                     aria-label="{% trans %}Home{% endtrans %}">
                     <img src="{{ url_for('static', filename='img/hg-logo.svg') }}"
@@ -124,7 +124,7 @@
                   <a href="{{ url_for('index') }}"
                     class="header__nav-links mui--hidden-md mui--hidden-lg mui--hidden-xl {% if request.endpoint == 'index' %}header__nav-links--active{% endif %}"
                     aria-label="{% trans %}Home{% endtrans %}"
-                    data-cy="home"
+                    data-testid="home"
                     data-ga="Home">
                     <img src="{{ url_for('static', filename='img/hg-logo.svg') }}"
                         class="header__site-title__home__logo header__site-title__home__logo--primary"
@@ -184,7 +184,7 @@
                       <a href="{{ url_for('notifications') }}"
                         class="header__nav-links header__nav-links--right header__nav-links--updates profile-avatar profile-avatar--bigger"
                         aria-label="{% trans %}Updates{% endtrans %}"
-                        data-cy="my-updates"
+                        data-testid="my-updates"
                         data-ga="Updates">{{ faicon(icon='bell', icon_size='title', baseline=false) }}
                       </a>
                       <a href="#"
@@ -192,14 +192,14 @@
                         class="header__nav-links header__nav-links--right profile-avatar profile-avatar--bigger js-comments-btn"
                         aria-label="{% trans %}Comments{% endtrans %}"
                         data-ga="Comments"
-                        data-cy="comment-sidebar"
+                        data-testid="comment-sidebar"
                         role="button"
                         aria-haspopup="true"
                         aria-expanded="false">{{ faicon(icon='comment-alt', icon_size='title', baseline=false) }}
                       </a>
                       <div class="header__nav-links--dropdown">
                         <a class="header__nav-links user user--standalone js-menu-btn"
-                          data-cy="my-account"
+                          data-testid="my-account"
                           data-ga="account dropdown"
                           aria-label="{% trans %}Account menu{% endtrans %}"
                           role="button"
@@ -219,7 +219,7 @@
                     </div>
                   {%- elif request.endpoint != 'login' %}
                     <a href="{{ url_for('login') }}"
-                      class="mui-btn mui-btn--primary mui-btn--small mui-btn--raised header__button" id="login-nav">{% trans %}Login{% endtrans %}</a>
+                      class="mui-btn mui-btn--primary mui-btn--small mui-btn--raised header__button" id="login-nav" data-testid="login">{% trans %}Login{% endtrans %}</a>
                   {%- else %}
                     {# On the login page, remove the login button but occupy the spot -#}
                     <div></div>
diff --git a/funnel/templates/login.html.jinja2 b/funnel/templates/login.html.jinja2
index ca7090a4f..dbe73bfed 100644
--- a/funnel/templates/login.html.jinja2
+++ b/funnel/templates/login.html.jinja2
@@ -21,7 +21,7 @@
       <p class="mui--text-body2 mui--text-light text-bold mui--text-left">{% trans %}Hello!{% endtrans %}</p>
       <p class="mui--text-body2 mui--text-light text-bold mui--text-left">{% trans %}Tell us where you’d like to get updates. We’ll send an OTP to confirm.{% endtrans %}</p>
     {% endif %}
-    <div id="loginformwrapper" data-cy="login-wrapper">{{ passwordlogin(form, formid, ref_id, action) }}</div>
+    <div id="loginformwrapper" data-testid="login-wrapper">{{ passwordlogin(form, formid, ref_id, action) }}</div>
   </div>
   <p class="mui--text-body2 mui--text-light text-bold mui--text-center top-padding">{% trans %}Or, use your existing account, no OTP required{% endtrans %}</p>
   {{ sociallogin(login_registry) }}
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index a2ef2faa6..173521eee 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -74,9 +74,9 @@
         <a class="mui--text-light" href="{{ url_for('login', next=request.path) }}" data-ga="Login to save project" aria-label="{% trans %}Login to save this project{% endtrans %}">{{ faicon(icon='bookmark', baseline=true, icon_size=iconsize, css_class="mui--text-light") }}</a>
       {%- else %}
         <input type="hidden" name="save" value=""/>
-        <button type="submit" value="true" class="mui-btn mui-btn--nostyle animate-btn {% if not project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Save this project" onclick="this.form.save.value=this.value" data-cy="bookmark" aria-label="{% trans %}Save this project{% endtrans %}">{{ faicon(icon='bookmark', baseline=true, icon_size=iconsize, css_class="mui--text-light") }}
+        <button type="submit" value="true" class="mui-btn mui-btn--nostyle animate-btn {% if not project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Save this project" onclick="this.form.save.value=this.value" data-testid="bookmark" aria-label="{% trans %}Save this project{% endtrans %}">{{ faicon(icon='bookmark', baseline=true, icon_size=iconsize, css_class="mui--text-light") }}
         </button>
-        <button type="submit" value="false" class="mui-btn mui-btn--nostyle animate-btn animate-btn--saved{% if project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Unsave this project" onclick="this.form.save.value=this.value" data-cy="bookmarked" aria-label="{% trans %}Unsave this project{% endtrans %}">{{ faicon(icon='bookmark-solid', baseline=true, icon_size=iconsize, css_class="bookmarked") }}</button>
+        <button type="submit" value="false" class="mui-btn mui-btn--nostyle animate-btn animate-btn--saved{% if project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Unsave this project" onclick="this.form.save.value=this.value" data-testid="bookmarked" aria-label="{% trans %}Unsave this project{% endtrans %}">{{ faicon(icon='bookmark-solid', baseline=true, icon_size=iconsize, css_class="bookmarked") }}</button>
       {%- endif %}
     </div>
   </form>
@@ -84,7 +84,7 @@
 
 {% macro share_dropdown(url, title, css_class="") %}
   {%- with url_copy=url+'?utm_source=share-copy', url_email=url+'?utm_source=share-email&utm_medium=email', url_twitter=url+'?utm_source=share-twitter&utm_medium=social', url_facebook=url+'?utm_source=share-facebook&utm_medium=social', url_linkedin=url+'?utm_source=share-linkedin&utm_medium=social' %}
-  <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link {% if css_class %}{{ css_class }}{%- endif %}" data-cy="share-dropdown">
+  <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link {% if css_class %}{{ css_class }}{%- endif %}" data-testid="share-dropdown">
     <li><a class="mui--text-body2 js-copy-link" href="#" onclick="return false;" data-ga="Copy link to share" role="menuitem">{{ faicon(icon='copy', baseline=true, css_class="mui--text-light fa-icon--right-margin") }}{% trans %}Copy link{% endtrans %}<span class="js-copy-url" aria-hidden="true">{{ url_copy }}</span></a></li>
     <li><a class="mui--text-body2" href="mailto:?subject={{ title|urlencode }}&amp;body={{ url_email|urlencode }}" data-ga="Email" role="menuitem">{{ faicon(icon='envelope', baseline=true, css_class="mui--text-light fa-icon--right-margin") }}{% trans %}Email{% endtrans %}</a></li>
     <li><a class="mui--text-body2" target="_blank" rel="noopener" href="https://twitter.com/share?text={{ title|urlencode }}+(via+@hasgeek)&amp;url={{ url_twitter|urlencode }}" data-url="{{ url_twitter }}" data-via="hasgeek" data-text="{{ title }}" data-ga="Tweet" role="menuitem">{{ faicon(icon='twitter-square', baseline=true, css_class="mui--text-light fa-icon--right-margin") }}{% trans %}Twitter{% endtrans %}</a></li>
@@ -111,9 +111,9 @@
   {%- endif %}
 
   {%- if proposal and proposal.current_roles.editor %}
-    <a class="details__box__control__link mui--text-subhead" href="{{ proposal.url_for('edit') }}#field-video" data-cy="edit-video" aria-label="{% trans %}Edit submission video{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
+    <a class="details__box__control__link mui--text-subhead" href="{{ proposal.url_for('edit') }}#field-video" data-testid="edit-video" aria-label="{% trans %}Edit submission video{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
   {% elif session and session.project.current_roles.editor %}
-    <a class="details__box__control__link mui--text-subhead" href="{{ session.url_for('edit') }}" data-cy="edit-video" aria-label="{% trans %}Edit session video{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
+    <a class="details__box__control__link mui--text-subhead" href="{{ session.url_for('edit') }}" data-testid="edit-video" aria-label="{% trans %}Edit session video{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
   {%- endif %}
 
   {%- if share and (proposal or session) %}
@@ -122,9 +122,9 @@
     {% else %}
       {% set url, title = session.url_for(_external=true), session.title %}
     {%- endif %}
-    <a href="#" onclick="return false;" class="details__box__control__link mui--text-subhead hg-link-btn mui--hide" data-ga="Share dropdown" data-cy="share-project" data-url="{{ (url+'?utm_source=webshare') }}" aria-label="{% trans %}Share{% endtrans %}">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
+    <a href="#" onclick="return false;" class="details__box__control__link mui--text-subhead hg-link-btn mui--hide" data-ga="Share dropdown" data-testid="share-project" data-url="{{ (url+'?utm_source=webshare') }}" aria-label="{% trans %}Share{% endtrans %}">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
     <div class="mui-dropdown">
-      <a href="#" onclick="return false;" class="details__box__control__link mui--text-subhead project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Share{% endtrans %}">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
+      <a href="#" onclick="return false;" class="details__box__control__link mui--text-subhead project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-testid="share-project" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Share{% endtrans %}">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
       {{ share_dropdown(url, title) }}
     </div>
   {%- endif %}
@@ -142,7 +142,7 @@
 {% endmacro %}
 
 {% macro projectcard(project, include_calendar=true, calendarwidget_compact=true, include_profile=true, include_details=true, save_form_id_prefix='spf_', add_bookmark=true, snippet_html=none) %}
-  <a class="card card--upcoming clickable-card" href="{{ project.url_for() }}" aria-label="{{ project.title }}" data-cy-title="{{ project.title }}" data-ga="View project">
+  <a class="card card--upcoming clickable-card" href="{{ project.url_for() }}" aria-label="{{ project.title }}" data-testid="{{ project.title }}" data-ga="View project">
     {%- if include_profile %}
     <div class="flex-wrapper flex-wrapper--center flex-wrapper--space-between margin-top margin-bottom margin-right margin-left">
       <div class="flex-wrapper flex-wrapper--center">
@@ -223,16 +223,16 @@
   <div class="video">
     <a class="video__thumbnail {%- if not (session.views.video.thumbnail or session.banner_image_url.url) %} video__thumnail--novideo {%- endif %}" href="{%- if session.proposal %}{{ session.proposal.url_for() }}{%- else %}{{ session.url_for() }}{%- endif %}" data-ga="view session video">
       {%- if session.views.video.thumbnail %}
-        <img src="{{ session.views.video.thumbnail }}" class="video__thumbnail__img img-responsive" data-cy="thumbnail" alt="{{ session.title }}"/>
+        <img src="{{ session.views.video.thumbnail }}" class="video__thumbnail__img img-responsive" data-testid="thumbnail" alt="{{ session.title }}"/>
         <div class="video__thumbnail__icon">{{ faicon(icon='play', icon_size='headline', baseline=false) }}</div>
       {%- elif session.banner_image_url.url %}
-        <img src="{{ session.banner_image_url }}" class="video__thumbnail__img img-responsive" data-cy="thumbnail" alt="{{ session.title }}"/>
+        <img src="{{ session.banner_image_url }}" class="video__thumbnail__img img-responsive" data-testid="thumbnail" alt="{{ session.title }}"/>
       {%- endif %}
     </a>
     {%- if project_heading %}
-      <p class="mui--text-title text-bold video__txt" data-cy="project-title">{{ session.project.title }}</p>
+      <p class="mui--text-title text-bold video__txt" data-testid="project-title">{{ session.project.title }}</p>
     {%- endif %}
-    <p class="mui--text-subhead text-bold video__txt" data-cy="title">{{ session.title }}</p>
+    <p class="mui--text-subhead text-bold video__txt" data-testid="title">{{ session.title }}</p>
     {%- if session.speaker %}<p class="mui--text-body2 mui--text-light video__txt">{{ session.speaker }}</p>{%- endif %}
     {%- if session.views.video %}
       <div class="mui--text-caption mui--text-light">
@@ -309,7 +309,7 @@
               </a>
             </div>
           </div>
-          <a {% if sponsor_public %}href="{{ sponsorship.member.absolute_url }}"{% endif %} class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{{ sponsorship.member.title }}</a>
+          <a {% if sponsor_public %}href="{{ sponsorship.member.absolute_url }}"{% endif %} class="mui--text-dark mui--text-subhead text-bold nounderline" data-testid="profile-link">{{ sponsorship.member.title }}</a>
         </div>
         {%- endwith %}
       {%- endfor %}
@@ -352,7 +352,7 @@
             </div>
           {%- endif -%}
           <div class="proposal-card__body__inner__headline">
-            <h3 class="mui--text-title text-bold zero-top-margin" data-cy="proposal-card"><a class="nounderline mui--text-dark {% if spa %}js-spa-navigate{%- endif -%}" href="{{ proposal.url_for() }}" data-cy-proposal="{{ proposal.title }}">{{ proposal.title }}</a></h3>
+            <h3 class="mui--text-title text-bold zero-top-margin" data-testid="proposal-card"><a class="nounderline mui--text-dark {% if spa %}js-spa-navigate{%- endif -%}" href="{{ proposal.url_for() }}" data-testid="{{ proposal.title }}">{{ proposal.title }}</a></h3>
             {% if proposal.body.html %}
               <div class="proposal-card__body__inner__headline__content mui--text-light">{{ proposal.body.html|preview(max=400) }} <a class="nounderline {% if spa %}js-spa-navigate{%- endif -%}" href="{{ proposal.url_for() }}"><span class="chip">{% trans %}more{% endtrans %} {{ faicon(icon='caret-right-solid', baseline=false, css_class="mui--align-middle") }}</span></a></div>
             {%- endif -%}
@@ -412,7 +412,7 @@
   <div class="flex-wrapper flex-wrapper--space-between flex-wrapper--center margin-top bottom-padding">
     <div>
       <div class="js-cfp-status {% if not project.cfp_state.OPEN -%} mui--hide {%- endif %}">
-        <p class="mui--text-subhead text-bold zero-bottom-margin" data-cy="cfp-state">
+        <p class="mui--text-subhead text-bold zero-bottom-margin" data-testid="cfp-state">
           {% if project.cfp_end_at_localized -%}
             {% if project.view_for('cfp').is_available() and showEditBtn %}<a href="{{ project.url_for('cfp') }}" class="mui--text-dark">{%- endif %}{% trans date=project.cfp_end_at_localized|datetime(format='dd MMM YYYY, hh:mm a') %}Accepting submissions till {{ date }}{% endtrans %}{% if project.view_for('cfp').is_available() and showEditBtn %}</a>{%- endif %}
           {% else %}
@@ -440,7 +440,7 @@
 {%- macro add_submission_btn(project) %}
   {%- if project.state.PUBLISHED %}
     <div class="project-details__box__content--lesspadding propose js-cfp-status {% if not project.cfp_state.OPEN -%} mui--hide {%- endif %}">
-      <a class="mui-btn mui-btn--accent mui-btn--raised display-block" href="{{ project.url_for('new_proposal') }}" data-cy="propose-a-session">{% trans %}Make a submission{% endtrans %}</a>
+      <a class="mui-btn mui-btn--accent mui-btn--raised display-block" href="{{ project.url_for('new_proposal') }}" data-testid="propose-a-session">{% trans %}Make a submission{% endtrans %}</a>
       {% if project.cfp_end_at_localized -%}<p class="mui--text-body2 mui--text-light">{% trans date=project.cfp_end_at_localized|datetime(format='dd MMM YYYY, hh:mm a') %}Accepting submissions till {{ date }}{% endtrans %}</p>{% endif %}
     </div>
   {%- endif %}
diff --git a/funnel/templates/notifications/layout_web.html.jinja2 b/funnel/templates/notifications/layout_web.html.jinja2
index f48f2d314..7b235500a 100644
--- a/funnel/templates/notifications/layout_web.html.jinja2
+++ b/funnel/templates/notifications/layout_web.html.jinja2
@@ -6,7 +6,7 @@
       <div class="user__box user__box--topalign">
         {% block avatar %}{% if view.actor %}{{ useravatar(view.actor) }}{% endif %}{% endblock avatar %}
         <div class="user__box__header">
-          <div class="mui--text-subhead" data-cy="notification-box">
+          <div class="mui--text-subhead" data-testid="notification-box">
             {%- block content %}
               {% trans %}(This template is missing content){% endtrans %}
             {%- endblock content %}
diff --git a/funnel/templates/otpform.html.jinja2 b/funnel/templates/otpform.html.jinja2
index 411b43eaf..51890e3df 100644
--- a/funnel/templates/otpform.html.jinja2
+++ b/funnel/templates/otpform.html.jinja2
@@ -6,8 +6,8 @@
     {{ renderform_inner(form, formid) }}
     <div class="mui-form form-actions mui--clearfix{% if css_class %} {{ css_class }}{% endif %}">
       <div>
-        <button type="submit" name="{{ submit|e }}" class="mui-btn mui-btn--raised mui-btn--primary" data-cy="form-submit-btn">{{ submit }}</button>
-        <a href="{{ cancel_url }}" class="mui-btn mui-btn--raised" data-cy="form-cancel-btn">{% trans %}Cancel{% endtrans %}</a>
+        <button type="submit" name="{{ submit|e }}" class="mui-btn mui-btn--raised mui-btn--primary" data-testid="form-submit-btn">{{ submit }}</button>
+        <a href="{{ cancel_url }}" class="mui-btn mui-btn--raised" data-testid="form-cancel-btn">{% trans %}Cancel{% endtrans %}</a>
         <span class="loading mui--hide">&nbsp;</span>
         {% if form.csrf_token and form.csrf_token.errors -%}
           <div>
diff --git a/funnel/templates/password_login_form.html.jinja2 b/funnel/templates/password_login_form.html.jinja2
index 46a69175e..7df9dc1a0 100644
--- a/funnel/templates/password_login_form.html.jinja2
+++ b/funnel/templates/password_login_form.html.jinja2
@@ -22,7 +22,7 @@
         <a class="link nounderline js-toggle-login">{% trans %}Use OTP{% endtrans %}</a>
       </p>
       <p class="mui--text-caption js-fields-toggle password-field-sidetext mui--hide">
-        <a class="link nounderline js-toggle-login" data-cy="password-login">{% trans %}Have a password?{% endtrans %}</a>
+        <a class="link nounderline js-toggle-login" data-testid="password-login">{% trans %}Have a password?{% endtrans %}</a>
       </p>
       {{ renderfield(loginform.password, css_class="password-field js-fields-toggle js-password-field", tabindex="2") }}
       <p class="mui--text-caption js-fields-toggle password-field-sidetext">
@@ -30,7 +30,7 @@
       </p>
     {% else %}
       <p class="mui--text-caption js-fields-toggle password-field-sidetext">
-        <a class="link nounderline js-toggle-login" id="use-password-login" data-cy="password-login">{% trans %}Have a password?{% endtrans %}</a>
+        <a class="link nounderline js-toggle-login" id="use-password-login" data-testid="password-login">{% trans %}Have a password?{% endtrans %}</a>
       </p>
       <p class="mui--text-caption js-fields-toggle password-field-sidetext mui--hide">
         <a class="link nounderline js-toggle-login" id="use-otp-login">{% trans %}Use OTP{% endtrans %}</a>
@@ -49,7 +49,7 @@
       <button type="submit"
               class="mui-btn mui-btn--raised mui-btn--primary display-block ga-login-btn"
               tabindex="3"
-              data-cy="form-submit-btn" id="get-otp-btn" data-ga="otp-login">
+              data-testid="login-otp-submit" id="get-otp-btn" data-ga="otp-login">
         Get OTP
       </button>
     </div>
@@ -57,7 +57,7 @@
       <button type="submit"
               class="mui-btn mui-btn--raised mui-btn--primary display-block ga-login-btn"
               tabindex="3"
-              data-cy="form-submit-btn" id="login-btn" data-ga="password-login">
+              data-testid="login-submit" id="login-btn" data-ga="password-login">
         Login
       </button>
     </div>
diff --git a/funnel/templates/profile.html.jinja2 b/funnel/templates/profile.html.jinja2
index 8bb7b167d..802adc700 100644
--- a/funnel/templates/profile.html.jinja2
+++ b/funnel/templates/profile.html.jinja2
@@ -87,7 +87,7 @@
         <ul class="grid projects" role="list">
           {%- if profile.features.new_project() %}
             <li class="grid__col-12 grid__col-xs-12 grid__col-sm-6 grid__col-lg-4" role="listitem">
-              <a class="card card--upcoming card--new clickable-card" href="{{ profile.url_for('new_project') }}" aria-label="{% trans %}Create a new project{% endtrans %}" data-cy="new-project" data-ga="Add new project">
+              <a class="card card--upcoming card--new clickable-card" href="{{ profile.url_for('new_project') }}" aria-label="{% trans %}Create a new project{% endtrans %}" data-testid="new-project" data-ga="Add new project">
                 <div class="card__image-wrapper">
                   <img class="card__image" src="{{ url_for('static', filename='img/default-banner.png') }}" alt="new"/>
                   <p class="card__image-wrapper__icon-wrapper">{{ faicon(icon='plus', icon_size='display1', css_class="mui--align-middle card__image-wrapper__icon-wrapper__icon") }}</p>
@@ -189,7 +189,7 @@
                 {% elif membership_project.features.show_tickets %}
                   <div class="membership-container__btn-wrapper">
                     <button class="js-open-ticket-widget mui-btn mui-btn--primary price-btn zero-bottom-margin zero-top-margin display-block">
-                      <span class="price-btn__txt" data-cy="unregistered">{% trans %}Become a member{% endtrans %}</span>
+                      <span class="price-btn__txt" data-testid="unregistered">{% trans %}Become a member{% endtrans %}</span>
                       <span class="price-btn__txt price-btn__txt--smaller primary-color-lighter-txt js-tickets-available"><span class="js-ticket-price"></span></span>
                       <span class="price-btn__txt price-btn__txt--smaller mui--text-light js-tickets-not-available mui--hide">{% trans %}Sales closed{% endtrans %}</span>
                     </button>
diff --git a/funnel/templates/profile_layout.html.jinja2 b/funnel/templates/profile_layout.html.jinja2
index 01c2e51cf..ee3c89b92 100644
--- a/funnel/templates/profile_layout.html.jinja2
+++ b/funnel/templates/profile_layout.html.jinja2
@@ -90,14 +90,14 @@
                   <div>{{ saveprojectform(featured_project, formid=save_form_id) }}</div>
                 {% endif %}
               </div>
-              <h3 class="mui--text-headline text-bold" data-cy="spotlight-project"><a href="{{ featured_project.url_for() }}" class="mui--text-dark nounderline">{{ featured_project.title }}</a></h3>
+              <h3 class="mui--text-headline text-bold" data-testid="spotlight-project"><a href="{{ featured_project.url_for() }}" class="mui--text-dark nounderline">{{ featured_project.title }}</a></h3>
               <p class="mui--text-subhead mui--text-light js-truncate" data-truncate-lines="2">{{ featured_project.tagline }}</p>
               <div class="bottom-padding mui--text-light mui--hidden-lg mui--hidden-xl">{% if featured_project.primary_venue %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {% if featured_project.primary_venue.city %}{{ featured_project.primary_venue.city }}{% else %}{{ featured_project.primary_venue.title }}{% endif %}{% elif featured_project.location %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {{ featured_project.location }}{% endif %}</div>
               <a href="{{ featured_project.url_for() }}" class="mui--text-body2 text-uppercase nounderline">{% trans %}Learn more{% endtrans %}</a>
             </div>
             <div class="grid__col-md-1 grid__col-lg-1 mui--hidden-xs mui--hidden-sm mui--hidden-md">
             </div>
-            <div class="grid__col-12 grid__col-md-5 grid__col-lg-4" data-cy="spotlight-project">
+            <div class="grid__col-12 grid__col-md-5 grid__col-lg-4" data-testid="spotlight-project">
               <div class="card card--upcoming">
                 <div class="flex-wrapper flex-wrapper--center flex-wrapper--space-between margin-top margin-bottom margin-right margin-left mui--hidden-lg mui--hidden-xl">
                   <div class="flex-wrapper flex-wrapper--center">
@@ -116,7 +116,7 @@
                   {% endif %}
                 </div>
                 <div class="card__image-wrapper {% if not featured_project.bg_image.url %}card__image-wrapper--default{% endif %}">
-                  <a href="{{ featured_project.url_for() }}" data-cy-title="{{ featured_project.title }}" data-ga="View featured project">
+                  <a href="{{ featured_project.url_for() }}" data-testid="{{ featured_project.title }}" data-ga="View featured project">
                   {% if featured_project.bg_image.url %}
                     <img class="card__image js-lazyload-img" data-src="{{ featured_project.bg_image.resize(img_size.card_banner) }}" alt="{{ featured_project.title }}"/>
                     <noscript>
@@ -244,11 +244,11 @@
 
 {% macro profile_admin_buttons(profile) %}
   <div class="mui-dropdown display-inlineblock">
-    <a href="#" onclick="return false;" class="mui--text-title mui--text-light profile-dropdown-btn" data-mui-toggle="dropdown" data-ga="Open account menu" data-cy="admin-dropdown" aria-label="{% trans %}Account menu{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='ellipsis-v', icon_size='title', baseline=false) }}</a>
+    <a href="#" onclick="return false;" class="mui--text-title mui--text-light profile-dropdown-btn" data-mui-toggle="dropdown" data-ga="Open account menu" data-testid="admin-dropdown" aria-label="{% trans %}Account menu{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='ellipsis-v', icon_size='title', baseline=false) }}</a>
     <ul class="mui-dropdown__menu mui-dropdown__menu--right" role="menu" aria-labelledby="profile-edit-menu">
-      {%- if profile.is_organization_profile %}<li><a href="{{ profile.urls['members'] }}" data-cy-btn="profile-crew">{%- if profile.current_roles.owner %}{% trans %}Manage admins{% endtrans %}{% else %}{% trans %}View admins{% endtrans %}{% endif %}</a></li>{% endif %}
-      <li><a href="{{ profile.url_for('edit') }}" data-cy-btn="edit-details">{% trans %}Edit this account{% endtrans %}</a></li>
-      {%- if not profile.features.make_public() %}<li><a href="#make-private-modal" rel="modal:open" role="button" aria-haspopup="true">{% trans %}Make account private{% endtrans %}</a></li>{% endif %}
+      {%- if profile.is_organization_profile %}<li><a href="{{ profile.urls['members'] }}" data-testid="profile-crew">{%- if profile.current_roles.owner %}{% trans %}Manage admins{% endtrans %}{% else %}{% trans %}View admins{% endtrans %}{% endif %}</a></li>{% endif %}
+      <li><a href="{{ profile.url_for('edit') }}" data-testid="edit-details">{% trans %}Edit this account{% endtrans %}</a></li>
+      {%- if not profile.features.make_public() %}<li><a href="#make-private-modal" rel="modal:open" role="button" aria-haspopup="true" data-testid="make-profile-private">{% trans %}Make account private{% endtrans %}</a></li>{% endif %}
     </ul>
   </div>
   <div class="modal" id="make-private-modal" role="dialog" aria-labelledby="profile-private-modal-title" aria-modal="true" tabindex="-1">
@@ -265,7 +265,7 @@
       </ul>
       <form action="{{ profile.url_for('transition') }}" method="post">
         {{ profile.forms.transition().hidden_tag() }}
-        <button name="transition" value="make_profile_private" class="mui-btn mui-btn--accent mui--pull-right mui-btn--flat">{% trans %}Make private{% endtrans %}</button>
+        <button name="transition" value="make_profile_private" class="mui-btn mui-btn--accent mui--pull-right mui-btn--flat"  data-testid="make-private-btn">{% trans %}Make private{% endtrans %}</button>
       </form>
     </div>
   </div>
@@ -333,7 +333,7 @@
       <div class="profile__banner">
         <div class="profile__banner__box">
           {%- if profile.banner_image_url.url %}
-            <img class="profile__banner__box__img" src="{{ profile.banner_image_url.resize(img_size.profile_banner) }}" alt="{{ profile.title }}" data-cy="profile-banner-img"/>
+            <img class="profile__banner__box__img" src="{{ profile.banner_image_url.resize(img_size.profile_banner) }}" alt="{{ profile.title }}" data-testid="profile-banner-img"/>
           {% else %}
             <img class="profile__banner__box__img profile__banner__box__img--default" src="{{ url_for('static', filename='img/default-banner-profile.png') }}" alt="{{ profile.title }}"/>
           {% endif %}
@@ -342,7 +342,7 @@
           <div class="grid">
             <div class="grid__col-12">
               {%- if profile.current_roles.admin %}
-                <a href="{{ profile.url_for('update_banner') }}" class="mui-btn mui-btn--default mui-btn--raised profile__banner__upload js-modal-form" aria-label="{% trans %}Add cover photo url{% endtrans %}" data-cy="add-banner" rel="modal:open" data-hash="edit_banner" aria-haspopup="true">{{ faicon(icon='camera', icon_size='body2', css_class="profile__banner__icon") }} <span class="mui--hidden-xs mui--hidden-sm">{% trans %}Add cover photo{% endtrans %}</span></a>
+                <a href="{{ profile.url_for('update_banner') }}" class="mui-btn mui-btn--default mui-btn--raised profile__banner__upload js-modal-form" aria-label="{% trans %}Add cover photo url{% endtrans %}" data-testid="add-banner" rel="modal:open" data-hash="edit_banner" aria-haspopup="true">{{ faicon(icon='camera', icon_size='body2', css_class="profile__banner__icon") }} <span class="mui--hidden-xs mui--hidden-sm">{% trans %}Add cover photo{% endtrans %}</span></a>
               {% endif %}
               <div class="profile__logo">
                 {%- if profile.logo_url.url %}
@@ -354,7 +354,7 @@
                   <a href="{{ profile.url_for('update_logo') }}" class="profile__logo__upload mui--text-dark js-modal-form" rel="modal:open" data-hash="edit_logo" role="button" aria-haspopup="true" aria-label="{% trans %}Update logo{% endtrans %}">{{ faicon(icon='camera', baseline=false, icon_size='body2', css_class="profile__logo__upload__icon") }}</a>
                 {% endif %}
                 <div class="mui--hidden-xs mui--hidden-sm profile__logo__details">
-                  <h2 class="mui--text-dark text-bold zero-bottom-margin"><a class="mui--text-dark" data-cy="profile-title" href="{{ profile.url_for() }}">{{ profile.title }}</a></h2>
+                  <h2 class="mui--text-dark text-bold zero-bottom-margin"><a class="mui--text-dark" data-testid="profile-title" href="{{ profile.url_for() }}">{{ profile.title }}</a></h2>
                   <p class="mui--text-title mui--text-light">@{{ profile.name }}</p>
                 </div>
               </div>
@@ -362,7 +362,7 @@
                 {% if profile.features.new_project() %}
                   <a class="mui-btn mui-btn--primary mui-btn--raised profile-create-btn" href="{{ profile.url_for('new_project') }} ">{{ faicon(icon='plus', icon_size='caption') }} {% trans %}New project{% endtrans %}</a>
                 {% elif profile.features.make_public() %}
-                  <a class="mui-btn mui-btn--raised mui-btn--primary profile-create-btn" href="#make-public-modal" rel="modal:open" role="button" aria-haspopup="true" data-cy="profile-public">{% trans %}Make account public{% endtrans %}</a>
+                  <a class="mui-btn mui-btn--raised mui-btn--primary profile-create-btn" href="#make-public-modal" rel="modal:open" role="button" aria-haspopup="true" data-testid="make-profile-public">{% trans %}Make account public{% endtrans %}</a>
                   <div class="modal" id="make-public-modal" role="dialog" aria-labelledby="profile-public-modal-title" aria-modal="true" tabindex="-1">
                     <div class="modal__header">
                       <a class="modal__close mui--text-dark" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
@@ -376,7 +376,7 @@
                       </ul>
                       <form action="{{ profile.url_for('transition') }}" method="post">
                         {{ profile.forms.transition().hidden_tag() }}
-                        <button name="transition" value="make_profile_public" class="mui-btn mui-btn--accent mui-btn--flat mui--pull-right" data-cy="make-public-btn">{% trans %}Make public{% endtrans %}</button>
+                        <button name="transition" value="make_profile_public" class="mui-btn mui-btn--accent mui-btn--flat mui--pull-right" data-testid="make-public-btn">{% trans %}Make public{% endtrans %}</button>
                       </form>
                     </div>
                   </div>
@@ -396,7 +396,7 @@
       <div class="grid">
         <div class="grid__col-12">
           <div class="mui--hidden-md mui--hidden-lg mui--hidden-xl">
-            <h2 class="text-bold zero-bottom-margin" data-cy="profile-title"><a href="{{ profile.url_for() }}" class="mui--text-dark">{{ profile.title }}</a></h2>
+            <h2 class="text-bold zero-bottom-margin" data-testid="profile-title"><a href="{{ profile.url_for() }}" class="mui--text-dark">{{ profile.title }}</a></h2>
             <p class="mui--text-title mui--text-light">@{{ profile.name }}</p>
           </div>
           <ul class="bullet-separated-list">
@@ -424,12 +424,12 @@
       <div class="sub-navbar-container__inner">
         <nav class="sub-navbar" id="page-navbar">
           {% if profile.is_organization_profile %}
-            <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'profile' -%}{{ profile.url_for() }}{%- endif %}" data-cy-navbar="profile">{% trans %}Home{% endtrans %}</a>
-            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'admins' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'admins' -%}{{ profile.urls['members'] }}{%- endif %}" data-cy-navbar="admins">{% trans %}Admins{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'profile' -%}{{ profile.url_for() }}{%- endif %}" data-testid="profile">{% trans %}Home{% endtrans %}</a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'admins' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'admins' -%}{{ profile.urls['members'] }}{%- endif %}" data-testid="admins">{% trans %}Admins{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
           {% elif not profile.features.is_private() %}
             <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for() }}">{% trans %}Sessions{% endtrans %}</a>
             <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'projects' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_participated_projects') }}">{% trans %}Projects{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-cy="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-testid="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
           {% endif %}
         </nav>
       </div>
diff --git a/funnel/templates/project_admin.html.jinja2 b/funnel/templates/project_admin.html.jinja2
index 85827c80b..676b39a5f 100644
--- a/funnel/templates/project_admin.html.jinja2
+++ b/funnel/templates/project_admin.html.jinja2
@@ -25,7 +25,7 @@
         <ol class="list--aligned">
           {%- for ticket_event in ticket_events %}
             <li>
-              <a href="{{ ticket_event.url_for('view') }}" class="mui--text-subhead" data-cy="{{ ticket_event.title }}" data-ga="View event">{{ ticket_event.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_event.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-ga="edit event">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
+              <a href="{{ ticket_event.url_for('view') }}" class="mui--text-subhead" data-testid="{{ ticket_event.title }}" data-ga="View event">{{ ticket_event.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_event.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-ga="edit event">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
             </li>
           {%- endfor %}
         </ol>
@@ -33,9 +33,9 @@
       {%- if project.current_roles.promoter %}
       <div class="mui-divider"></div>
       <div class="card__footer">
-        <a href="{{ project.url_for('new_event') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-cy="new-ticket-event">{% trans %}New ticketed event{% endtrans %}</a>
+        <a href="{{ project.url_for('new_event') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-testid="new-ticket-event">{% trans %}New ticketed event{% endtrans %}</a>
         {%- if ticket_events %}
-          <a href="{{ project.url_for('new_participant') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" data-cy="add-ticket-participant">{% trans %}Add ticketed participant{% endtrans %}</a>
+          <a href="{{ project.url_for('new_participant') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" data-testid="add-ticket-participant">{% trans %}Add ticketed participant{% endtrans %}</a>
         {%- endif %}
       </div>
       {%- endif %}
@@ -51,8 +51,8 @@
       <div class="card__body">
         <ol class="list--aligned">
           {%- for ticket_type in ticket_types -%}
-            <li data-cy-ticket="{{ ticket_type.title }}">
-              <a href="{{ ticket_type.url_for() }}" class="mui--text-subhead" data-ga="View ticket type">{{ ticket_type.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_type.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-cy="ticket-edit" data-ga="edit ticket type">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
+            <li data-testid="{{ ticket_type.title }}">
+              <a href="{{ ticket_type.url_for() }}" class="mui--text-subhead" data-ga="View ticket type">{{ ticket_type.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_type.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-testid="ticket-edit" data-ga="edit ticket type">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
             </li>
           {%- endfor %}
         </ol>
@@ -81,14 +81,14 @@
       </div>
       <div class="mui-divider"></div>
       <div class="card__footer">
-        <a href="{{ project.url_for('new_ticket_client') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-cy="new-ticket-client">{% trans %}New ticket client{% endtrans %}</a>
+        <a href="{{ project.url_for('new_ticket_client') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-testid="new-ticket-client">{% trans %}New ticket client{% endtrans %}</a>
         {%- if ticket_clients %}
           <form method="post" id="csrf_form-submit" enctype="multipart/form-data" class="mui-form inline-form">
             <div class="form-group">
               {{ csrf_tag() }}
               <input type="hidden" name="form.id" value="sync-tickets" />
             </div>
-            <button id="csrf_form-submit" class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" type="submit" data-cy="sync-tickets">{% trans %}Sync tickets{% endtrans %}</button>
+            <button id="csrf_form-submit" class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" type="submit" data-testid="sync-tickets">{% trans %}Sync tickets{% endtrans %}</button>
           </form>
         {%- endif %}
       </div>
diff --git a/funnel/templates/project_cfp.html.jinja2 b/funnel/templates/project_cfp.html.jinja2
index 9f9d679f7..9474c33db 100644
--- a/funnel/templates/project_cfp.html.jinja2
+++ b/funnel/templates/project_cfp.html.jinja2
@@ -49,7 +49,7 @@
     </div>
     <div class="mui-form form-actions clearfix">
       <div>
-        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" data-cy="add-cfp">{% trans %}Submit{% endtrans %}</button>
+        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" data-testid="add-cfp">{% trans %}Submit{% endtrans %}</button>
         <span class="loading mui--hide"></span>
       </div>
     </div>
diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2
index 0390bc468..c566dce23 100644
--- a/funnel/templates/project_layout.html.jinja2
+++ b/funnel/templates/project_layout.html.jinja2
@@ -45,7 +45,7 @@
 
 {% macro banner_edit_btn(project) %}
   {% if project.view_for('update_banner').is_available() %}
-    <a href="{{ project.url_for('update_banner') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn project-banner__box__add-btn--second js-modal-form" data-cy="add-project-banner" aria-label="{% trans %}Update banner image{% endtrans %}" rel="modal:open" data-ga="Update project banner">{{ faicon(icon='camera', baseline=false) }}</a>
+    <a href="{{ project.url_for('update_banner') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn project-banner__box__add-btn--second js-modal-form" data-testid="add-project-banner" aria-label="{% trans %}Update banner image{% endtrans %}" rel="modal:open" data-ga="Update project banner">{{ faicon(icon='camera', baseline=false) }}</a>
   {% endif %}
 {% endmacro %}
 
@@ -109,7 +109,7 @@
             </p>
           </div>
         {%- elif project.bg_image.url %}
-          <img class="project-banner__box__image" src="{{ project.bg_image.resize(img_size.spotlight_banner) }}" alt="{{ project.title }}" data-cy="bg_image"/>
+          <img class="project-banner__box__image" src="{{ project.bg_image.resize(img_size.spotlight_banner) }}" alt="{{ project.title }}" data-testid="bg_image"/>
         {%- else %}
           <img class="project-banner__box__image" src="{{ url_for('static', filename='img/default-banner.png') }}" alt="{{ project.title }}"/>
         {% endif %}
@@ -124,14 +124,14 @@
             <img class="project-banner__profile-details__logo_wrapper__logo" src="{{ project.account.logo_url.resize(img_size.profile_logo_small) }}" alt="{{ project.account.title }}"/>
           </a>
         {% endif %}
-        <a href="{{ project.account.url_for() }}" class="mui--text-dark mui--text-subhead text-bold nounderline project-banner__profile-details__text" data-cy="profile-link">{{ project.account.title }}</a>
+        <a href="{{ project.account.url_for() }}" class="mui--text-dark mui--text-subhead text-bold nounderline project-banner__profile-details__text" data-testid="profile-link">{{ project.account.title }}</a>
         {% if project.features.subscription and project.current_roles.participant %}
           <span class="chip chip--bg-success project-banner__profile-details__badge text-bold">{{ faicon(icon='crown-solid', baseline=true, css_class="mui--text-success fa-icon--right-margin") }}{% trans %}Member{% endtrans %}</span>
         {% elif project.features.subscription %}
           <span class="chip project-banner__profile-details__badge text-bold">{{ faicon(icon='lock-alt', baseline=true, css_class="fa-icon--right-margin") }}{% trans %}For members{% endtrans %}</span>
         {% endif %}
       </div>
-      <h1 class="text-bold zero-top-margin zero-bottom-margin"><a href="{{ project.url_for() }}" class="mui--text-dark nounderline" data-cy="project-page">{{ project.title }}</a></h1>
+      <h1 class="text-bold zero-top-margin zero-bottom-margin"><a href="{{ project.url_for() }}" class="mui--text-dark nounderline" data-testid="project-page">{{ project.title }}</a></h1>
       <p class="mui--text-heading mui--text-light zero-bottom-margin">{{ project.tagline }}</p>
     </div>
   </div>
@@ -143,7 +143,7 @@
     {%- if project.features.rsvp_registered() %}
       <span class="register-block__content__txt mui--text-light"></span>
       <a id="cancel-rsvp-btn" class="mui-btn mui-btn--accent mui-btn--raised register-block__btn js-register-btn" rel="modal:open" href="#register-modal" aria-haspopup="true">
-        <span class="register-block__btn__txt register-block__btn__txt--hover" data-cy="registered">{% if project.features.follow_mode() %}{% trans %}Following{% endtrans %}{% else %}{% trans %}Registered{% endtrans %}{% endif %}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class="mui--text-success fa-icon--left-margin") }}</span>
+        <span class="register-block__btn__txt register-block__btn__txt--hover" data-testid="registered">{% if project.features.follow_mode() %}{% trans %}Following{% endtrans %}{% else %}{% trans %}Registered{% endtrans %}{% endif %}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class="mui--text-success fa-icon--left-margin") }}</span>
         <span class="register-block__btn__txt register-block__btn__txt--hover--show">{% if project.features.follow_mode() %}{% trans %}Unfollow{% endtrans %}{% else %}{% trans %}Cancel Registration{% endtrans %}{% endif %}</span>
         <span class="register-block__btn__txt register-block__btn__txt--smaller mui--text-light register-block__btn__txt--mobile">{{ project.views.registration_text() }}</span>
       </a>
@@ -156,7 +156,7 @@
           <form action="{{ project.url_for('deregister') }}" method="post" class="form-inline">
             {{ csrf_tag() }}
             <div class="mui--text-right">
-              <button class="mui-btn mui-btn--raised" type="submit" name="submit" value="no" data-cy="cancel-rsvp">{% if project.features.follow_mode() %}{% trans %}Stop following{% endtrans %}{% else %}{% trans %}Confirm cancellation{% endtrans %}{% endif %}</button>
+              <button class="mui-btn mui-btn--raised" type="submit" name="submit" value="no" data-testid="cancel-rsvp">{% if project.features.follow_mode() %}{% trans %}Stop following{% endtrans %}{% else %}{% trans %}Confirm cancellation{% endtrans %}{% endif %}</button>
             </div>
           </form>
         </div>
@@ -167,8 +167,8 @@
       {% elif project.features.rsvp_unregistered() -%}
         {% if not project.features.follow_mode() %}<span class="register-block__content__txt mui--text-light">{% trans %}This is a free event{% endtrans %}</span>{% endif %}
         <a id="rsvp-btn" class="mui-btn mui-btn--raised mui-btn--dark register-block__btn js-register-btn" href="{{ project.url_for('rsvp_modal') }}" rel="modal:open" role="button" aria-haspopup="true">
-          <span class="register-block__btn__txt" data-cy="unregistered">{{ project.views.register_button_text() }}</span>
-          <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt" data-cy="unregistered">{{ project.views.registration_text() }}</span>
+          <span class="register-block__btn__txt" data-testid="unregistered">{{ project.views.register_button_text() }}</span>
+          <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt" data-testid="unregistered">{{ project.views.registration_text() }}</span>
         </a>
       {%- endif %}
     {% elif project.buy_tickets_url.url -%}
@@ -181,9 +181,9 @@
       <div class="register-block__content {% if project.features.rsvp() or project.buy_tickets_url.url %} register-block__content--half {%- endif %}">
           <button class="js-open-ticket-widget register-block__btn mui-btn mui-btn--primary">
             {% if project.features.subscription %}
-              <span class="register-block__btn__txt" data-cy="unregistered">{% trans %}Join{% endtrans %}</span>
+              <span class="register-block__btn__txt" data-testid="unregistered">{% trans %}Join{% endtrans %}</span>
             {%- else %}
-              <span class="register-block__btn__txt" data-cy="unregistered">{% trans %}Get tickets{% endtrans %}</span>
+              <span class="register-block__btn__txt" data-testid="unregistered">{% trans %}Get tickets{% endtrans %}</span>
             {% endif %}
             <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt js-tickets-available"><span class="js-ticket-price"></span></span>
             <span class="register-block__btn__txt register-block__btn__txt--smaller mui--text-light js-tickets-not-available mui--hide">{% trans %}Sales closed{% endtrans %}</span>
@@ -197,16 +197,16 @@
   <div class="project-header">
     <div class="bookmark">{{ saveprojectform(project, iconsize='title') }}</div>
     <div class="mui-dropdown">
-      <a href="#" onclick="return false;" class="project-links left-padding" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project" aria-label="{% trans %}Share{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
+      <a href="#" onclick="return false;" class="project-links left-padding" data-mui-toggle="dropdown" data-ga="Share dropdown" data-testid="share-project" aria-label="{% trans %}Share{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
       {{ share_dropdown(project.url_for(_external=true), project.title) }}
     </div>
     <a href="#" onclick="return false;" class="hg-link-btn mui--hide left-padding" data-url="{{ project.url_for(_external=true, utm_source='webshare') }}" role="button" aria-label="{% trans %}Share this project{% endtrans %}">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
     {% if project.state.PUBLISHED %}
-      <a class="add-calendar left-padding" href="{{ project.url_for('subscribe_schedule') }}" rel="modal:open" aria-label="{% trans %}Add to calendar{% endtrans %}" data-ga="Add to calendar" data-cy="add-to-calendar" role="button" aria-haspopup="true">{{ faicon(icon='calendar-plus', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
+      <a class="add-calendar left-padding" href="{{ project.url_for('subscribe_schedule') }}" rel="modal:open" aria-label="{% trans %}Add to calendar{% endtrans %}" data-ga="Add to calendar" data-testid="add-to-calendar" role="button" aria-haspopup="true">{{ faicon(icon='calendar-plus', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
     {% endif %}
     {% if current_auth.user and current_auth.user.is_site_editor %}
       <div class="mui-dropdown left-padding">
-        <a href="#" onclick="return false;" data-mui-toggle="dropdown" data-ga="Site editor menu" data-cy="site-editor-menu" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Site editor menu{% endtrans %}">{{ faicon(icon='user-gear-duotone', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
+        <a href="#" onclick="return false;" data-mui-toggle="dropdown" data-ga="Site editor menu" data-testid="site-editor-menu" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Site editor menu{% endtrans %}">{{ faicon(icon='user-gear-duotone', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
         <ul class="mui-dropdown__menu mui-dropdown__menu--right dropdown-menu">
           <li class="js-dropdown-toggle">
             <div class="mui--text-body2 mui--clearfix">
@@ -225,7 +225,7 @@
             </div>
           </li>
           <li>
-            <a class="mui--text-subhead" href="{{ project.url_for('add_sponsor') }}" rel="modal:open" aria-label="{% trans %}Add sponsor{% endtrans %}" data-ga="Add sponsor" data-cy="add-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='box-dollar', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Add sponsor{% endtrans %}</span></a>
+            <a class="mui--text-subhead" href="{{ project.url_for('add_sponsor') }}" rel="modal:open" aria-label="{% trans %}Add sponsor{% endtrans %}" data-ga="Add sponsor" data-testid="add-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='box-dollar', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Add sponsor{% endtrans %}</span></a>
           </li>
           <li>
             <a class="mui--text-subhead" href="{{ url_for('shortlink') }}" role="link">{{ faicon(icon='link', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Customize shortlink{% endtrans %}</span></a>
@@ -235,27 +235,27 @@
     {%- endif %}
     {%- if project.current_roles.crew -%}
       <div class="mui-dropdown left-padding">
-        <a href="#" onclick="return false;" data-mui-toggle="dropdown" data-ga="Project menu" data-cy="project-menu" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Menu{% endtrans %}">{{ faicon(icon='ellipsis-v', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
+        <a href="#" onclick="return false;" data-mui-toggle="dropdown" data-ga="Project menu" data-testid="project-menu" role="button" aria-haspopup="true" aria-expanded="false" aria-label="{% trans %}Menu{% endtrans %}">{{ faicon(icon='ellipsis-v', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
         <ul class="mui-dropdown__menu mui-dropdown__menu--right dropdown-menu">
           {%- if project.current_roles.crew -%}
             {% if project.view_for('edit_slug').is_available() %}
               <li><a class="mui--text-subhead" href="{{ project.url_for('edit_slug') }}">{{ faicon(icon='link', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit URL{% endtrans %}</span></a></li>
             {% endif %}
             {% if project.view_for('edit').is_available() %}
-              <li><a class="mui--text-subhead" href="{{ project.url_for('edit') }}" data-cy-admin="edit">{{ faicon(icon='edit', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit description{% endtrans %}</span></a></li>
+              <li><a class="mui--text-subhead" href="{{ project.url_for('edit') }}" data-testid="edit">{{ faicon(icon='edit', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit description{% endtrans %}</span></a></li>
             {% endif %}
-            <li><a class="mui--text-subhead" href="{{ project.url_for('settings') }}" data-cy-navbar="settings">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Settings{% endtrans %}</span></a></li>
+            <li><a class="mui--text-subhead" href="{{ project.url_for('settings') }}" data-testid="settings">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Settings{% endtrans %}</span></a></li>
             {% if project.view_for('labels').is_available() %}
-              <li><a class="mui--text-subhead" href="{{ project.url_for('labels') }}" data-cy-navbar="labels">{{ faicon(icon='tag', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Manage labels{% endtrans %}</span></a></li>
+              <li><a class="mui--text-subhead" href="{{ project.url_for('labels') }}" data-testid="labels">{{ faicon(icon='tag', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Manage labels{% endtrans %}</span></a></li>
             {% endif %}
             {% if project.view_for('venues').is_available() %}
-              <li><a class="mui--text-subhead" href="{{ project.url_for('venues') }}" data-cy-navbar="edit-venue">{{ faicon(icon='map-marker-alt', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Update venue{% endtrans %}</span></a></li>
+              <li><a class="mui--text-subhead" href="{{ project.url_for('venues') }}" data-testid="edit-venue">{{ faicon(icon='map-marker-alt', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Update venue{% endtrans %}</span></a></li>
             {% endif %}
             {% if project.view_for('rsvp_list').is_available() %}
-              <li><a class="mui--text-subhead" href="{{ project.url_for('rsvp_list') }}" data-cy="see-responses">{{ faicon(icon='users', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}View participants{% endtrans %}</span></a></li>
+              <li><a class="mui--text-subhead" href="{{ project.url_for('rsvp_list') }}" data-testid="see-responses">{{ faicon(icon='users', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}View participants{% endtrans %}</span></a></li>
             {% endif %}
             {% if project.view_for('proposals_csv').is_available() %}
-              <li><a class="mui--text-subhead" href="{{ project.url_for('proposals_csv') }}" data-cy="submissions-csv">{{ faicon(icon='download', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Download submissions CSV{% endtrans %}</span></a></li>
+              <li><a class="mui--text-subhead" href="{{ project.url_for('proposals_csv') }}" data-testid="submissions-csv">{{ faicon(icon='download', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Download submissions CSV{% endtrans %}</span></a></li>
             {% endif %}
           {%- endif %}
         </ul>
@@ -332,7 +332,7 @@
             </a>
           </div>
         </div>
-        <a href="{{ project.account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{{ project.account.title }}</a>
+        <a href="{{ project.account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-testid="profile-card-link">{{ project.account.title }}</a>
       </div>
       {% if project.account.description.html %}
         <div class="mui--text-body2 mui--text-light margin-bottom">{{ project.account.description.html|preview(min=200, max=300) }} <a href="{{ project.account.absolute_url }}" class="chip mui--text-body2 nounderline">{% trans %}more{% endtrans %}{{ faicon(icon='caret-right-solid', baseline=false, css_class="mui--align-middle") }}</a></div>
@@ -348,7 +348,7 @@
       {% if current_auth.user and current_auth.user.is_site_editor %}
         <div id="{{ sponsorship.uuid_b58 }}" class="sortable" data-drag-placeholder="ui-box-placeholder" draggable="true">
       {%- endif %}
-      <div class="card card--shaped card--lessmargin" data-cy="sponsor-card">
+      <div class="card card--shaped card--lessmargin" data-testid="sponsor-card">
         <div class="card__body margin-bottom">
           <div class="flex-wrapper flex-wrapper--center flex-wrapper--space-between">
             <div>
@@ -372,17 +372,17 @@
                 </a>
               </div>
             </div>
-            <a {% if sponsor_public %}href="{{ sponsorship.member.absolute_url }}"{% endif %} class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{{ sponsorship.member.title }}</a>
+            <a {% if sponsor_public %}href="{{ sponsorship.member.absolute_url }}"{% endif %} class="mui--text-dark mui--text-subhead text-bold nounderline" data-testid="sponsor-link">{{ sponsorship.member.title }}</a>
             {% if current_auth.user and current_auth.user.is_site_editor %}
-              <a href="{{ sponsorship.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Edit sponsor{% endtrans %}" data-ga="Edit sponsor" data-cy="edit-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='edit', baseline=false, css_class="mui--text-light mui--align-middle fa-icon--left-margin fa-icon--right-margin") }}</a>
-              <a href="{{ sponsorship.url_for('remove') }}" rel="modal:open" aria-label="{% trans %}Remove sponsor{% endtrans %}" data-ga="Remove sponsor" data-cy="remove-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='trash-alt', baseline=false, css_class="mui--text-light mui--align-middle") }}</a>
+              <a href="{{ sponsorship.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Edit sponsor{% endtrans %}" data-ga="Edit sponsor" data-testid="edit-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='edit', baseline=false, css_class="mui--text-light mui--align-middle fa-icon--left-margin fa-icon--right-margin") }}</a>
+              <a href="{{ sponsorship.url_for('remove') }}" rel="modal:open" aria-label="{% trans %}Remove sponsor{% endtrans %}" data-ga="Remove sponsor" data-testid="remove-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='trash-alt', baseline=false, css_class="mui--text-light mui--align-middle") }}</a>
             {% endif %}
           </div>
           {% if sponsorship.member.description.html %}
             <div class="mui--text-body2 mui--text-light margin-bottom">{{ sponsorship.member.description.html|preview(min=200, max=300) }} {% if sponsor_public %}<a href="{{ sponsorship.member.absolute_url }}" class="chip mui--text-body2 nounderline">{% trans %}more{% endtrans %}{{ faicon(icon='caret-right-solid', baseline=false, css_class="mui--align-middle") }}</a>{% endif %}</div>
           {% endif %}
           {% if sponsorship.is_promoted %}
-            <div class="margin-bottom"><p class="mui--text-body2 text-bold mui--text-light zero-bottom-margin">{{ faicon(icon='angle-double-up', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span data-cy="promoted">{% trans %}Promoted{% endtrans %}</span></p></div>
+            <div class="margin-bottom"><p class="mui--text-body2 text-bold mui--text-light zero-bottom-margin">{{ faicon(icon='angle-double-up', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span data-testid="promoted">{% trans %}Promoted{% endtrans %}</span></p></div>
           {% endif %}
         </div>
       </div>
@@ -458,22 +458,22 @@
       <div class="mui-container">
         <div class="sub-navbar-container__inner">
           <nav class="sub-navbar" id="page-navbar">
-            <a id="overview" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'project' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for() }}" data-cy-navbar="about">{% trans %}Project overview{% endtrans %}</a>
+            <a id="overview" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'project' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for() }}" data-testid="about">{% trans %}Project overview{% endtrans %}</a>
             {%- if project.hasjob_embed_url.url -%}
-              <a class="sub-navbar__item mui--text-subhead mui--text-dark" href="{{ project.url_for() }}#related-jobs" data-cy-navbar="jobs">{% trans %}Jobs{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+              <a class="sub-navbar__item mui--text-subhead mui--text-dark" href="{{ project.url_for() }}#related-jobs" data-testid="jobs">{% trans %}Jobs{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- endif %}
-            <a id="updates" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'updates' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('updates') }}" data-cy-navbar="updates">{% trans %}Updates{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-            <a id="comments" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'comments' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('comments') }}" data-cy-navbar="comments">{% trans %}Comments{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a id="updates" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'updates' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('updates') }}" data-testid="updates">{% trans %}Updates{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a id="comments" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'comments' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('comments') }}" data-testid="comments">{% trans %}Comments{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- if project.current_roles.editor or not project.cfp_state.NONE -%}
-              <a id="submissions" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('view_proposals') }}" data-cy-navbar="submissions">{% trans %}Submissions{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+              <a id="submissions" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('view_proposals') }}" data-testid="submissions">{% trans %}Submissions{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- endif %}
             {%- if project.current_roles.editor or project.schedule_start_at or current_page == 'schedule' %}
-              <a id="schedule" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'schedule' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('schedule') }}" data-cy-navbar="schedule">{% trans %}Schedule{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+              <a id="schedule" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'schedule' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('schedule') }}" data-testid="schedule">{% trans %}Schedule{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- endif %}
             {% if project.has_sessions_with_video %}
-              <a id="videos" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'videos' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('session_videos') }}" data-cy-navbar="videos">{% trans %}Videos{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+              <a id="videos" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'videos' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('session_videos') }}" data-testid="videos">{% trans %}Videos{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- endif %}
-            <a id="crew" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'crew' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('crew') }}" data-cy-navbar="crew">{% trans %}Crew{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a id="crew" class="js-spa-navigate sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'crew' %}sub-navbar__item--active{%- endif %}" href="{{ project.url_for('crew') }}" data-testid="crew">{% trans %}Crew{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
           </nav>
           <div class="{% if current_page == 'comments' %}comments-page{%- endif %}">
             {{ project_share(project) }}
diff --git a/funnel/templates/project_rsvp_list.html.jinja2 b/funnel/templates/project_rsvp_list.html.jinja2
index b844277f1..788c88533 100644
--- a/funnel/templates/project_rsvp_list.html.jinja2
+++ b/funnel/templates/project_rsvp_list.html.jinja2
@@ -21,7 +21,7 @@
         <tbody>
           {%- for rsvp in going_rsvps %}
             <tr>
-              <td data-cy="username">{{ rsvp.participant.fullname }}</td>
+              <td data-testid="username">{{ rsvp.participant.fullname }}</td>
               <td>
                 {% with contact, contact_type = rsvp.best_contact() %}
                   {{ contact }}
@@ -30,7 +30,7 @@
                   {% endif %}
                 {%- endwith %}
               </td>
-              <td data-cy="user" data-value="{{ rsvp.updated_at|timestamp }}">{{ rsvp.updated_at|datetime }}</td>
+              <td data-testid="user" data-value="{{ rsvp.updated_at|timestamp }}">{{ rsvp.updated_at|datetime }}</td>
               {% if rsvp_form_fields -%}
                 {% for field_name in rsvp_form_fields %}
                   <td>{{ rsvp.form.get(field_name, '') }}</td>
diff --git a/funnel/templates/project_settings.html.jinja2 b/funnel/templates/project_settings.html.jinja2
index 7532ecada..2b021b324 100644
--- a/funnel/templates/project_settings.html.jinja2
+++ b/funnel/templates/project_settings.html.jinja2
@@ -11,12 +11,12 @@
       <div>
         {%- if transition_form %}
           <div>
-            <p class="mui--text-subhead text-bold margin-bottom" data-cy="project-state">{% trans status=project.state.label.title %}Project status: {{ status }}{% endtrans %}</p>
+            <p class="mui--text-subhead text-bold margin-bottom" data-testid="project-state">{% trans status=project.state.label.title %}Project status: {{ status }}{% endtrans %}</p>
             <form action="{{ project.url_for('transition') }}" method="post" class="form-inline">
               {{ transition_form.hidden_tag() }}
               <p class="btn-group">
                 {% for name, transition in transition_form.transition.choices %}
-                  <button name="transition" value="{{ name }}" class="transition mui-btn mui-btn--small mui-btn--raised {% if transition.data['type'] == 'success' %} mui-btn--primary {% elif transition.data['type'] == 'danger' %} mui-btn--danger {%- endif %}" title="{{ transition.data['title'] }}" data-cy-state="{{ name }}">{{ transition.data['title'] }}</button>
+                  <button name="transition" value="{{ name }}" class="transition mui-btn mui-btn--small mui-btn--raised {% if transition.data['type'] == 'success' %} mui-btn--primary {% elif transition.data['type'] == 'danger' %} mui-btn--danger {%- endif %}" title="{{ transition.data['title'] }}" data-testid="{{ name }}">{{ transition.data['title'] }}</button>
                 {% endfor %}
               </p>
             </form>
@@ -26,7 +26,7 @@
         {{ open_submission(project) }}
         {%- if project.view_for('cfp').is_available() %}
           <div class="bottom-padding">
-            <p class="zero-bottom-margin"><a href="{{ project.url_for('cfp') }}" class="mui--text-subhead mui--text-light text-bold nounderline" data-cy="add-cfp">{% trans %}Edit guidelines and timing{% endtrans %}{{ faicon(icon='pencil', icon_size='caption', baseline=false, css_class="mui--text-dark margin-left") }}</a></p>
+            <p class="zero-bottom-margin"><a href="{{ project.url_for('cfp') }}" class="mui--text-subhead mui--text-light text-bold nounderline" data-testid="add-cfp">{% trans %}Edit guidelines and timing{% endtrans %}{{ faicon(icon='pencil', icon_size='caption', baseline=false, css_class="mui--text-dark margin-left") }}</a></p>
           </div>
         {%- endif %}
       </div>
@@ -40,7 +40,7 @@
         <ul class="mui-list--unstyled list--border list--border--padding">
         {% if project.view_for('edit').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('edit') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="edit"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='align-left', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Frontmatter{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Title, tagline, banner, description, location and timezone{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('edit') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="edit"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='align-left', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Frontmatter{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Title, tagline, banner, description, location and timezone{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('edit_slug').is_available() %}
@@ -50,7 +50,7 @@
         {% endif %}
         {% if project.view_for('edit_livestream').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('edit_livestream') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="add-livestream"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='video', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Livestream{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Embed a livestream (hosted on YouTube or Vimeo){% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('edit_livestream') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="add-livestream"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='video', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Livestream{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Embed a livestream (hosted on YouTube or Vimeo){% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('cfp').is_available() -%}
@@ -60,37 +60,37 @@
         {%- endif %}
         {% if project.view_for('labels').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('labels') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="manage-labels"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='tag', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Labels{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Manage workflow labels for submissions{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('labels') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="manage-labels"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='tag', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Labels{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Manage workflow labels for submissions{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('edit_schedule').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('edit_schedule') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="edit-schedule"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='calendar-alt', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Schedule{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Set dates and times for individual sessions{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('edit_schedule') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="edit-schedule"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='calendar-alt', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Schedule{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Set dates and times for individual sessions{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('rsvp_list').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('rsvp_list') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="see-responses"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='users', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Participants{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}See the list of participants{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('rsvp_list') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="see-responses"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='users', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Participants{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}See the list of participants{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('venues').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('venues') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="manage-venues"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='map-marker-alt', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Venues{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Manage venues for in-person events{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('venues') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="manage-venues"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='map-marker-alt', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Venues{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Manage venues for in-person events{% endtrans %}</span></span></a>
           </li>
         {%- endif %}
         {% if project.view_for('edit_boxoffice_data').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('edit_boxoffice_data') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="add-tickets"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='ticket-alt', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span><span class="setting flex-wrapper"><span class="setting__name mui--text-subhead">{% trans %}Tickets{% endtrans %}<span class="badge margin-left">{% trans %}Beta{% endtrans %}</span></span><span class="setting__sub mui--text-light">{% trans %}Add the ticketing widget{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('edit_boxoffice_data') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="add-tickets"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='ticket-alt', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span><span class="setting flex-wrapper"><span class="setting__name mui--text-subhead">{% trans %}Tickets{% endtrans %}<span class="badge margin-left">{% trans %}Beta{% endtrans %}</span></span><span class="setting__sub mui--text-light">{% trans %}Add the ticketing widget{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('admin').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('admin') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="setup-ticket-events"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='list', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Events{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Setup ticketed events for check-in at venues{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('admin') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="setup-ticket-events"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='list', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Events{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Setup ticketed events for check-in at venues{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         {% if project.view_for('ticket_events').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('ticket_events') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="scan-checkin"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='barcode-read', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Badge scanner{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Scan participant badges at in-person events{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('ticket_events') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="scan-checkin"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='barcode-read', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Badge scanner{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Scan participant badges at in-person events{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         </ul>
diff --git a/funnel/templates/project_sponsor_popup.html.jinja2 b/funnel/templates/project_sponsor_popup.html.jinja2
index 8502495e1..9af9c138e 100644
--- a/funnel/templates/project_sponsor_popup.html.jinja2
+++ b/funnel/templates/project_sponsor_popup.html.jinja2
@@ -4,7 +4,7 @@
 <link rel="stylesheet" type="text/css" href="{{ manifest('css/form.css') }}" />
 
 <div class="modal__header">
-  <a class="modal__close mui--text-dark" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size="title") }}</a>
+  <a class="modal__close mui--text-dark" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size="title") }}</a>
 </div>
 <div class="modal__body proposal__admin-panel">
   <div class="modal--form {% if sponsorship %}modal--form--edit{% endif %}">
@@ -18,7 +18,7 @@
         {% if form.csrf_token and form.csrf_token.errors %}
           <p class="mui-form--error">{% trans %}This form timed out because it was open for a long time. Please submit again{% endtrans %}</p>
         {% endif %}
-        <a class="mui-btn mui-btn--raised mui-btn--default" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{% trans %}Cancel{% endtrans %}</a>
+        <a class="mui-btn mui-btn--raised mui-btn--default" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{% trans %}Cancel{% endtrans %}</a>
         <input class="mui-btn mui-btn--raised mui-btn--danger" type="submit" name="delete" value="{% trans %}Remove{% endtrans %}"/>
       </form>
     {% endif %}
diff --git a/funnel/templates/project_submissions.html.jinja2 b/funnel/templates/project_submissions.html.jinja2
index f79aad387..6bb054de3 100644
--- a/funnel/templates/project_submissions.html.jinja2
+++ b/funnel/templates/project_submissions.html.jinja2
@@ -18,7 +18,7 @@
     <div class="project-section">
       <div class="about__details" id="call-for-proposal">
         {%- if project.view_for('cfp').is_available() %}
-          <p class="margin-bottom"><a href="{{ project.url_for('cfp') }}" class="mui--text-subhead mui--text-dark text-bold nounderline" data-cy="add-cfp">{% trans %}Edit guidelines and timing{% endtrans %}{{ faicon(icon='pencil', icon_size='caption', baseline=false, css_class="mui--text-dark margin-left") }}</a></p>
+          <p class="margin-bottom"><a href="{{ project.url_for('cfp') }}" class="mui--text-subhead mui--text-dark text-bold nounderline" data-testid="add-cfp">{% trans %}Edit guidelines and timing{% endtrans %}{{ faicon(icon='pencil', icon_size='caption', baseline=false, css_class="mui--text-dark margin-left") }}</a></p>
         {%- endif %}
         {%- if project.instructions and project.instructions != "None" %}
           <div class="about__details__description margin-bottom">
diff --git a/funnel/templates/project_updates.html.jinja2 b/funnel/templates/project_updates.html.jinja2
index 5244ff733..4ead2f1a1 100644
--- a/funnel/templates/project_updates.html.jinja2
+++ b/funnel/templates/project_updates.html.jinja2
@@ -15,7 +15,7 @@
   <div class="page-card page-card--nomargin">
     <div id="updates" class="project-section">
       {% if project.features.post_update() -%}
-        <a class="update-form-block" href="{{ project.url_for('new_update') }}" aria-label="{% trans %}Add new update{% endtrans %}" data-cy-btn="add-update">
+        <a class="update-form-block" href="{{ project.url_for('new_update') }}" aria-label="{% trans %}Add new update{% endtrans %}" data-testid="add-update">
           <div class="user">
             <div class="user__box">
               {{ useravatar(current_auth.user, add_profile_link=false) }}
diff --git a/funnel/templates/rsvp_modal.html.jinja2 b/funnel/templates/rsvp_modal.html.jinja2
index c4c5b4565..f432fba0d 100644
--- a/funnel/templates/rsvp_modal.html.jinja2
+++ b/funnel/templates/rsvp_modal.html.jinja2
@@ -4,7 +4,7 @@
 <link rel="stylesheet" type="text/css" href="{{ manifest('css/form.css') }}" />
 
 <div class="modal__header">
-  <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close subscribe modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
+  <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close subscribe modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
   <p class="mui--text-title text-bold mui--text-dark" id="confirm-rsvp">{{ faicon(icon='info-circle', baseline=true, icon_size='subhead') }} {% trans %}Register{% endtrans %}</p>
 </div>
 <div class="modal__body">
@@ -16,7 +16,7 @@
     </div>
     <p class="mui--text-body2 top-padding zero-bottom-margin">{% trans %}This will share your name and email address or phone number with the project’s promoter so they can keep you updated. You can cancel your registration at any time{% endtrans %}</p>
     <div class="mui--text-right">
-      <button class="mui-btn mui-btn--raised" type="submit" name="submit" value="yes" data-cy="confirm">{% trans %}Confirm{% endtrans %}</button>
+      <button class="mui-btn mui-btn--raised" type="submit" name="submit" value="yes" data-testid="confirm">{% trans %}Confirm{% endtrans %}</button>
     </div>
   </form>
   {{ json_form_template() }}
diff --git a/funnel/templates/schedule_edit.html.jinja2 b/funnel/templates/schedule_edit.html.jinja2
index 6951d4298..3876c5074 100644
--- a/funnel/templates/schedule_edit.html.jinja2
+++ b/funnel/templates/schedule_edit.html.jinja2
@@ -10,7 +10,7 @@
 {% endblock pageheaders %}
 
 {% block top_title %}
-  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}" data-cy="project-page">{{ project.title }}</a></h1>
+  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}" data-testid="project-page">{{ project.title }}</a></h1>
 {% endblock top_title %}
 
 {% block basecontent %}
@@ -32,13 +32,13 @@
         <ul class="mui-tabs__bar mui-tabs__bar--pills mui-tabs__bar--pills--wraps" role="tablist">
           <li class="mui--text-subhead mui--is-active" role="presentation">
             <a href="#" onclick="return false;" data-mui-toggle="tab" data-mui-controls="list"
-              data-cy-tab="proposals" aria-controls="list" id="tab-list" role="tab"
+              data-testid="proposals" aria-controls="list" id="tab-list" role="tab"
               tabindex="0" aria-selected="true"
             >{% trans %}Unscheduled submissions{% endtrans %}</a>
           </li>
           <li class="mui--text-subhead" role="presentation">
             <a href="#" onclick="return false;" data-mui-toggle="tab" data-mui-controls="settings"
-              data-cy-tab="settings" aria-controls="settings" id="tab-settings" role="tab"
+              data-testid="settings" aria-controls="settings" id="tab-settings" role="tab"
               tabindex="-1" aria-selected="false"
             >{% trans %}Settings{% endtrans %}</a>
           </li>
@@ -70,7 +70,7 @@
               <div class="ui-draggable-box ui-draggable-box--header">
                 <input name="venue-seq" value="{{ venue.seq }}" readonly class="seq-input" data-venue="{{ venue.uuid_b58 }}" />
                 <div class="collapsible">
-                  <div class="collapsible__header" data-cy-collapsible="open">
+                  <div class="collapsible__header" data-testid-collapsible="open">
                     <input type="hidden" name="uuid" value="{{ venue.uuid_b58 }}" />
                     {{ faicon(icon='grip-vertical', icon_size='caption', baseline=false, css_class="mui--text-light drag-icon drag-handle") }}
                     <span class="mui--text-subhead">{{ venue.title }}</span>
diff --git a/funnel/templates/schedule_subscribe.html.jinja2 b/funnel/templates/schedule_subscribe.html.jinja2
index 8322e89b4..e5e380534 100644
--- a/funnel/templates/schedule_subscribe.html.jinja2
+++ b/funnel/templates/schedule_subscribe.html.jinja2
@@ -1,7 +1,7 @@
 {% from "macros.html.jinja2" import faicon %}
 
-<div class="modal__header" data-cy="schedule-subscribe">
-  <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close subscribe modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
+<div class="modal__header" data-testid="schedule-subscribe">
+  <a class="modal__close mui--text-dark" href="#" onclick="return false;" data-target="close subscribe modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-modal" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
   <p class="mui--text-title text-bold mui--text-dark">{% trans %}Subscribe to the schedule{% endtrans %}</p>
 </div>
 <div class="modal__body">
diff --git a/funnel/templates/session_view_popup.html.jinja2 b/funnel/templates/session_view_popup.html.jinja2
index 807cd25aa..f202af95d 100644
--- a/funnel/templates/session_view_popup.html.jinja2
+++ b/funnel/templates/session_view_popup.html.jinja2
@@ -1,15 +1,15 @@
 {%- from "macros.html.jinja2" import faicon, embed_video_player, video_action_bar, share_dropdown %}
 
 <div class="modal__header bg-accent">
-  <a class="modal__close mui--text-dark" data-target="close session modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-modal" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
-  <h3 class="js-modal-title mui--text-headline session-modal__title" data-cy-session="title">{{ session.title }}</h3>
+  <a class="modal__close mui--text-dark" data-target="close session modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-modal" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
+  <h3 class="js-modal-title mui--text-headline session-modal__title" data-testid="title">{{ session.title }}</h3>
   <div class="mui--clearfix">
     {% if session.speaker %}
-      <p class="mui--text-subhead modal__header__text" data-cy-session="speaker">{{ faicon(icon='microphone-alt') }} {{ session.speaker }}</p>
+      <p class="mui--text-subhead modal__header__text" data-testid="speaker">{{ faicon(icon='microphone-alt') }} {{ session.speaker }}</p>
     {% endif %}
     <div class="mui--pull-left modal__header__heading">
       {% if session.scheduled %}
-        <p class="mui--text-subhead modal__header__text" data-cy-session="time">{{ faicon(icon='calendar-alt') }} {{ session.start_at_localized|date }}, {{ session.start_at_localized|time }}–{{ session.end_at_localized|time }}
+        <p class="mui--text-subhead modal__header__text" data-testid="time">{{ faicon(icon='calendar-alt') }} {{ session.start_at_localized|date }}, {{ session.start_at_localized|time }}–{{ session.end_at_localized|time }}
         </p>
       {% else %}
         <p class="mui--text-subhead modal__header__text">
@@ -17,12 +17,12 @@
         </p>
       {% endif %}
       {% if session.venue_room %}
-        <p class="mui--text-subhead modal__header__text" data-cy-session="room">{{ faicon(icon='map-marker-alt') }} {{ session.venue_room.title }}, {{ session.venue_room.venue.title }}</p>
+        <p class="mui--text-subhead modal__header__text" data-testid="room">{{ faicon(icon='map-marker-alt') }} {{ session.venue_room.title }}, {{ session.venue_room.venue.title }}</p>
       {% endif %}
     </div>
     <div class="mui-dropdown mui--pull-right">
       <a href="#" onclick="return false;" class="hg-link-btn mui--hide left-padding" data-url="{{ session.url_for(_external=true, utm_source='webshare') }}" role="button" aria-label="{% trans %}Share this session{% endtrans %}">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class="mui--text-light") }}</a>
-      <a href="#" onclick="return false;" class="project-links left-padding" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project" aria-label="{% trans %}Share{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='share-alt', baseline=true, icon_size='subhead', css_class="mui--text-light") }}</a>
+      <a href="#" onclick="return false;" class="project-links left-padding" data-mui-toggle="dropdown" data-ga="Share dropdown" data-testid="share-project" aria-label="{% trans %}Share{% endtrans %}" role="button" aria-haspopup="true" aria-expanded="false">{{ faicon(icon='share-alt', baseline=true, icon_size='subhead', css_class="mui--text-light") }}</a>
       {{ share_dropdown(session.url_for(_external=true), session.title) }}
     </div>
   </div>
@@ -33,7 +33,7 @@
     {%- if not session.is_restricted_video or session.current_roles.project_participant %}
       <div class="details">
         <div class="details__box details__box--left">
-          <div class="details__box__video bg-primary-dark embed-video-wrapper" data-cy="session-video">
+          <div class="details__box__video bg-primary-dark embed-video-wrapper" data-testid="session-video">
             {{ embed_video_player(session.views.video) }}
           </div>
           <div class="details__box__control">
@@ -62,7 +62,7 @@
             <p class="mui--text-light">{% trans %}The session has no attached video{% endtrans %}</p>
             {% if not session.views.video and session.project.current_roles.editor %}
               <div>
-                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ session.url_for('edit') }}" data-cy-admin="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
+                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ session.url_for('edit') }}" data-testid="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
               </div>
             {%- endif %}
           </div>
@@ -71,7 +71,7 @@
     </div>
   {%- endif %}
   {% if session.proposal %}
-    <p class="separator zero-bottom-margin"><a class="mui--text-subhead" href="{{ session.proposal.url_for('view') }}" target="_blank" rel="noopener" data-cy="view-proposal">{{ faicon(icon='presentation') }} {% trans %}View submission for this session{% endtrans %}</a></p>
+    <p class="separator zero-bottom-margin"><a class="mui--text-subhead" href="{{ session.proposal.url_for('view') }}" target="_blank" rel="noopener" data-testid="view-proposal">{{ faicon(icon='presentation') }} {% trans %}View submission for this session{% endtrans %}</a></p>
   {% endif %}
   {% if session.views.video or session.proposal %}
   <hr class="modal__body__separator" />
diff --git a/funnel/templates/submission.html.jinja2 b/funnel/templates/submission.html.jinja2
index 130dbd662..8af5722a8 100644
--- a/funnel/templates/submission.html.jinja2
+++ b/funnel/templates/submission.html.jinja2
@@ -28,7 +28,7 @@
     onclick="return false;"
     class="hg-link-btn mui--hide mui--text-dark"
     data-ga="Share dropdown"
-    data-cy="share-project"
+    data-testid="share-project"
     data-url="{{ proposal.url_for(_external=true, utm_source='webshare') }}"
     aria-label="{% trans %}Share{% endtrans %}">{{ faicon(icon='share-alt', icon_size=icon_size, baseline=false, css_class="mui--align-middle") }}</a>
   <div class="mui-dropdown">
@@ -37,7 +37,7 @@
       class="project-links mui--text-dark"
       data-mui-toggle="dropdown"
       data-ga="Share dropdown"
-      data-cy="share-project"
+      data-testid="share-project"
       role="button"
       aria-haspopup="true"
       aria-expanded="false"
@@ -52,7 +52,7 @@
         class="mui--text-dark"
         data-mui-toggle="dropdown"
         data-ga="Subscribe"
-        data-cy="subscribe-proposal"
+        data-testid="subscribe-proposal"
         aria-label="
           {%- if subscribed -%}
             {% trans %}Unsubscribe{% endtrans %}
@@ -68,7 +68,7 @@
         {%- endif -%}
       </a>
       <ul class="mui-dropdown__menu mui-dropdown__menu--right"
-          data-cy="share-dropdown">
+          data-testid="share-dropdown">
         <form action="{{ proposal.commentset.url_for('subscribe') }}"
               method="post"
               class="display-inlineblock proposal-subscribe-form"
@@ -80,7 +80,7 @@
                   value="false"
                   class="mui--text-body2 mui--hide js-subscribe-btn"
                   id="cancel-subscription"/>
-            <label class="link" for="cancel-subscription" data-cy="cancel-subscription">
+            <label class="link" for="cancel-subscription" data-testid="cancel-subscription">
               {{ faicon(icon='bell-slash', baseline=true, css_class="mui--text-light fa-icon--right-margin") }}{% trans %}Stop notifications{% endtrans %}
             </label>
           </li>
@@ -90,7 +90,7 @@
                   value="true"
                   class="mui--text-body2 mui--hide js-subscribe-btn"
                   id="confirm-subscription"/>
-            <label class="link" for="confirm-subscription" data-cy="subscription">
+            <label class="link" for="confirm-subscription" data-testid="subscription">
               {{ faicon(icon='bell', baseline=true, css_class="mui--text-light fa-icon--right-margin") }}{% trans %}Get notifications{% endtrans %}
             </label>
           </li>
@@ -105,7 +105,7 @@
         class="mui--text-dark"
         data-mui-toggle="dropdown"
         aria-label="{% trans %}Menu{% endtrans %}"
-        data-cy="proposal-menu"
+        data-testid="proposal-menu"
         role="button"
         aria-haspopup="true"
         aria-expanded="false">{{ faicon(icon='ellipsis-v', baseline=false, icon_size=icon_size, css_class="mui--align-middle fa-icon--left-margin") }}</a>
@@ -114,12 +114,12 @@
           <li>
             <a class="mui--text-subhead"
               href="{{ proposal.url_for('edit') }}"
-              data-cy-admin="edit">{{ faicon(icon='edit', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit submission{% endtrans %}</span></a>
+              data-testid="edit">{{ faicon(icon='edit', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit submission{% endtrans %}</span></a>
           </li>
           <li>
             <a class="mui--text-subhead"
               href="{{ proposal.url_for('edit') }}#field-video_url"
-              data-cy="edit-proposal-video">{{ faicon(icon='video-plus', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">
+              data-testid="edit-proposal-video">{{ faicon(icon='video-plus', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">
               {%- if proposal.views.video -%}
                 {% trans %}Replace video{% endtrans %}
               {%- else -%}
@@ -131,21 +131,21 @@
             <a class="mui--text-subhead"
               href="{{ proposal.url_for('delete') }}"
               class="mui--text-danger"
-              data-cy-admin="delete">{{ faicon(icon='trash-alt', icon_size='subhead', baseline=false, css_class="mui--text-danger fa-icon--right-margin mui--align-middle") }}<span class="mui--text-danger mui--text-body2">{% trans %}Delete{% endtrans %}</span></a>
+              data-testid="delete">{{ faicon(icon='trash-alt', icon_size='subhead', baseline=false, css_class="mui--text-danger fa-icon--right-margin mui--align-middle") }}<span class="mui--text-danger mui--text-body2">{% trans %}Delete{% endtrans %}</span></a>
           </li>
         {%- endif %}
         {%- if proposal.current_roles.project_editor %}
           <li>
             <a class="mui--text-subhead"
               href="{{ proposal.url_for('contacts_json') }}"
-              data-cy-admin="view contact details">{{ faicon(icon='eye', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}View contact details{% endtrans %}</span></a>
+              data-testid="view contact details">{{ faicon(icon='eye', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}View contact details{% endtrans %}</span></a>
           </li>
           <li>
             <a href="{{ proposal.url_for('admin') }}"
               class="mui--text-subhead"
               rel="modal:open"
               aria-label="{% trans %}Editor panel{% endtrans %}"
-              data-cy="editor-panel">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Editor panel{% endtrans %}</span></a>
+              data-testid="editor-panel">{{ faicon(icon='cog', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Editor panel{% endtrans %}</span></a>
           </li>
           <li>
             <div class="mui--text-body2 mui--clearfix js-dropdown-toggle">
@@ -177,14 +177,14 @@
           <li>
             <a class="mui--text-subhead"
               href="{{ proposal.session.url_for('edit') }}"
-              data-cy="edit-session"
+              data-testid="edit-session"
               aria-label="{% trans %}Edit session{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">{% trans %}Edit session{% endtrans %}</span>
             </a>
           </li>
           <li>
             <a class="mui--text-subhead"
               href="{{ proposal.session.url_for('edit') }}#field-video_url"
-              data-cy="edit-session-video"
+              data-testid="edit-session-video"
               aria-label="{% trans %}Edit session video{% endtrans %}">{{ faicon(icon='video-plus', icon_size='subhead', baseline=false, css_class="mui--text-light fa-icon--right-margin mui--align-middle") }}<span class="mui--text-body2">
               {%- if proposal.session.views.video -%}
                 {% trans %}Replace session video{% endtrans %}
@@ -241,7 +241,7 @@
             <div class="mui-tabs__pane {% if seq==1 %}mui--is-active{%- endif -%}"
                 id="pane-justified-{{ seq }}">
               <div class="details__box__video bg-primary-dark embed-video-wrapper"
-                  data-cy="session-video">
+                  data-testid="session-video">
                 {{ embed_video_player(proposal.session.views.video) }}
               </div>
               <div class="details__box__control mui--clearfix">
@@ -254,7 +254,7 @@
             <div class="mui-tabs__pane {% if seq == 1 %}mui--is-active{%- endif -%}"
                 id="pane-justified-{{ seq }}">
               <div class="details__box__video bg-primary-dark embed-video-wrapper"
-                  data-cy="proposal-video">
+                  data-testid="proposal-video">
                 {{ embed_video_player(proposal.views.video) }}
               </div>
               <div class="details__box__control mui--clearfix">
@@ -289,7 +289,7 @@
                     <div class="display-inlineblock">
                       <img src="{{ proposal.session.views.video.thumbnail }}"
                             class="img-responsive"
-                            data-cy="session-video-thumbnail"
+                            data-testid="session-video-thumbnail"
                             alt="{% trans %}Session video{% endtrans %}"/>
                       <span class="gallery__thumbnail__play-icon">
                         {{ faicon(icon='lock-alt', icon_size='headline', baseline=false) }}
@@ -304,7 +304,7 @@
                     aria-label="{% trans %}Play video{% endtrans %}">
                       <img src="{{ proposal.session.views.video.thumbnail }}"
                           class="img-responsive"
-                          data-cy="session-video-thumbnail"
+                          data-testid="session-video-thumbnail"
                           alt="{% trans %}Session video{% endtrans %}"/>
                       <span class="gallery__thumbnail__play-icon">{{ faicon(icon='play', icon_size='headline', baseline=false) }}</span>
                     </a>
@@ -320,7 +320,7 @@
                       data-mui-controls="pane-justified-{{ seq_pane }}">
                       <img src="{{ proposal.views.video.thumbnail }}"
                           class="img-responsive"
-                          data-cy="proposal-video-thumbnail"
+                          data-testid="proposal-video-thumbnail"
                           alt="{% trans %}Submission video{% endtrans %}"/>
                       <div class="overlay"></div>
                       <div class="gallery__thumbnail__play-icon">
@@ -375,7 +375,7 @@
       <div class="mobile-header-right">
         {{ share_widget(formid="desktop", icon_size='subhead') }}
       </div>
-      <h2 class="text-bold" data-cy="proposal-title">
+      <h2 class="text-bold" data-testid="proposal-title">
         {{ proposal.title }}
       </h2>
       <p class="mui--text-caption mui--text-light">
diff --git a/funnel/templates/submission_admin_panel.html.jinja2 b/funnel/templates/submission_admin_panel.html.jinja2
index 7ad9d4578..7dd2c5bda 100644
--- a/funnel/templates/submission_admin_panel.html.jinja2
+++ b/funnel/templates/submission_admin_panel.html.jinja2
@@ -4,15 +4,15 @@
 <link rel="stylesheet" type="text/css" href="{{ manifest('css/form.css') }}" />
 
 <div class="modal__header">
-  <a class="modal__close mui--text-dark" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-cy="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
-  <h3 class="mui--text-title text-bold text-uppercase" data-cy="admin-panel">{% trans %}Admin panel{% endtrans %}</h3>
+  <a class="modal__close mui--text-dark" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" data-testid="close-admin-panel" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
+  <h3 class="mui--text-title text-bold text-uppercase" data-testid="admin-panel">{% trans %}Admin panel{% endtrans %}</h3>
 </div>
 <div class="modal__body proposal__admin-panel">
   {%- if proposal.current_roles.project_editor %}
     <p class="mui--text-subhead">{% trans %}Change status of proposal{% endtrans %}</p>
     <form action="{{ proposal.url_for('transition') }}" method="post" class="form-inline">
       {{ transition_form.hidden_tag() }}
-      <div class="btn-group" data-cy="proposal-status">
+      <div class="btn-group" data-testid="proposal-status">
         {% for name, transition in transition_form.transition.choices %}
           <button name="transition" value="{{ name }}" class="transition mui-btn mui-btn--small mui-btn--raised {% if transition.data['type'] == 'success' %} mui-btn--primary {% elif transition.data['type'] == 'danger' %} mui-btn--danger {%- endif %}">{{ transition.data['title'] }}</button>
         {% endfor %}
diff --git a/funnel/templates/submission_form.html.jinja2 b/funnel/templates/submission_form.html.jinja2
index 08c107437..a7af2e2af 100644
--- a/funnel/templates/submission_form.html.jinja2
+++ b/funnel/templates/submission_form.html.jinja2
@@ -30,16 +30,16 @@
         <div class="mui-container">
           <div class="grid flex-wrapper--center">
             <div class="grid__col-sm-6">
-              <h1 class="mui--text-subhead margin-top margin-bottom"><a href="{{ project.url_for() }}" class="mui--text-dark mui--text-light nounderline" data-cy="project-page">{{ project.title }}</a></h1>
+              <h1 class="mui--text-subhead margin-top margin-bottom"><a href="{{ project.url_for() }}" class="mui--text-dark mui--text-light nounderline" data-testid="project-page">{{ project.title }}</a></h1>
             </div>
             <div class="grid__col-sm-6">
               <div class="flex-wrapper submission-header__submit">
                 <div class="mui--visible-xs-block mui--visible-sm-block submission-header__submit__btnwrapper">
-                  <a class="mui-btn js-switch-panel js-toggle-panel link" data-cy="preview">{% trans %}Preview{% endtrans %}</a>
-                  <a class="mui-btn js-switch-panel js-toggle-panel mui--hide link" data-cy="edit">{% trans %}Edit{% endtrans %}</a>
-                  <button type="submit" name="submit" class="mui-btn" data-cy="submit">{%- if not proposal %}{% trans %}Submit{% endtrans %}{% else %}{% trans %}Save{% endtrans %}{%- endif %}</button>
+                  <a class="mui-btn js-switch-panel js-toggle-panel link" data-testid="preview">{% trans %}Preview{% endtrans %}</a>
+                  <a class="mui-btn js-switch-panel js-toggle-panel mui--hide link" data-testid="edit">{% trans %}Edit{% endtrans %}</a>
+                  <button type="submit" name="submit" class="mui-btn" data-testid="submit">{%- if not proposal %}{% trans %}Submit{% endtrans %}{% else %}{% trans %}Save{% endtrans %}{%- endif %}</button>
                 </div>
-                <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin mui--hidden-xs mui--hidden-sm submission-header__submit__btn" data-cy="form-submit-btn">{%- if not proposal %}{% trans %}Submit{% endtrans %}{% else %}{% trans %}Save{% endtrans %}{%- endif %}</button>
+                <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin mui--hidden-xs mui--hidden-sm submission-header__submit__btn" data-testid="form-submit-btn">{%- if not proposal %}{% trans %}Submit{% endtrans %}{% else %}{% trans %}Save{% endtrans %}{%- endif %}</button>
                 <span class="loading mui--hide"></span>
               </div>
             </div>
@@ -53,7 +53,7 @@
             <div class="submission-header__edit-icons bottom-padding">
               {%- if form.formlabels %}
                 <div class="bottom-padding submission-label">
-                    <a class="js-open-modal mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add labels to submission{% endtrans %}" data-ga="Add label to submission video" data-cy="add-label">
+                    <a class="js-open-modal mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add labels to submission{% endtrans %}" data-ga="Add label to submission video" data-testid="add-label">
                       {{ faicon(icon='tag-solid', icon_size='body2', baseline=false, css_class="mui--text-light fa-icon--right-margin") }}
                       <span class="text-bold js-label-heading">{% trans %}Labels{% endtrans %}{{ faicon(icon='pen', icon_size='caption', baseline=true, css_class="mui--text-light fa-icon--left-margin") }}</span>
                       {%- if form.formlabels.errors %}{{ faicon(icon='exclamation-circle', icon_size='caption', css_class="mui--text-danger fa-icon--left-margin") }}{%- endif %}
@@ -61,14 +61,14 @@
                     <div class="js-modal-field mui--hide">
                       <div class="js-field top-padding">
                         {{ renderfield(form.formlabels, css_class="label-select-fields top-padding active") }}
-                        <a href="#close" class="mui-btn mui-btn--raised mui-btn--primary" rel="modal:close" data-cy="save">{% trans %}Done{% endtrans %}</a>
+                        <a href="#close" class="mui-btn mui-btn--raised mui-btn--primary" rel="modal:close" data-testid="save">{% trans %}Done{% endtrans %}</a>
                       </div>
                     </div>
                     <p class="mui-form__error mui-form__error--left label-error js-error-label {%- if not form.formlabels.errors %} mui--hide{%- endif %}">{% trans %}This value is required{% endtrans %}</p>
                 </div>
               {%- endif %}
               <div class="bottom-padding">
-                <a class="js-open-modal mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add video url{% endtrans %}" data-ga="Add video url" data-cy="add-video">
+                <a class="js-open-modal mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add video url{% endtrans %}" data-ga="Add video url" data-testid="add-video">
                   {{ faicon(icon='video-plus', icon_size='body2', baseline=true, css_class="mui--text-light link fa-icon--right-margin") }}
                   <span class="text-bold">{% trans %}Video{% endtrans %}{{ faicon(icon='pen', icon_size='caption', baseline=true, css_class="mui--text-light fa-icon--left-margin") }}</span>
                   {%- if form.video_url.errors %}{{ faicon(icon='exclamation-circle', icon_size='caption', css_class="mui--text-danger fa-icon--left-margin") }}{%- endif %}
@@ -76,13 +76,13 @@
                 <div class="js-modal-field mui--hide">
                   <div class="js-field top-padding">
                     {{ renderfield(form.video_url, css_class="top-padding") }}
-                    <a href="#close" class="mui-btn mui-btn--raised mui-btn--primary" rel="modal:close" data-cy="save">{% trans %}Done{% endtrans %}</a>
+                    <a href="#close" class="mui-btn mui-btn--raised mui-btn--primary" rel="modal:close" data-testid="save">{% trans %}Done{% endtrans %}</a>
                   </div>
                 </div>
               </div>
               {%- if proposal %}
                 <div>
-                  <a class="js-open-modal js-add-collaborator mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Add collaborator" data-cy="add-collaborator-modal">
+                  <a class="js-open-modal js-add-collaborator mui--text-light mui--text-body2 nounderline link" role="button" aria-haspopup="true" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Add collaborator" data-testid="add-collaborator-modal">
                     {{ faicon(icon='user-circle-solid', icon_size='body2', baseline=true, css_class="mui--text-light link fa-icon--right-margin") }}
                     <span class="text-bold">{% trans %}Collaborators{% endtrans %}</span>
                     {{ faicon(icon='plus', icon_size='caption', baseline=true, css_class="mui--text-light fa-icon--left-margin") }}
@@ -97,7 +97,7 @@
                             {% include "collaborator_list.html.jinja2" %}
                           {% endwith %}
                         </div>
-                        <a href="{{ proposal.url_for('add_collaborator') }}" class="mui-btn mui-btn--small mui-btn--primary nounderline" rel="modal:open" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Add collaborator" data-cy="add-collaborator" role="button" aria-haspopup="true">{% trans %}Add new collaborator{% endtrans %}</a>
+                        <a href="{{ proposal.url_for('add_collaborator') }}" class="mui-btn mui-btn--small mui-btn--primary nounderline" rel="modal:open" aria-label="{% trans %}Add collaborator{% endtrans %}" data-ga="Add collaborator" data-testid="add-collaborator" role="button" aria-haspopup="true">{% trans %}Add new collaborator{% endtrans %}</a>
                       </div>
                     </div>
                   </div>
@@ -128,7 +128,7 @@
         </ul>
         <p class="mui--text-body2 margin-top">{% trans account=url_for('account'), editors=project.url_for('crew') %}You can add or change your contacts at any time from <a href="{{ account }}" target="_blank" rel="noopener">your account</a>, and <a href="{{ editors }}" target="_blank" rel="noopener">review the list of editors</a>. Your contacts will not be available to editors before you submit.{% endtrans %}</p>
         <div class="mui--text-right">
-          <a class="mui-btn mui-btn--raised" rel="modal:close" onclick="return false;" role="button" tabindex="0" data-cy="close-consent-modal">{% trans %}Ok{% endtrans %}</a>
+          <a class="mui-btn mui-btn--raised" rel="modal:close" onclick="return false;" role="button" tabindex="0" data-testid="close-consent-modal">{% trans %}Ok{% endtrans %}</a>
         </div>
       </div>
     </div>
diff --git a/funnel/templates/ticket_event.html.jinja2 b/funnel/templates/ticket_event.html.jinja2
index b724a4809..b6ae825c1 100644
--- a/funnel/templates/ticket_event.html.jinja2
+++ b/funnel/templates/ticket_event.html.jinja2
@@ -11,7 +11,7 @@
 
 {% block top_title %}
   <h1 class="mui--text-headline"><a href="{{ project.url_for() }}">{{ project.title }}</a></h1>
-  <p class="mui--text-subhead"><a href="{{ project.url_for('admin') }}" data-cy="back-to-setup">{{ faicon(icon='arrow-left', icon_size='subhead') }} {% trans %}Back to setup events{% endtrans %}</a></p>
+  <p class="mui--text-subhead"><a href="{{ project.url_for('admin') }}" data-testid="back-to-setup">{{ faicon(icon='arrow-left', icon_size='subhead') }} {% trans %}Back to setup events{% endtrans %}</a></p>
 {% endblock top_title %}
 
 {% block contentwrapper %}
@@ -42,9 +42,9 @@
     </div>
     <div class="grid__col-xs-12 grid__col-md-9">
       <ul class="mui-list--inline">
-        <li><a href="{{ ticket_event.url_for('badges') }}" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-cy="badges-to-printed">{% trans %}Badges{% endtrans %}</a></li>
-         <li><a href="{{ ticket_event.url_for('label_badges') }}" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-cy="label-badges-to-printed">{% trans %}Label badges{% endtrans %}</a></li>
-        <li><a href="{{ ticket_event.url_for('badges') }}?badge_printed=t" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" data-cy="badges-printed">{% trans %}Printed Badges{% endtrans %}</a></li>
+        <li><a href="{{ ticket_event.url_for('badges') }}" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-testid="badges-to-printed">{% trans %}Badges{% endtrans %}</a></li>
+         <li><a href="{{ ticket_event.url_for('label_badges') }}" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--primary" data-testid="label-badges-to-printed">{% trans %}Label badges{% endtrans %}</a></li>
+        <li><a href="{{ ticket_event.url_for('badges') }}?badge_printed=t" target="_blank" rel="noopener" class="mui-btn mui-btn--small mui-btn--raised mui-btn--accent" data-testid="badges-printed">{% trans %}Printed Badges{% endtrans %}</a></li>
         <li class="badge-print-status-btn">
           <form method="post" id="badge_form" class="mui-form">
               {{ badge_form.hidden_tag() }}
diff --git a/funnel/templates/unread_comments.html.jinja2 b/funnel/templates/unread_comments.html.jinja2
index a7e19d88c..715df4b66 100644
--- a/funnel/templates/unread_comments.html.jinja2
+++ b/funnel/templates/unread_comments.html.jinja2
@@ -27,12 +27,12 @@
               {%- endif %}
             </div>
           </div>
-          <div class="user__box__header comment__details" data-cy="unread-comment">
+          <div class="user__box__header comment__details" data-testid="unread-comment">
             {% if membership.last_comment %}
-              <h3 class="mui--text-body2 user__box__fullname"><span class="text-bold comment__details__title" data-cy="comment-username">{{ membership.parent.title }}</span><span class="mui--text-body1 mui--pull-right comment__details__age">{{ membership.last_comment.created_at|age }}</span></h3>
+              <h3 class="mui--text-body2 user__box__fullname"><span class="text-bold comment__details__title" data-testid="comment-username">{{ membership.parent.title }}</span><span class="mui--text-body1 mui--pull-right comment__details__age">{{ membership.last_comment.created_at|age }}</span></h3>
               <h3 class="mui--text-caption mui--text-light user__box__subcontent"><span class="comment__details__user {% if membership.new_comment_count %}comment__details__user--truncated{% endif %}">{{ membership.last_comment.posted_by.fullname }}: {{ membership.last_comment.message.text }}</span>{% if membership.new_comment_count %}<span class="badge badge--round badge--round-smaller">{{ membership.new_comment_count }}</span>{% endif %}</h3>
             {%- else %}
-              <h3 class="mui--text-body2 user__box__fullname"><span class="text-bold comment__details__title comment__details__title--long" data-cy="comment-username">{{ membership.parent.title }}</span></h3>
+              <h3 class="mui--text-body2 user__box__fullname"><span class="text-bold comment__details__title comment__details__title--long" data-testid="comment-username">{{ membership.parent.title }}</span></h3>
               <h3 class="mui--text-caption mui--text-light user__box__subcontent">{% trans %}No comments posted…{% endtrans %}</h3>
             {% endif %}
           </div>
diff --git a/funnel/templates/venues.html.jinja2 b/funnel/templates/venues.html.jinja2
index dde6a90df..303f1f661 100644
--- a/funnel/templates/venues.html.jinja2
+++ b/funnel/templates/venues.html.jinja2
@@ -20,7 +20,7 @@
             <ol class="list--aligned list--border">
               {%- for venue in primary_venue_form.venue.query %}
                 <li class="mui--text-subhead">
-                  {# djlint:off #}<input id="venue-{{ loop.index }}" name="{{ primary_venue_form.venue.name }}" value="{{ venue.uuid_b58 }}" type="radio" {%- if venue == project.primary_venue %}disabled{% endif %} class="margin-right" /><label for="venue-{{ loop.index }}" class="form-inline-label" data-cy="{{ venue.title }}">{{ venue.title }} {%- if venue == project.primary_venue %}<em> {% trans %}(primary){% endtrans %}</em>{% endif %}</label>{# djlint:on #}
+                  {# djlint:off #}<input id="venue-{{ loop.index }}" name="{{ primary_venue_form.venue.name }}" value="{{ venue.uuid_b58 }}" type="radio" {%- if venue == project.primary_venue %}disabled{% endif %} class="margin-right" /><label for="venue-{{ loop.index }}" class="form-inline-label" data-testid="{{ venue.title }}">{{ venue.title }} {%- if venue == project.primary_venue %}<em> {% trans %}(primary){% endtrans %}</em>{% endif %}</label>{# djlint:on #}
                   <span class="mui--pull-right">
                     <a href="{{ venue.url_for('edit') }}" class="mui--text-title" aria-label="{% trans %}Edit{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
                       &nbsp;&nbsp;&nbsp;<a href="{{ venue.url_for('delete') }}" aria-label="{% trans %}Delete{% endtrans %}">{{ faicon(icon='trash-alt', icon_size='subhead', css_class="fa5--link") }}</a>
@@ -33,8 +33,8 @@
           </div>
           <div class="mui-divider"></div>
           <div class="card__footer">
-            <button class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" type="submit" data-cy="set-primary-venue">{% trans %}Set as primary{% endtrans %}</button>
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ project.url_for('new_venue') }}" data-cy="new-venue">{% trans %}Add venue{% endtrans %}</a>
+            <button class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" type="submit" data-testid="set-primary-venue">{% trans %}Set as primary{% endtrans %}</button>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ project.url_for('new_venue') }}" data-testid="new-venue">{% trans %}Add venue{% endtrans %}</a>
           </div>
         </form>
       </div>
@@ -43,7 +43,7 @@
   <div class="grid">
     {%- for venue in venues %}
       <div class="grid__col-xs-12 grid__col-sm-6">
-        <div class="card" data-cy-venue="{{ venue.title }}">
+        <div class="card" data-testid="{{ venue.title }}">
           <div class="card__header">
             <h3><b>{{ venue.title }}</b>{%- if venue == project.primary_venue %}<em> (primary) </em>{% endif %}</h3>
             <div class="mui--text-body2">{{ venue.description }}</div>
@@ -52,7 +52,7 @@
             <ol class="list--aligned list--border">
               {%- for room in venue.rooms %}
                 <li class="mui--text-subhead">
-                  <span class="mui--text-subhead text-bold" data-cy-room="{{ room.title }}">{{ room.title }}</span>
+                  <span class="mui--text-subhead text-bold" data-testid="{{ room.title }}">{{ room.title }}</span>
                   <span class="mui--pull-right">
                     <a href="{{ room.url_for('edit') }}" class="mui--text-title" aria-label="{% trans %}Edit{% endtrans %}">{{ faicon(icon='edit', icon_size='subhead', css_class="fa5--link") }}</a>
                     &nbsp;&nbsp;&nbsp;<a href="{{ room.url_for('delete') }}" class="mui--text-title" aria-label="{% trans %}Delete{% endtrans %}">{{ faicon(icon='trash-alt', icon_size='subhead', css_class="fa5--link") }}</a>
@@ -66,7 +66,7 @@
           </div>
           <div class="mui-divider"></div>
           <div class="card__footer">
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ venue.url_for('new_venueroom') }}" data-cy="add-room">{% trans %}Add room{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ venue.url_for('new_venueroom') }}" data-testid="add-room">{% trans %}Add room{% endtrans %}</a>
           </div>
         </div>
       </div>
diff --git a/funnel/views/login.py b/funnel/views/login.py
index 5c4f5567b..b7b0bffc3 100644
--- a/funnel/views/login.py
+++ b/funnel/views/login.py
@@ -168,7 +168,7 @@ def login() -> ReturnView:
                 ('user/' + loginform.user.uuid_b58)
                 if loginform.user
                 else ('username/' + loginform.username.data),
-                10,
+                1000,
                 3600,
             )
             if success:
diff --git a/playwright.config.js b/playwright.config.js
new file mode 100644
index 000000000..b611cf6b0
--- /dev/null
+++ b/playwright.config.js
@@ -0,0 +1,80 @@
+// @ts-check
+const { defineConfig, devices } = require('@playwright/test');
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * @see https://playwright.dev/docs/test-configuration
+ */
+module.exports = defineConfig({
+  testDir: './tests/playwright/tests',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: 'http://funnel.test:3002',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+  /* Folder for test artifacts such as screenshots, videos, traces, etc. */
+  outputDir: './tests/playwright/test-results',
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://127.0.0.1:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});
+
diff --git a/tests/cypress/cypress_initdb_test.py b/tests/cypress/cypress_initdb_test.py
index d227cd6bc..21abc62d8 100644
--- a/tests/cypress/cypress_initdb_test.py
+++ b/tests/cypress/cypress_initdb_test.py
@@ -70,6 +70,7 @@ def init_models():
             name='testcypressproject', title='testcypressproject', owner=profile_owner
         )
         org.is_verified = True
+        org.publish()
 
         db.session.add_all(
             [
diff --git a/tests/cypress/e2e/00_addProfile.cy.js b/tests/cypress/e2e/00_addProfile.cy.js
index 5069b7fd7..071105dcc 100644
--- a/tests/cypress/e2e/00_addProfile.cy.js
+++ b/tests/cypress/e2e/00_addProfile.cy.js
@@ -6,17 +6,17 @@ describe('Profile', () => {
 
   it('Create a new profile', () => {
     cy.login('/', owner.username, owner.password);
-    cy.get('#hgnav').find('a[data-cy="my-account"]').click();
+    cy.get('#hgnav').find('a[data-testid="my-account"]').click();
     cy.wait(1000);
-    cy.get('a[data-cy="org"]:visible').click();
-    cy.get('a[data-cy="new"]').click();
+    cy.get('a[data-testid="org"]:visible').click();
+    cy.get('a[data-testid="new"]').click();
     cy.get('#title').type(sponsor.title);
     cy.get('#name').type(sponsor.name);
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.get('#field-description')
       .find('.cm-editor .cm-line')
       .type('sponsor profile', { force: true });
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
 
     cy.logout();
   });
diff --git a/tests/cypress/e2e/01_addCrewtoProfile.cy.js b/tests/cypress/e2e/01_addCrewtoProfile.cy.js
index 403db68c2..6cdd8e7db 100644
--- a/tests/cypress/e2e/01_addCrewtoProfile.cy.js
+++ b/tests/cypress/e2e/01_addCrewtoProfile.cy.js
@@ -17,40 +17,40 @@ describe('Adding crew to profile', () => {
     cy.route('POST', '**/new').as('add-member');
 
     cy.login(`/${profile.title}`, owner.username, owner.password);
-    cy.get('a[data-cy="admin-dropdown"]:visible').click();
+    cy.get('a[data-testid="admin-dropdown"]:visible').click();
     cy.wait(2000);
-    cy.get('a[data-cy-btn="profile-crew"]:visible').click();
+    cy.get('a[data-testid="profile-crew"]:visible').click();
 
     cy.add_profile_member(admin.username, 'is_owner-1', 'owner');
 
-    cy.get('[data-cy="member"]').contains(admin.username).click();
+    cy.get('[data-testid="member"]').contains(admin.username).click();
     cy.wait('@edit-form');
-    cy.get('button[data-cy-btn="revoke"]').click();
+    cy.get('button[data-testid="revoke"]').click();
     cy.wait('@delete-form');
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait('@delete-member');
-    cy.get('[data-cy="member"]').contains(admin.username).should('not.exist');
+    cy.get('[data-testid="member"]').contains(admin.username).should('not.exist');
 
     cy.add_profile_member(admin.username, 'is_owner-1', 'owner');
 
-    cy.get('[data-cy="member"]').contains(admin.username).click();
+    cy.get('[data-testid="member"]').contains(admin.username).click();
     cy.wait('@edit-form');
     cy.get('#is_owner-0').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait('@edit-member');
-    cy.get('[data-cy="member"]')
+    cy.get('[data-testid="member"]')
       .contains(admin.username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains('Admin');
 
     cy.add_member(hguser.username, 'owner', true);
     cy.get('a.modal__close:visible').click();
     cy.wait(1000);
 
-    cy.get('a[data-cy="profile-public"]:visible').click();
+    cy.get('a[data-testid="profile-public"]:visible').click();
     cy.wait(1000);
-    cy.get('button[data-cy="make-public-btn"]:visible').click();
+    cy.get('button[data-testid="make-public-btn"]:visible').click();
     cy.wait(1000);
   });
 });
diff --git a/tests/cypress/e2e/02_verifyAdminRoles.cy.js b/tests/cypress/e2e/02_verifyAdminRoles.cy.js
index 0772853cc..51d4d11da 100644
--- a/tests/cypress/e2e/02_verifyAdminRoles.cy.js
+++ b/tests/cypress/e2e/02_verifyAdminRoles.cy.js
@@ -9,28 +9,28 @@ describe('Profile admin roles', () => {
 
     cy.login(`/${profile.title}`, admin.username, admin.password);
 
-    cy.get('a[data-cy="admin-dropdown"]:visible').click();
+    cy.get('a[data-testid="admin-dropdown"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-btn="edit-details"]:visible').click();
+    cy.get('a[data-testid="edit-details"]:visible').click();
     cy.get('#field-description')
       .find('.cm-editor .cm-line')
       .type(profile.description, { force: true });
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     // TODO: After imgee merger, add tests to upload and select image
-    cy.get('[data-cy="add-banner"]').should('exist');
+    cy.get('[data-testid="add-banner"]').should('exist');
 
-    cy.get('a[data-cy="admin-dropdown"]:visible').click();
+    cy.get('a[data-testid="admin-dropdown"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-btn="profile-crew"]:visible').click();
-    cy.get('button[data-cy-btn="add-member"]').should('not.exist');
-    cy.get('[data-cy="member"]').contains(admin.username).click();
+    cy.get('a[data-testid="profile-crew"]:visible').click();
+    cy.get('button[data-testid="add-member"]').should('not.exist');
+    cy.get('[data-testid="member"]').contains(admin.username).click();
     cy.get('#member-form', { timeout: 10000 }).should('not.be.visible');
-    cy.get('[data-cy="member"]').contains(owner.username).click();
+    cy.get('[data-testid="member"]').contains(owner.username).click();
     cy.get('#member-form', { timeout: 10000 }).should('not.be.visible');
     cy.wait(1000);
 
-    cy.get('a[data-cy="my-updates"]:visible').click();
+    cy.get('a[data-testid="my-updates"]:visible').click();
     cy.wait('@fetch-updates');
-    cy.get('[data-cy="notification-box"]').contains(profile.title);
+    cy.get('[data-testid="notification-box"]').contains(profile.title);
   });
 });
diff --git a/tests/cypress/e2e/03_createProject.cy.js b/tests/cypress/e2e/03_createProject.cy.js
index 6ba880164..d82d52559 100644
--- a/tests/cypress/e2e/03_createProject.cy.js
+++ b/tests/cypress/e2e/03_createProject.cy.js
@@ -7,7 +7,7 @@ describe('Project', () => {
   it('Create a new project', () => {
     cy.login(`/${profile.title}`, admin.username, admin.password);
 
-    cy.get('a[data-cy="new-project"]').click();
+    cy.get('a[data-testid="new-project"]').click();
     cy.location('pathname').should('contain', '/new');
 
     cy.get('#title').type(project.title);
@@ -16,19 +16,19 @@ describe('Project', () => {
     cy.get('#field-description')
       .find('.cm-editor .cm-line')
       .type(project.description, { force: true });
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
 
     cy.location('pathname').should('contain', project.url);
     cy.title().should('include', project.title);
     // TODO: After imgee merger, add tests to upload and select image
-    cy.get('[data-cy="add-project-banner"]').should('exist');
+    cy.get('[data-testid="add-project-banner"]').should('exist');
 
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-admin="edit"]:visible').click();
+    cy.get('a[data-testid="edit"]:visible').click();
     cy.get('#tagline').type(project.tagline);
     cy.wait(3000);
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.title().should('include', project.title);
   });
 });
diff --git a/tests/cypress/e2e/04_addCrewtoProject.cy.js b/tests/cypress/e2e/04_addCrewtoProject.cy.js
index e797e3f15..703e9acc1 100644
--- a/tests/cypress/e2e/04_addCrewtoProject.cy.js
+++ b/tests/cypress/e2e/04_addCrewtoProject.cy.js
@@ -10,13 +10,13 @@ describe('Adding crew', () => {
 
   it('Add crew to project', () => {
     cy.login(`/${profile.title}`, admin.username, admin.password);
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="crew"]').click();
-    cy.get('[data-cy="member"]')
+    cy.get('a[data-testid="crew"]').click();
+    cy.get('[data-testid="member"]')
       .contains(admin.username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains('Editor');
 
     cy.add_member(promoter.username, 'promoter');
diff --git a/tests/cypress/e2e/05_publishProject.cy.js b/tests/cypress/e2e/05_publishProject.cy.js
index 4fbd76f5b..71ef19f5f 100644
--- a/tests/cypress/e2e/05_publishProject.cy.js
+++ b/tests/cypress/e2e/05_publishProject.cy.js
@@ -6,26 +6,26 @@ describe('Verify roles of editor and publish project', () => {
 
   it('Verify roles of editor and publish project', () => {
     cy.login(`/${profile.title}`, editor.username, editor.password);
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="edit"]').should('exist');
-    cy.get('a[data-cy="add-livestream"]').should('exist');
-    cy.get('a[data-cy="manage-venues"]').should('exist');
-    cy.get('a[data-cy="add-cfp"]').should('exist');
-    cy.get('a[data-cy="edit-schedule"]').should('exist');
-    cy.get('a[data-cy="manage-labels"]').should('exist');
-    cy.get('a[data-cy="setup-ticket-events"]').should('not.exist');
-    cy.get('a[data-cy="scan-checkin"]').should('not.exist');
-    cy.get('button[data-cy-state="publish"]').click();
+    cy.get('a[data-testid="edit"]').should('exist');
+    cy.get('a[data-testid="add-livestream"]').should('exist');
+    cy.get('a[data-testid="manage-venues"]').should('exist');
+    cy.get('a[data-testid="add-cfp"]').should('exist');
+    cy.get('a[data-testid="edit-schedule"]').should('exist');
+    cy.get('a[data-testid="manage-labels"]').should('exist');
+    cy.get('a[data-testid="setup-ticket-events"]').should('not.exist');
+    cy.get('a[data-testid="scan-checkin"]').should('not.exist');
+    cy.get('button[data-testid="publish"]').click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('[data-cy="project-state"]').contains('Published');
+    cy.get('[data-testid="project-state"]').contains('Published');
   });
 });
diff --git a/tests/cypress/e2e/06_manageVenue.cy.js b/tests/cypress/e2e/06_manageVenue.cy.js
index 5f86e3205..75ff3556c 100644
--- a/tests/cypress/e2e/06_manageVenue.cy.js
+++ b/tests/cypress/e2e/06_manageVenue.cy.js
@@ -7,16 +7,16 @@ describe('Manage project venue', () => {
   it('Add venue', () => {
     cy.login(`/${profile.title}/${project.url}`, editor.username, editor.password);
 
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="manage-venues"]').click();
+    cy.get('a[data-testid="manage-venues"]').click();
     cy.location('pathname').should('contain', '/venues');
 
     cy.fixture('venues').then((venues) => {
       venues.forEach((venue) => {
-        cy.get('a[data-cy="new-venue"]').click();
+        cy.get('a[data-testid="new-venue"]').click();
         cy.location('pathname').should('contain', '/new');
         cy.get('#title').type(venue.venue_title);
         cy.get('#field-description')
@@ -27,20 +27,20 @@ describe('Manage project venue', () => {
         cy.get('#city').type(venue.venue_city);
         cy.get('#state').type(venue.venue_state);
         cy.get('#postcode').type(venue.venue_postcode);
-        cy.get('button[data-cy="form-submit-btn"]').click();
+        cy.get('button[data-testid="form-submit-btn"]').click();
         cy.location('pathname').should(
           'include',
           `/testcypressproject/${project.url}/venues`
         );
       });
 
-      cy.get(`[data-cy="${venues[1].venue_title}"]`).click();
-      cy.get('[data-cy="set-primary-venue"]').click();
-      cy.get(`[data-cy="${venues[1].venue_title}"]`).find('em').contains('(primary)');
+      cy.get(`[data-testid="${venues[1].venue_title}"]`).click();
+      cy.get('[data-testid="set-primary-venue"]').click();
+      cy.get(`[data-testid="${venues[1].venue_title}"]`).find('em').contains('(primary)');
 
       venues.forEach((venue) => {
-        cy.get(`.card[data-cy-venue="${venue.venue_title}"]`)
-          .find('a[data-cy="add-room"]')
+        cy.get(`.card[data-testid="${venue.venue_title}"]`)
+          .find('a[data-testid="add-room"]')
           .click();
         cy.location('pathname').should('contain', '/new');
         cy.get('#title').type(venue.room.title);
@@ -48,18 +48,18 @@ describe('Manage project venue', () => {
           .find('.cm-editor .cm-line')
           .type(venue.room.description, { force: true });
         cy.get('#bgcolor').clear().type(venue.room.bgcolor);
-        cy.get('button[data-cy="form-submit-btn"]').click();
+        cy.get('button[data-testid="form-submit-btn"]').click();
         cy.location('pathname').should(
           'include',
           `/testcypressproject/${project.url}/venues`
         );
-        cy.get(`.card[data-cy-venue="${venue.venue_title}"]`)
+        cy.get(`.card[data-testid="${venue.venue_title}"]`)
           .find('li')
           .contains(venue.room.title);
       });
 
       venues.forEach((venue) => {
-        cy.get(`[data-cy-room="${venue.room.title}"]`).should('exist');
+        cy.get(`[data-testid="${venue.room.title}"]`).should('exist');
       });
     });
   });
diff --git a/tests/cypress/e2e/07_addCFP.cy.js b/tests/cypress/e2e/07_addCFP.cy.js
index 365c8e92e..fabc4c8cc 100644
--- a/tests/cypress/e2e/07_addCFP.cy.js
+++ b/tests/cypress/e2e/07_addCFP.cy.js
@@ -12,27 +12,27 @@ describe('Add CFP and labels to project', () => {
 
     cy.login(`/${profile.title}/${project.url}`, editor.username, editor.password);
 
-    cy.get('a[data-cy-navbar="submissions"]').click();
-    cy.get('a[data-cy="add-cfp"]').click();
+    cy.get('a[data-testid="submissions"]').click();
+    cy.get('a[data-testid="add-cfp"]').click();
     cy.location('pathname').should('contain', '/cfp');
     cy.get('#field-instructions')
       .find('.cm-editor .cm-line')
       .type(cfp.instructions, { force: true });
-    cy.get('button[data-cy="add-cfp"]').click();
+    cy.get('button[data-testid="add-cfp"]').click();
     cy.get('label.switch-label').click();
-    cy.get('p[data-cy="cfp-state"]').contains('Accepting submissions');
-    cy.get('a[data-cy="propose-a-session"]').should('exist');
+    cy.get('p[data-testid="cfp-state"]').contains('Accepting submissions');
+    cy.get('a[data-testid="propose-a-session"]').should('exist');
 
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="manage-labels"').click();
+    cy.get('a[data-testid="manage-labels"').click();
     cy.location('pathname').should('contain', '/labels');
 
     cy.fixture('labels').then((flabels) => {
       flabels.forEach((label) => {
-        cy.get('a[data-cy="add-labels"]').click();
+        cy.get('a[data-testid="add-labels"]').click();
         cy.location('pathname').should('contain', '/new');
 
         cy.get('#title').type(label.title);
@@ -97,7 +97,7 @@ describe('Add CFP and labels to project', () => {
         if (label.adminLabel) {
           cy.get('#field-restricted').find('label').click();
         }
-        cy.get('button[data-cy-submit="save-label"]').click();
+        cy.get('button[data-testid="save-label"]').click();
         cy.location('pathname').should('contain', '/labels');
       });
     });
@@ -119,7 +119,7 @@ describe('Add CFP and labels to project', () => {
         .trigger('mouseup', { force: true, view: window });
     });
 
-    cy.get('button[data-cy="save-label-seq"]').click();
+    cy.get('button[data-testid="save-label-seq"]').click();
 
     cy.get('.ui-draggable-box')
       .eq(0)
diff --git a/tests/cypress/e2e/08_addSubmission.cy.js b/tests/cypress/e2e/08_addSubmission.cy.js
index 16a8ad500..af761e4a0 100644
--- a/tests/cypress/e2e/08_addSubmission.cy.js
+++ b/tests/cypress/e2e/08_addSubmission.cy.js
@@ -15,37 +15,37 @@ describe('Add a new submission', () => {
 
     cy.login('/', user.username, user.password);
 
-    cy.get(`a[data-cy-title="${project.title}"]`).click();
+    cy.get(`a[data-testid="${project.title}"]`).click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="propose-a-session"]:visible').click();
+    cy.get('a[data-testid="propose-a-session"]:visible').click();
     cy.location('pathname').should('contain', 'new');
-    cy.get('a[data-cy="close-consent-modal"]').click();
+    cy.get('a[data-testid="close-consent-modal"]').click();
     cy.get('#title').type(proposal.title);
     cy.get('#field-body')
       .find('.cm-editor .cm-line')
       .type(proposal.content, { force: true });
-    cy.get('a[data-cy="add-video"]').click();
+    cy.get('a[data-testid="add-video"]').click();
     cy.wait(1000);
     cy.get('#field-video_url').type(proposal.preview_video);
-    cy.get('a[data-cy="save"]:visible').click();
-    cy.get('a[data-cy="add-label"]').click();
+    cy.get('a[data-testid="save"]:visible').click();
+    cy.get('a[data-testid="add-label"]').click();
     cy.wait(2000);
     cy.get('fieldset').find('.listwidget').eq(0).find('input').eq(0).click();
     cy.wait(2000);
     cy.get('fieldset').find('.listwidget').eq(1).find('input').eq(0).click();
     cy.wait(2000);
-    cy.get('a[data-cy="save"]:visible').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('a[data-testid="save"]:visible').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
 
-    cy.get('[data-cy="proposal-title"]').should('exist').contains(proposal.title);
-    cy.get('[data-cy="proposal-video"]').find('iframe').should('be.visible');
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('[data-testid="proposal-title"]').should('exist').contains(proposal.title);
+    cy.get('[data-testid="proposal-video"]').find('iframe').should('be.visible');
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('[data-cy-admin="edit"]:visible').click();
-    cy.get('a[data-cy="close-consent-modal"]').click();
+    cy.get('[data-testid="edit"]:visible').click();
+    cy.get('a[data-testid="close-consent-modal"]').click();
 
-    cy.get('a[data-cy="add-collaborator-modal"]').click();
-    cy.get('a[data-cy="add-collaborator"]').click();
+    cy.get('a[data-testid="add-collaborator-modal"]').click();
+    cy.get('a[data-testid="add-collaborator"]').click();
     cy.wait('@get-collaborator-form');
     cy.get('.select2-selection__arrow').click({ multiple: true });
     cy.get('.select2-search__field').type(usher.username, {
@@ -58,25 +58,25 @@ describe('Add a new submission', () => {
     cy.get('.select2-results__options', { timeout: 10000 }).should('not.exist');
     cy.wait(1000);
     cy.get('#field-label').click().type('Editor');
-    cy.get('.modal').find('button[data-cy="form-submit-btn"]:visible').click();
+    cy.get('.modal').find('button[data-testid="form-submit-btn"]:visible').click();
     cy.wait('@add-collaborator');
     cy.get('a.modal__close:visible').click();
     cy.wait(6000); // Wait for toastr notice to fade out
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.get('.user__box__userid').contains(usher.username);
     cy.get('.badge').contains('Editor');
 
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('[data-cy-admin="delete"]').should('exist');
-    cy.get('[data-cy="edit-proposal-video"]').should('exist');
+    cy.get('[data-testid="delete"]').should('exist');
+    cy.get('[data-testid="edit-proposal-video"]').should('exist');
 
-    cy.get('[data-cy="post-comment"]').click();
-    cy.get('[data-cy="new-form"]')
+    cy.get('[data-testid="post-comment"]').click();
+    cy.get('[data-testid="new-form"]')
       .find('.cm-editor .cm-line')
       .type(proposal.proposer_note, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="new-form"]').find('[data-cy="submit-comment"]').click();
+    cy.get('[data-testid="new-form"]').find('[data-testid="submit-comment"]').click();
     cy.wait('@post-comment');
     cy.get('.comment__body').contains(proposal.proposer_note);
     cy.get('.comment__header').contains(user.username);
diff --git a/tests/cypress/e2e/09_confirmSubmission.cy.js b/tests/cypress/e2e/09_confirmSubmission.cy.js
index 2b6a58106..b41b333f7 100644
--- a/tests/cypress/e2e/09_confirmSubmission.cy.js
+++ b/tests/cypress/e2e/09_confirmSubmission.cy.js
@@ -14,26 +14,26 @@ describe('Confirm submission', () => {
     cy.route('POST', '**/new').as('post-comment');
 
     cy.login('/', editor.username, editor.password);
-    cy.get('a[data-cy="my-updates"]:visible').click();
+    cy.get('a[data-testid="my-updates"]:visible').click();
     cy.visit('/updates');
     cy.wait('@fetch-updates');
-    cy.get('[data-cy="notification-box"]').contains(proposal.title);
-    cy.get('a[data-cy="home-desktop"]').click();
-    cy.get(`a[data-cy-title="${project.title}"]`).click();
+    cy.get('[data-testid="notification-box"]').contains(proposal.title);
+    cy.get('a[data-testid="home-desktop"]').click();
+    cy.get(`a[data-testid="${project.title}"]`).click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="submissions"]').click();
+    cy.get('a[data-testid="submissions"]').click();
     cy.get('#search').type(proposal.title);
-    cy.get(`a[data-cy-proposal="${proposal.title}"]`).click();
+    cy.get(`a[data-testid="${proposal.title}"]`).click();
 
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="editor-panel"]:visible').click();
+    cy.get('a[data-testid="editor-panel"]:visible').click();
     cy.wait('@fetch-admin-panel');
     cy.get('#label-select').click();
     cy.get('#label-dropdown label').contains(labels[1].title).click();
     cy.get('#label-dropdown label').contains(labels[3].title).click();
     cy.get('#label-select').click();
-    cy.get('form.add-label-form').find('button[data-cy="form-submit-btn"]').click();
+    cy.get('form.add-label-form').find('button[data-testid="form-submit-btn"]').click();
     cy.fixture('labels').then((flabels) => {
       flabels.forEach((label) => {
         if (label.label1) {
@@ -44,49 +44,49 @@ describe('Confirm submission', () => {
       });
     });
 
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="editor-panel"]:visible').click();
+    cy.get('a[data-testid="editor-panel"]:visible').click();
     cy.wait('@fetch-admin-panel');
-    cy.get('[data-cy="proposal-status"]')
+    cy.get('[data-testid="proposal-status"]')
       .find('button[value="awaiting_details"]')
       .click();
 
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="editor-panel"]:visible').click();
+    cy.get('a[data-testid="editor-panel"]:visible').click();
     cy.wait('@fetch-admin-panel');
-    cy.get('[data-cy="proposal-status"]')
+    cy.get('[data-testid="proposal-status"]')
       .find('button[value="under_evaluation"]')
       .click();
 
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="editor-panel"]:visible').click();
+    cy.get('a[data-testid="editor-panel"]:visible').click();
     cy.wait('@fetch-admin-panel');
-    cy.get('[data-cy="proposal-status"]').find('button[value="confirm"]').click();
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('[data-testid="proposal-status"]').find('button[value="confirm"]').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
     cy.get('input#featured-proposal').click({ force: true });
 
-    cy.get('[data-cy="post-comment"]').click();
-    cy.get('[data-cy="new-form"]')
+    cy.get('[data-testid="post-comment"]').click();
+    cy.get('[data-testid="new-form"]')
       .find('.cm-editor .cm-line')
       .type(proposal.comment, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="new-form"]').find('[data-cy="submit-comment"]').click();
+    cy.get('[data-testid="new-form"]').find('[data-testid="submit-comment"]').click();
     cy.wait('@post-comment');
     const cid = window.location.hash;
     cy.get(`${cid} .comment__body`).contains(proposal.comment);
     cy.get(`${cid} .comment__header`).contains(editor.username);
 
-    cy.get('a[data-cy="project-page"]').click();
-    cy.get('[data-cy="proposal-card"]').contains(proposal.title).click();
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('a[data-testid="project-page"]').click();
+    cy.get('[data-testid="proposal-card"]').contains(proposal.title).click();
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
     cy.get('input#featured-proposal').click({ force: true });
-    cy.get('a[data-cy="project-page"]').click();
-    cy.get('[data-cy="proposal-card"]').should('not.exist');
+    cy.get('a[data-testid="project-page"]').click();
+    cy.get('[data-testid="proposal-card"]').should('not.exist');
 
     cy.visit('/');
     cy.logout();
@@ -95,10 +95,10 @@ describe('Confirm submission', () => {
     cy.login(`/${profile.title}`, member.username, member.password);
     cy.visit('/updates');
     cy.wait('@fetch-updates');
-    cy.get('[data-cy="notification-box"]').contains(proposal.title);
-    cy.get('[data-cy="notification-box"]').contains(proposal.comment);
-    cy.get('[data-cy="comment-sidebar"]').click();
+    cy.get('[data-testid="notification-box"]').contains(proposal.title);
+    cy.get('[data-testid="notification-box"]').contains(proposal.comment);
+    cy.get('[data-testid="comment-sidebar"]').click();
     cy.wait(1000);
-    cy.get('[data-cy="unread-comment"]').should('exist');
+    cy.get('[data-testid="unread-comment"]').should('exist');
   });
 });
diff --git a/tests/cypress/e2e/10_updateSchedule.cy.js b/tests/cypress/e2e/10_updateSchedule.cy.js
index ec071ea4c..cbde43cc1 100644
--- a/tests/cypress/e2e/10_updateSchedule.cy.js
+++ b/tests/cypress/e2e/10_updateSchedule.cy.js
@@ -16,13 +16,13 @@ describe('Add schedule and livestream', () => {
 
     cy.login('/', editor.username, editor.password);
 
-    cy.get(`a[data-cy-title="${project.title}"]`).click();
+    cy.get(`a[data-testid="${project.title}"]`).click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="edit-schedule"').click();
+    cy.get('a[data-testid="edit-schedule"').click();
     cy.location('pathname').should('contain', 'schedule');
     const tomorrow = dayjs().add(1, 'days').format('YYYY-MM-DD');
     cy.get('#select-date').type(tomorrow).click();
@@ -52,24 +52,24 @@ describe('Add schedule and livestream', () => {
     cy.get('#session-save').click();
     cy.wait('@add-session');
 
-    cy.get('[data-cy-tab="settings"]').click();
-    cy.get('[data-cy-collapsible="open"]').eq(0).click();
+    cy.get('[data-testid="settings"]').click();
+    cy.get('[data-testid="open"]').eq(0).click();
     cy.get('.sp-dd').eq(0).click();
     cy.get('.sp-palette-container').should('exist');
 
     // Add livestream
-    cy.get('a[data-cy="project-page"]').click();
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-page"]').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="add-livestream"]').click();
+    cy.get('a[data-testid="add-livestream"]').click();
     cy.location('pathname').should('contain', '/edit');
 
     cy.get('#field-livestream_urls')
       .find('textarea')
       .type(project.livestream_url, { force: true });
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.location('pathname').should('contain', project.url);
 
     cy.get('#livestream').should('exist');
@@ -82,15 +82,15 @@ describe('Add schedule and livestream', () => {
     cy.wait(1000);
     cy.login('/', siteEditor.username, siteEditor.password);
     cy.get('.upcoming').find('.card--upcoming').contains(project.title).click();
-    cy.get('a[data-cy="site-editor-menu"]').click();
+    cy.get('a[data-testid="site-editor-menu"]').click();
     cy.wait(1000);
     cy.get('input#featured-project').click({ force: true });
-    cy.get('a[data-cy="home-desktop"]').click();
-    cy.get('[data-cy="spotlight-project"]:visible').contains(project.title).click();
-    cy.get('a[data-cy="site-editor-menu"]').click();
+    cy.get('a[data-testid="home-desktop"]').click();
+    cy.get('[data-testid="spotlight-project"]:visible').contains(project.title).click();
+    cy.get('a[data-testid="site-editor-menu"]').click();
     cy.wait(1000);
     cy.get('input#featured-project').click({ force: true });
-    cy.get('a[data-cy="home-desktop"]').click();
-    cy.get('[data-cy="spotlight-project"]').should('not.exist');
+    cy.get('a[data-testid="home-desktop"]').click();
+    cy.get('[data-testid="spotlight-project"]').should('not.exist');
   });
 });
diff --git a/tests/cypress/e2e/11_respondToAttend.cy.js b/tests/cypress/e2e/11_respondToAttend.cy.js
index dc2e67882..78ce3061c 100644
--- a/tests/cypress/e2e/11_respondToAttend.cy.js
+++ b/tests/cypress/e2e/11_respondToAttend.cy.js
@@ -13,25 +13,25 @@ describe('Responding yes to attend a project', () => {
     cy.location('pathname').should('contain', project.url);
     cy.get('a#rsvp-btn:visible').click();
     cy.wait(2000);
-    cy.get('button[data-cy="confirm"]:visible').click();
-    cy.get('[data-cy="registered"]').should('exist');
+    cy.get('button[data-testid="confirm"]:visible').click();
+    cy.get('[data-testid="registered"]').should('exist');
     cy.wait(2000);
     cy.get('a#cancel-rsvp-btn:visible').click();
     cy.wait(2000);
-    cy.get('button[data-cy="cancel-rsvp"]:visible').click();
-    cy.get('[data-cy="unregistered"]').should('exist');
+    cy.get('button[data-testid="cancel-rsvp"]:visible').click();
+    cy.get('[data-testid="unregistered"]').should('exist');
     cy.wait(2000);
     cy.get('a#rsvp-btn:visible').click();
     cy.wait(2000);
-    cy.get('button[data-cy="confirm"]:visible').click();
+    cy.get('button[data-testid="confirm"]:visible').click();
     cy.wait(2000);
-    cy.get('button[data-cy="bookmark"]').click();
+    cy.get('button[data-testid="bookmark"]').click();
     cy.wait('@bookmark-project');
-    cy.get('button[data-cy="bookmarked"]').should('exist');
-    cy.get('[data-cy="share-project"]').click();
+    cy.get('button[data-testid="bookmarked"]').should('exist');
+    cy.get('[data-testid="share-project"]').click();
     cy.wait(1000);
-    cy.get('[data-cy="share-dropdown"]').should('exist');
+    cy.get('[data-testid="share-dropdown"]').should('exist');
 
-    cy.get('a[data-cy-navbar="settings"]').should('not.exist');
+    cy.get('a[data-testid="settings"]').should('not.exist');
   });
 });
diff --git a/tests/cypress/e2e/12_verifyPromotorRole.cy.js b/tests/cypress/e2e/12_verifyPromotorRole.cy.js
index 15d775ede..1721f2e11 100644
--- a/tests/cypress/e2e/12_verifyPromotorRole.cy.js
+++ b/tests/cypress/e2e/12_verifyPromotorRole.cy.js
@@ -6,19 +6,19 @@ describe('Verify roles of promoter', () => {
   it('Access available for promoter in project settings', () => {
     cy.login('/', promoter.username, promoter.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="edit"]').should('not.exist');
-    cy.get('a[data-cy="add-livestream"]').should('not.exist');
-    cy.get('a[data-cy="manage-venues"]').should('not.exist');
-    cy.get('a[data-cy="add-cfp"]').should('not.exist');
-    cy.get('a[data-cy="edit-schedule"]').should('not.exist');
-    cy.get('a[data-cy="manage-labels"]').should('not.exist');
-    cy.get('a[data-cy="setup-ticket-events"]').should('exist');
-    cy.get('a[data-cy="scan-checkin"]').should('exist');
+    cy.get('a[data-testid="edit"]').should('not.exist');
+    cy.get('a[data-testid="add-livestream"]').should('not.exist');
+    cy.get('a[data-testid="manage-venues"]').should('not.exist');
+    cy.get('a[data-testid="add-cfp"]').should('not.exist');
+    cy.get('a[data-testid="edit-schedule"]').should('not.exist');
+    cy.get('a[data-testid="manage-labels"]').should('not.exist');
+    cy.get('a[data-testid="setup-ticket-events"]').should('exist');
+    cy.get('a[data-testid="scan-checkin"]').should('exist');
   });
 });
diff --git a/tests/cypress/e2e/13_verifyattendeeList.cy.js b/tests/cypress/e2e/13_verifyattendeeList.cy.js
index 6c446e021..c2072a903 100644
--- a/tests/cypress/e2e/13_verifyattendeeList.cy.js
+++ b/tests/cypress/e2e/13_verifyattendeeList.cy.js
@@ -6,12 +6,12 @@ describe('Verify attendee list', () => {
   it('Verify list of attendees who have responded yes to attending a project', () => {
     cy.login('/testcypressproject', promoter.username, promoter.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="see-responses"]:visible').click();
+    cy.get('a[data-testid="see-responses"]:visible').click();
     cy.location('pathname').should('contain', 'rsvp_list');
-    cy.get('[data-cy="username"]').should('contain', user.fullname);
+    cy.get('[data-testid="username"]').should('contain', user.fullname);
   });
 });
diff --git a/tests/cypress/e2e/14_viewSchedule.cy.js b/tests/cypress/e2e/14_viewSchedule.cy.js
index 63ee51280..eae924bd7 100644
--- a/tests/cypress/e2e/14_viewSchedule.cy.js
+++ b/tests/cypress/e2e/14_viewSchedule.cy.js
@@ -15,12 +15,12 @@ describe('View schedule of p roject', () => {
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('[data-cy-navbar="schedule"]').click();
+    cy.get('[data-testid="schedule"]').click();
 
-    cy.get('a[data-cy="add-to-calendar"]').click();
+    cy.get('a[data-testid="add-to-calendar"]').click();
     cy.wait(1000);
-    cy.get('[data-cy="schedule-subscribe"]').should('exist');
-    cy.get('a[data-cy="close-modal"]').click();
+    cy.get('[data-testid="schedule-subscribe"]').should('exist');
+    cy.get('a[data-testid="close-modal"]').click();
 
     let tomorrow = dayjs().add(1, 'days').format('dddd, D MMMM YYYY');
     cy.get('.schedule__date').contains(tomorrow);
@@ -29,27 +29,27 @@ describe('View schedule of p roject', () => {
         cy.get('.schedule__row__column--header').contains(venue.room.title);
       });
     });
-    cy.get('[data-cy="session-time"]').contains(session.time).click();
+    cy.get('[data-testid="session-time"]').contains(session.time).click();
     cy.wait('@view-session');
     cy.get('#session-modal').should('be.visible');
     tomorrow = dayjs().add(1, 'days').format('MMM D, YYYY');
-    cy.get('[data-cy-session="title"]').contains(session.title);
-    cy.get('[data-cy-session="speaker"]').contains(session.speaker);
-    cy.get('[data-cy-session="time"]').contains(session.time);
-    cy.get('[data-cy-session="time"]').contains(tomorrow);
-    cy.get('[data-cy-session="room"]').contains(session.venue_room);
-    cy.get('[data-cy="session-video"]').find('iframe').should('be.visible');
+    cy.get('[data-testid="title"]').contains(session.title);
+    cy.get('[data-testid="speaker"]').contains(session.speaker);
+    cy.get('[data-testid="time"]').contains(session.time);
+    cy.get('[data-testid="time"]').contains(tomorrow);
+    cy.get('[data-testid="room"]').contains(session.venue_room);
+    cy.get('[data-testid="session-video"]').find('iframe').should('be.visible');
     cy.get('#session-modal').find('a.modal__close').click();
     cy.wait(1000);
 
-    cy.get('[data-cy="session-title"]').contains(proposal.title).click();
+    cy.get('[data-testid="session-title"]').contains(proposal.title).click();
     cy.wait('@view-session');
-    cy.get('[data-cy-session="title"]').contains(proposal.title);
-    cy.get('[data-cy-session="speaker"]').contains(user.fullname);
-    cy.get('[data-cy-session="time"]').contains(tomorrow);
-    cy.get('[data-cy-session="room"]').contains(proposal.venue_room);
-    cy.get('[data-cy="view-proposal"]').should('have.exist');
-    cy.get('[data-cy="view-proposal"]').invoke('removeAttr', 'target').click();
-    cy.get('a[data-cy="proposal-menu"]:visible').should('not.exist');
+    cy.get('[data-testid="title"]').contains(proposal.title);
+    cy.get('[data-testid="speaker"]').contains(user.fullname);
+    cy.get('[data-testid="time"]').contains(tomorrow);
+    cy.get('[data-testid="room"]').contains(proposal.venue_room);
+    cy.get('[data-testid="view-proposal"]').should('have.exist');
+    cy.get('[data-testid="view-proposal"]').invoke('removeAttr', 'target').click();
+    cy.get('a[data-testid="proposal-menu"]:visible').should('not.exist');
   });
 });
diff --git a/tests/cypress/e2e/15_addSessionVideo.cy.js b/tests/cypress/e2e/15_addSessionVideo.cy.js
index 26068322f..214647db2 100644
--- a/tests/cypress/e2e/15_addSessionVideo.cy.js
+++ b/tests/cypress/e2e/15_addSessionVideo.cy.js
@@ -15,22 +15,22 @@ describe('Add video to session', () => {
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('[data-cy-navbar="schedule"]').click();
+    cy.get('[data-testid="schedule"]').click();
     cy.get('.schedule__row__column--talks').contains(proposal.title).click();
     cy.wait('@view-session');
     cy.get('#session-modal').should('be.visible');
-    cy.get('[data-cy-admin="edit-session"]').click();
+    cy.get('[data-testid="edit-session"]').click();
     cy.get('#field-video_url').type(proposal.session_video);
-    cy.get('button[data-cy="form-submit-btn"]').click();
-    cy.get('[data-cy="session-video"]').find('iframe').should('be.visible');
-    cy.get('[data-cy="view-proposal"]').invoke('removeAttr', 'target').click();
-    cy.get('[data-cy="session-video"]').find('iframe').should('be.visible');
-    cy.get('img[data-cy="proposal-video-thumbnail"]').should('be.visible');
-    cy.get('img[data-cy="session-video-thumbnail"]').should('be.visible');
-    cy.get('a[data-cy="proposal-menu"]:visible').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
+    cy.get('[data-testid="session-video"]').find('iframe').should('be.visible');
+    cy.get('[data-testid="view-proposal"]').invoke('removeAttr', 'target').click();
+    cy.get('[data-testid="session-video"]').find('iframe').should('be.visible');
+    cy.get('img[data-testid="proposal-video-thumbnail"]').should('be.visible');
+    cy.get('img[data-testid="session-video-thumbnail"]').should('be.visible');
+    cy.get('a[data-testid="proposal-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="editor-panel"]:visible').click();
+    cy.get('a[data-testid="editor-panel"]:visible').click();
     cy.wait('@fetch-admin-panel');
-    cy.get('[data-cy="edit-session-video"]').should('exist');
+    cy.get('[data-testid="edit-session-video"]').should('exist');
   });
 });
diff --git a/tests/cypress/e2e/16_viewVideos.cy.js b/tests/cypress/e2e/16_viewVideos.cy.js
index f8653cd6e..231731044 100644
--- a/tests/cypress/e2e/16_viewVideos.cy.js
+++ b/tests/cypress/e2e/16_viewVideos.cy.js
@@ -10,8 +10,8 @@ describe('View project videos page', () => {
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('img[data-cy="thumbnail"]').should('be.visible');
-    cy.get('[data-cy="title"]').contains(proposal.title);
-    cy.get('[data-cy="title"]').contains(session.title);
+    cy.get('img[data-testid="thumbnail"]').should('be.visible');
+    cy.get('[data-testid="title"]').contains(proposal.title);
+    cy.get('[data-testid="title"]').contains(session.title);
   });
 });
diff --git a/tests/cypress/e2e/17_removeSessionVideo.cy.js b/tests/cypress/e2e/17_removeSessionVideo.cy.js
index a0096b65e..320fd15bd 100644
--- a/tests/cypress/e2e/17_removeSessionVideo.cy.js
+++ b/tests/cypress/e2e/17_removeSessionVideo.cy.js
@@ -14,16 +14,16 @@ describe('Remove video to session', () => {
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('[data-cy-navbar="schedule"]').click();
+    cy.get('[data-testid="schedule"]').click();
     cy.get('.schedule__row__column--talks').contains(proposal.title).click();
     cy.wait('@view-session');
     cy.get('#session-modal').should('be.visible');
-    cy.get('[data-cy="edit-video"]').click();
+    cy.get('[data-testid="edit-video"]').click();
     cy.get('#video_url').clear();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.get('#session-modal').find('iframe').should('not.exist');
-    cy.get('[data-cy="close-modal"]').click();
-    cy.get('[data-cy-navbar="about"]').click();
-    cy.get('[data-cy="title"]').contains(proposal.title).should('not.exist');
+    cy.get('[data-testid="close-modal"]').click();
+    cy.get('[data-testid="about"]').click();
+    cy.get('[data-testid="title"]').contains(proposal.title).should('not.exist');
   });
 });
diff --git a/tests/cypress/e2e/18_viewCrew.cy.js b/tests/cypress/e2e/18_viewCrew.cy.js
index a499aaf72..9bde6d44b 100644
--- a/tests/cypress/e2e/18_viewCrew.cy.js
+++ b/tests/cypress/e2e/18_viewCrew.cy.js
@@ -10,24 +10,24 @@ describe('View crew', () => {
       .contains(project.title)
       .click({ force: true });
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="crew"]').click();
-    cy.get('button[data-cy-btn="add-member"]').should('not.exist');
-    cy.get('[data-cy="member"]')
+    cy.get('a[data-testid="crew"]').click();
+    cy.get('button[data-testid="add-member"]').should('not.exist');
+    cy.get('[data-testid="member"]')
       .contains(admin.username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains('Editor');
-    cy.get('[data-cy="member"]')
+    cy.get('[data-testid="member"]')
       .contains(promoter.username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains('Promoter');
-    cy.get('[data-cy="member"]')
+    cy.get('[data-testid="member"]')
       .contains(usher.username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains('Usher');
-    cy.get('[data-cy="member"]').contains(admin.username).click();
+    cy.get('[data-testid="member"]').contains(admin.username).click();
     cy.get('#member-form', { timeout: 10000 }).should('not.be.visible');
   });
 });
diff --git a/tests/cypress/e2e/20_postComment.cy.js b/tests/cypress/e2e/20_postComment.cy.js
index a42c2f723..1c0125887 100644
--- a/tests/cypress/e2e/20_postComment.cy.js
+++ b/tests/cypress/e2e/20_postComment.cy.js
@@ -18,56 +18,56 @@ describe('Test comments feature', () => {
       .contains(project.title)
       .click({ force: true });
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="comments"]').click();
+    cy.get('a[data-testid="comments"]').click();
     cy.wait(2000);
-    cy.get('a[data-cy="login-btn"]').click();
+    cy.get('a[data-testid="login-btn"]').click();
     cy.fill_login_details(user.username, user.password);
     cy.wait(2000);
-    cy.get('[data-cy="post-comment"]').click();
-    cy.get('[data-cy="new-form"]')
+    cy.get('[data-testid="post-comment"]').click();
+    cy.get('[data-testid="new-form"]')
       .find('.cm-editor .cm-line')
       .type(project.comment, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="new-form"]').find('[data-cy="submit-comment"]').click();
+    cy.get('[data-testid="new-form"]').find('[data-testid="submit-comment"]').click();
     cy.wait('@post-comment');
     let cid = window.location.hash;
     cy.get('.comment__body').contains(project.comment);
     cy.get('.comment__header').contains(user.username);
 
     cy.wait(2000);
-    cy.get('a[data-cy="comment-menu"]:visible').click();
+    cy.get('a[data-testid="comment-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="edit"]').click();
-    cy.get('[data-cy="edit-form"]')
+    cy.get('a[data-testid="edit"]').click();
+    cy.get('[data-testid="edit-form"]')
       .find('.cm-editor .cm-line')
       .type(project.edit_comment, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="edit-form"]').find('[data-cy="edit-comment"]').click();
+    cy.get('[data-testid="edit-form"]').find('[data-testid="edit-comment"]').click();
     cy.wait('@edit-comment');
     cy.get(`${cid} .comment__body`).contains(project.edit_comment);
 
-    cy.get('a[data-cy="reply"]').click();
-    cy.get('[data-cy="reply-form"]')
+    cy.get('a[data-testid="reply"]').click();
+    cy.get('[data-testid="reply-form"]')
       .find('.cm-editor .cm-line')
       .type(project.reply_comment, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="reply-form"]').find('[data-cy="reply-comment"]').click();
+    cy.get('[data-testid="reply-form"]').find('[data-testid="reply-comment"]').click();
     cy.wait('@reply-comment');
     cid = window.location.hash;
     cy.get(`${cid} .comment__body`).contains(project.reply_comment);
     cy.wait(2000);
-    cy.get('[data-cy="comment-sidebar"]').click();
+    cy.get('[data-testid="comment-sidebar"]').click();
     cy.wait(2000);
-    cy.get('[data-cy="unread-comment"]').should('exist');
+    cy.get('[data-testid="unread-comment"]').should('exist');
 
     /*
     The test for deleting comments has been disabled as it
     interferes with the comment notification test. To be added back later.
-    cy.get('a[data-cy="comment-menu"]:visible').eq(1).click();
+    cy.get('a[data-testid="comment-menu"]:visible').eq(1).click();
     cy.wait(1000);
-    cy.get('a[data-cy="delete"]:visible').click();
+    cy.get('a[data-testid="delete"]:visible').click();
     cy.wait(1000);
-    cy.get('button[data-cy="confirm-delete-btn"]').click();
+    cy.get('button[data-testid="confirm-delete-btn"]').click();
     cy.wait('@delete-comment');
     cy.get('.comment__body')
       .contains(project.reply_comment)
@@ -83,7 +83,7 @@ describe('Test comments feature', () => {
       .contains(project.title)
       .click({ force: true });
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="comments"]').click();
-    cy.get('[data-cy="post-comment"]').should('exist');
+    cy.get('a[data-testid="comments"]').click();
+    cy.get('[data-testid="post-comment"]').should('exist');
   });
 });
diff --git a/tests/cypress/e2e/21_postUpdate.cy.js b/tests/cypress/e2e/21_postUpdate.cy.js
index c5eee659e..f2d9c4316 100644
--- a/tests/cypress/e2e/21_postUpdate.cy.js
+++ b/tests/cypress/e2e/21_postUpdate.cy.js
@@ -13,26 +13,26 @@ describe('Test updates feature', () => {
       .contains(project.title)
       .click({ force: true });
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy-navbar="updates"]').click();
+    cy.get('a[data-testid="updates"]').click();
 
-    cy.get('a[data-cy-btn="add-update"]').click();
+    cy.get('a[data-testid="add-update"]').click();
     cy.get('#title').type(project.update_title);
     cy.get('#field-body')
       .find('.cm-editor .cm-line')
       .type(project.update_body, { force: true });
     cy.get('#is_pinned').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.location('pathname').should('contain', 'updates');
 
-    cy.get('a[data-cy-btn="add-update"]').click();
+    cy.get('a[data-testid="add-update"]').click();
     cy.get('#title').type(project.restricted_update_title);
     cy.get('#field-body')
       .find('.cm-editor .cm-line')
       .type(project.restricted_update_body, { force: true });
     cy.get('#is_restricted').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.logout();
 
     cy.login('/', user.username, user.password);
@@ -43,11 +43,11 @@ describe('Test updates feature', () => {
     cy.get('.pinned__update')
       .find('.pinned__update__heading')
       .contains(project.update_title);
-    cy.get('a[data-cy-navbar="updates"]').click();
+    cy.get('a[data-testid="updates"]').click();
     cy.get('.update').contains(project.restricted_update_title);
-    cy.get('a[data-cy="my-updates"]:visible').click();
+    cy.get('a[data-testid="my-updates"]:visible').click();
     cy.wait('@fetch-updates');
-    cy.get('[data-cy="notification-box"]').contains(project.update_title);
+    cy.get('[data-testid="notification-box"]').contains(project.update_title);
     cy.logout();
 
     cy.login('/', newuser.username, newuser.password);
@@ -58,7 +58,7 @@ describe('Test updates feature', () => {
     cy.get('.pinned__update')
       .find('.pinned__update__heading')
       .contains(project.update_title);
-    cy.get('a[data-cy-navbar="updates"]').click();
+    cy.get('a[data-testid="updates"]').click();
     cy.get('.update__content')
       .contains(project.restricted_update_body)
       .should('not.exist');
diff --git a/tests/cypress/e2e/22_commentSubscription.cy.js b/tests/cypress/e2e/22_commentSubscription.cy.js
index 4c66cb33c..9e083f70f 100644
--- a/tests/cypress/e2e/22_commentSubscription.cy.js
+++ b/tests/cypress/e2e/22_commentSubscription.cy.js
@@ -12,71 +12,71 @@ describe('Confirm submission comment subscription', () => {
     cy.route('GET', '**/updates?*').as('fetch-updates');
 
     cy.login('/', member.username, member.password);
-    cy.get('#hgnav').find('a[data-cy="my-account"]').click();
+    cy.get('#hgnav').find('a[data-testid="my-account"]').click();
     cy.wait(1000);
-    cy.get('a[data-cy="profile"]').click();
-    cy.get('a[data-cy="submissions"]').click();
-    cy.get(`a[data-cy-proposal="${proposal.title}"]`).click();
-    cy.get('[data-cy="post-comment"]').click();
-    cy.get('[data-cy="new-form"]')
+    cy.get('a[data-testid="profile"]').click();
+    cy.get('a[data-testid="submissions"]').click();
+    cy.get(`a[data-testid="${proposal.title}"]`).click();
+    cy.get('[data-testid="post-comment"]').click();
+    cy.get('[data-testid="new-form"]')
       .find('.cm-editor .cm-line')
       .type(proposal.comment_2, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="new-form"]').find('[data-cy="submit-comment"]').click();
+    cy.get('[data-testid="new-form"]').find('[data-testid="submit-comment"]').click();
     cy.wait('@post-comment');
     cy.visit('/');
     cy.logout();
     cy.wait(1000);
 
     cy.login('/', editor.username, editor.password);
-    cy.get('a[data-cy="my-updates"]:visible').click();
+    cy.get('a[data-testid="my-updates"]:visible').click();
     cy.wait('@fetch-updates');
-    cy.get('[data-cy="notification-box"]').contains(project.title);
-    cy.get('[data-cy="notification-box"]').contains(proposal.title);
-    cy.get('[data-cy="comment-sidebar"]').click();
+    cy.get('[data-testid="notification-box"]').contains(project.title);
+    cy.get('[data-testid="notification-box"]').contains(proposal.title);
+    cy.get('[data-testid="comment-sidebar"]').click();
     cy.wait(1000);
-    cy.get('[data-cy="unread-comment"]').contains(project.reply_comment);
-    cy.get('[data-cy="unread-comment"]').contains(proposal.comment_2);
+    cy.get('[data-testid="unread-comment"]').contains(project.reply_comment);
+    cy.get('[data-testid="unread-comment"]').contains(proposal.comment_2);
     cy.logout();
     cy.wait(1000);
 
     cy.login('/', newuser.username, newuser.password);
-    cy.get('[data-cy="comment-sidebar"]').click();
+    cy.get('[data-testid="comment-sidebar"]').click();
     cy.get('.upcoming')
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('a[data-cy-navbar="submissions"]').click();
+    cy.get('a[data-testid="submissions"]').click();
     cy.get('#header-search').type(proposal.title);
-    cy.get(`a[data-cy-proposal="${proposal.title}"]`).click();
-    cy.get('a[data-cy="subscribe-proposal"]:visible').click();
+    cy.get(`a[data-testid="${proposal.title}"]`).click();
+    cy.get('a[data-testid="subscribe-proposal"]:visible').click();
     cy.wait(1000);
-    cy.get('[data-cy="subscription"]:visible').click();
+    cy.get('[data-testid="subscription"]:visible').click();
     cy.wait('@post-subscribe');
-    cy.get('a[data-cy="subscribe-proposal"]:visible').click();
+    cy.get('a[data-testid="subscribe-proposal"]:visible').click();
     cy.wait(1000);
-    cy.get('[data-cy="cancel-subscription"]:visible').click();
+    cy.get('[data-testid="cancel-subscription"]:visible').click();
     cy.wait('@post-subscribe');
-    cy.get('a[data-cy="subscribe-proposal"]:visible').click();
+    cy.get('a[data-testid="subscribe-proposal"]:visible').click();
     cy.wait(1000);
-    cy.get('[data-cy="subscription"]:visible').click();
+    cy.get('[data-testid="subscription"]:visible').click();
     cy.wait('@post-subscribe');
     cy.visit('/');
     cy.logout();
     cy.wait(1000);
 
     cy.login('/', member.username, member.password);
-    cy.get('a[data-cy="my-account"]:visible').click();
+    cy.get('a[data-testid="my-account"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy="profile"]').click();
-    cy.get('a[data-cy="submissions"]').click();
-    cy.get(`a[data-cy-proposal="${proposal.title}"]`).click();
-    cy.get('[data-cy="post-comment"]').click();
-    cy.get('[data-cy="new-form"]')
+    cy.get('a[data-testid="profile"]').click();
+    cy.get('a[data-testid="submissions"]').click();
+    cy.get(`a[data-testid="${proposal.title}"]`).click();
+    cy.get('[data-testid="post-comment"]').click();
+    cy.get('[data-testid="new-form"]')
       .find('.cm-editor .cm-line')
       .type(proposal.comment_3, { force: true });
     cy.wait(1000);
-    cy.get('[data-cy="new-form"]').find('[data-cy="submit-comment"]').click();
+    cy.get('[data-testid="new-form"]').find('[data-testid="submit-comment"]').click();
     cy.wait('@post-comment');
     cy.visit('/');
     cy.logout();
diff --git a/tests/cypress/e2e/23_addSponsor.cy.js b/tests/cypress/e2e/23_addSponsor.cy.js
index 3ed08c242..12c78ba26 100644
--- a/tests/cypress/e2e/23_addSponsor.cy.js
+++ b/tests/cypress/e2e/23_addSponsor.cy.js
@@ -17,8 +17,8 @@ describe('Add sponsor to project', () => {
       .find('.card--upcoming')
       .contains(project.title)
       .click({ force: true });
-    cy.get('a[data-cy="site-editor-menu"]:visible').click();
-    cy.get('a[data-cy="add-sponsor"]').click();
+    cy.get('a[data-testid="site-editor-menu"]:visible').click();
+    cy.get('a[data-testid="add-sponsor"]').click();
     cy.wait('@add-sponsor-form');
     cy.get('.select2-selection__arrow').click({ multiple: true });
     cy.get('.select2-search__field').type(sponsor.name, {
@@ -29,20 +29,20 @@ describe('Add sponsor to project', () => {
     );
     cy.get('.select2-results__option').contains(sponsor.name).click();
     cy.get('.select2-results__options', { timeout: 10000 }).should('not.exist');
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait(2000);
-    cy.get('[data-cy="profile-link"]').contains(sponsor.title);
+    cy.get('[data-testid="profile-link"]').contains(sponsor.title);
 
-    cy.get('a[data-cy="edit-sponsor"]:visible').click();
+    cy.get('a[data-testid="edit-sponsor"]:visible').click();
     cy.wait('@edit-sponsor-form');
     cy.get('#is_promoted').click();
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait(2000);
-    cy.get('[data-cy="sponsor-card"]').find('[data-cy="promoted"]').should('exist');
+    cy.get('[data-testid="sponsor-card"]').find('[data-testid="promoted"]').should('exist');
 
-    cy.get('a[data-cy="remove-sponsor"]:visible').click();
+    cy.get('a[data-testid="remove-sponsor"]:visible').click();
     cy.wait('@remove-sponsor-form');
     cy.get('input[value="Remove"]').click();
-    cy.get('[data-cy="sponsor-card"]').should('not.exist');
+    cy.get('[data-testid="sponsor-card"]').should('not.exist');
   });
 });
diff --git a/tests/cypress/e2e/eventsetup-tests/1_setupEvent.cy.js b/tests/cypress/e2e/eventsetup-tests/1_setupEvent.cy.js
index 471299a91..a506553ba 100644
--- a/tests/cypress/e2e/eventsetup-tests/1_setupEvent.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/1_setupEvent.cy.js
@@ -5,21 +5,21 @@ describe('Setup ticketed event for checkin', () => {
   it('Setup ticketed event for checkin', () => {
     cy.login('/', promoter.username, promoter.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
 
     cy.fixture('ticket_events').then((ticketEvents) => {
       ticketEvents.forEach((ticketEvent) => {
-        cy.get('a[data-cy="new-ticket-event"]').click();
+        cy.get('a[data-testid="new-ticket-event"]').click();
         cy.get('#title').type(ticketEvent.title);
         cy.get('#badge_template').type(ticketEvent.badge_template);
-        cy.get('button[data-cy="form-submit-btn"]').click();
+        cy.get('button[data-testid="form-submit-btn"]').click();
       });
     });
   });
diff --git a/tests/cypress/e2e/eventsetup-tests/2_synctickets.cy.js b/tests/cypress/e2e/eventsetup-tests/2_synctickets.cy.js
index 1d22186fd..9e66f4af2 100644
--- a/tests/cypress/e2e/eventsetup-tests/2_synctickets.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/2_synctickets.cy.js
@@ -10,16 +10,16 @@ describe('Sync tickets from Boxoffice', () => {
   it('Sync tickets from Boxoffice', () => {
     cy.login('/', promoter.username, promoter.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
 
-    cy.get('a[data-cy="new-ticket-client"').click();
+    cy.get('a[data-testid="new-ticket-client"').click();
     cy.get('#name').type(ticket_client.client_id, { log: false });
     cy.get('#clientid').type(ticket_client.client_id, { log: false });
     cy.get('#client_eventid').type(ticket_client.ic_id, { log: false });
@@ -27,24 +27,24 @@ describe('Sync tickets from Boxoffice', () => {
     cy.get('#client_access_token').type(ticket_client.access_key, {
       log: false,
     });
-    cy.get('button[data-cy="form-submit-btn"]').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
 
-    cy.get('button[data-cy="sync-tickets"').click();
+    cy.get('button[data-testid="sync-tickets"').click();
     cy.wait(12000);
-    cy.get('button[data-cy="sync-tickets"').click();
+    cy.get('button[data-testid="sync-tickets"').click();
 
     cy.fixture('ticket_events').then((fticketEvents) => {
       fticketEvents.forEach((ticketEvent) => {
-        cy.get(`li[data-cy-ticket="${ticketEvent.title}"]`)
-          .find('a[data-cy="ticket-edit"]')
+        cy.get(`li[data-testid="${ticketEvent.title}"]`)
+          .find('a[data-testid="ticket-edit"]')
           .click();
         cy.get('label').contains(ticketEvent.title).click();
-        cy.get('button[data-cy="form-submit-btn"]').click();
+        cy.get('button[data-testid="form-submit-btn"]').click();
       });
     });
 
-    cy.get('button[data-cy="sync-tickets"').click();
+    cy.get('button[data-testid="sync-tickets"').click();
     cy.wait(12000);
-    cy.get('button[data-cy="sync-tickets"').click();
+    cy.get('button[data-testid="sync-tickets"').click();
   });
 });
diff --git a/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js b/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
index 60af7838a..d2f0dd758 100644
--- a/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
@@ -9,18 +9,18 @@ describe('Checkin of attendees', () => {
   it('Checkin of attendees', () => {
     cy.login('/', promoter.username, promoter.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
 
     cy.fixture('ticket_participants').then((ticketParticipants) => {
       ticketParticipants.forEach((ticketParticipant) => {
-        cy.get('a[data-cy="add-ticket-participant"]').click();
+        cy.get('a[data-testid="add-ticket-participant"]').click();
         cy.get('#fullname').type(ticketParticipant.fullname);
         cy.get('#email').type(ticketParticipant.email);
         cy.get('#phone').type(ticketParticipant.phone);
@@ -30,22 +30,22 @@ describe('Checkin of attendees', () => {
           .find('label')
           .contains(ticketParticipant.ticketEvent)
           .click();
-        cy.get('button[data-cy="form-submit-btn"]').click();
+        cy.get('button[data-testid="form-submit-btn"]').click();
       });
     });
 
-    cy.get(`a[data-cy="${ticketEvents[0].title}"]`).click();
-    cy.get('td[data-cy="ticket-participant"]').contains(ticketParticipants[0].fullname);
-    cy.get('td[data-cy="ticket-participant"]').contains(ticketParticipants[1].fullname);
+    cy.get(`a[data-testid="${ticketEvents[0].title}"]`).click();
+    cy.get('td[data-testid="ticket-participant"]').contains(ticketParticipants[0].fullname);
+    cy.get('td[data-testid="ticket-participant"]').contains(ticketParticipants[1].fullname);
     cy.checkin(user.username);
-    cy.get('a[data-cy="back-to-setup"]').click();
+    cy.get('a[data-testid="back-to-setup"]').click();
 
-    cy.get(`a[data-cy="${ticketEvents[1].title}"]`).click();
+    cy.get(`a[data-testid="${ticketEvents[1].title}"]`).click();
     // Test failing
-    // cy.get('td[data-cy="ticket-participant"]')
+    // cy.get('td[data-testid="ticket-participant"]')
     //   .contains(ticketParticipants[2].fullname)
     //   .parent()
-    //   .find('a[data-cy="edit-attendee-details"]')
+    //   .find('a[data-testid="edit-attendee-details"]')
     //   .invoke('removeAttr', 'target')
     //   .click();
     // cy.url().should('contain', 'edit');
@@ -57,6 +57,6 @@ describe('Checkin of attendees', () => {
     //   .click();
 
     cy.checkin(ticketParticipants[2].fullname);
-    cy.get('a[data-cy="back-to-setup"]').click();
+    cy.get('a[data-testid="back-to-setup"]').click();
   });
 });
diff --git a/tests/cypress/e2e/eventsetup-tests/4_verifyUsherRoles.cy.js b/tests/cypress/e2e/eventsetup-tests/4_verifyUsherRoles.cy.js
index 51f36408f..9422904ec 100644
--- a/tests/cypress/e2e/eventsetup-tests/4_verifyUsherRoles.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/4_verifyUsherRoles.cy.js
@@ -6,19 +6,19 @@ describe('Verify roles of usher', () => {
   it('Access available for usher in project settings', () => {
     cy.login('/', usher.username, usher.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="edit"]').should('not.exist');
-    cy.get('a[data-cy="add-livestream"]').should('not.exist');
-    cy.get('a[data-cy="manage-venues"]').should('not.exist');
-    cy.get('a[data-cy="add-cfp"]').should('not.exist');
-    cy.get('a[data-cy="edit-schedule"]').should('not.exist');
-    cy.get('a[data-cy="manage-labels"]').should('not.exist');
-    cy.get('a[data-cy="setup-ticket-events"]').should('exist');
-    cy.get('a[data-cy="scan-checkin"]').should('exist');
+    cy.get('a[data-testid="edit"]').should('not.exist');
+    cy.get('a[data-testid="add-livestream"]').should('not.exist');
+    cy.get('a[data-testid="manage-venues"]').should('not.exist');
+    cy.get('a[data-testid="add-cfp"]').should('not.exist');
+    cy.get('a[data-testid="edit-schedule"]').should('not.exist');
+    cy.get('a[data-testid="manage-labels"]').should('not.exist');
+    cy.get('a[data-testid="setup-ticket-events"]').should('exist');
+    cy.get('a[data-testid="scan-checkin"]').should('exist');
   });
 });
diff --git a/tests/cypress/e2e/eventsetup-tests/5_badge.cy.js b/tests/cypress/e2e/eventsetup-tests/5_badge.cy.js
index d60b1232e..2f0c610d4 100644
--- a/tests/cypress/e2e/eventsetup-tests/5_badge.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/5_badge.cy.js
@@ -8,20 +8,20 @@ describe('View participant badge', () => {
   it('View participant badge', () => {
     cy.login('/', usher.username, usher.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
-    cy.get(`a[data-cy="${ticketEvents[1].title}"]`).click();
+    cy.get(`a[data-testid="${ticketEvents[1].title}"]`).click();
     const firstname = ticketParticipants[2].fullname.split(' ')[0];
-    cy.get('td[data-cy="ticket-participant"]')
+    cy.get('td[data-testid="ticket-participant"]')
       .contains(ticketParticipants[2].fullname)
       .parent()
-      .find('a[data-cy="show-badge"]')
+      .find('a[data-testid="show-badge"]')
       .invoke('removeAttr', 'target')
       .click();
     cy.url().should('contain', 'badge');
diff --git a/tests/cypress/e2e/eventsetup-tests/6_printbadge.cy.js b/tests/cypress/e2e/eventsetup-tests/6_printbadge.cy.js
index fea5664bb..0b62ea2ce 100644
--- a/tests/cypress/e2e/eventsetup-tests/6_printbadge.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/6_printbadge.cy.js
@@ -12,18 +12,18 @@ describe('View badges to be printed', () => {
 
     cy.login('/', usher.username, usher.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
-    cy.get(`a[data-cy="${ticketEvents[0].title}"]`).click();
+    cy.get(`a[data-testid="${ticketEvents[0].title}"]`).click();
     const firstname1 = ticketParticipants[0].fullname.split(' ')[0];
     const firstname2 = ticketParticipants[1].fullname.split(' ')[0];
-    cy.get('a[data-cy="badges-to-printed"]').invoke('removeAttr', 'target').click();
+    cy.get('a[data-testid="badges-to-printed"]').invoke('removeAttr', 'target').click();
     cy.url().should('contain', 'badges');
     cy.get('.first-name').should('contain', firstname1);
     cy.get('.first-name').should('contain', firstname2);
diff --git a/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js b/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
index 16970ae83..4cda2b5aa 100644
--- a/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
@@ -11,19 +11,19 @@ describe('View and update print status of badge', () => {
 
     cy.login('/testcypressproject', admin.username, admin.password);
 
-    cy.get(`[data-cy-title="${project.title}"]`).first().click();
+    cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
-    cy.get('a[data-cy="project-menu"]:visible').click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
     cy.wait(1000);
-    cy.get('a[data-cy-navbar="settings"]:visible').click();
+    cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
 
-    cy.get('a[data-cy="setup-ticket-events"').click();
+    cy.get('a[data-testid="setup-ticket-events"').click();
     cy.location('pathname').should('contain', '/admin');
-    cy.get(`a[data-cy="${ticketEvents[0].title}"]`).click();
+    cy.get(`a[data-testid="${ticketEvents[0].title}"]`).click();
     cy.get('select#badge_printed').select('Printed', { force: true });
     cy.get('#badge-form-submit').click();
-    cy.get('a[data-cy="badges-to-printed"]').invoke('removeAttr', 'target').click();
+    cy.get('a[data-testid="badges-to-printed"]').invoke('removeAttr', 'target').click();
     cy.url().should('contain', 'badges');
     cy.get('.first-name').should('not.exist');
   });
diff --git a/tests/cypress/support.js b/tests/cypress/support.js
index 00a318183..59340c3fc 100644
--- a/tests/cypress/support.js
+++ b/tests/cypress/support.js
@@ -7,19 +7,19 @@ Cypress.Commands.add('login', (route, username, password) => {
 });
 
 Cypress.Commands.add('logout', () => {
-  cy.get('#hgnav').find('a[data-cy="my-account"]').click();
+  cy.get('#hgnav').find('a[data-testid="my-account"]').click();
   cy.wait(1000);
-  cy.get('button[data-cy="Logout"]:visible').click();
+  cy.get('button[data-testid="Logout"]:visible').click();
 });
 
 Cypress.Commands.add('fill_login_details', (username, password) => {
   cy.server();
 
   cy.get('.field-username').type(username, { log: false });
-  cy.get('a[data-cy="password-login"]').click();
+  cy.get('a[data-testid="password-login"]').click();
   cy.get('.field-password').type(password, { log: false });
   cy.get('.form-actions').find('button:visible').click();
-  cy.get('a[data-cy="my-account"]:visible').should('exist');
+  cy.get('a[data-testid="my-account"]:visible').should('exist');
 });
 
 Cypress.Commands.add('add_profile_member', (username, field, role, fail = false) => {
@@ -28,7 +28,7 @@ Cypress.Commands.add('add_profile_member', (username, field, role, fail = false)
   cy.route('POST', '**/new').as('add-member');
 
   cy.wait(2000);
-  cy.get('button[data-cy-btn="add-member"]').click();
+  cy.get('button[data-testid="add-member"]').click();
   cy.wait('@member-form');
   cy.get('.select2-selection__arrow').click({ multiple: true });
   cy.get('.select2-search__field').type(username, {
@@ -45,10 +45,10 @@ Cypress.Commands.add('add_profile_member', (username, field, role, fail = false)
 
   if (!fail) {
     const roleString = role[0].toUpperCase() + role.slice(1);
-    cy.get('[data-cy="member"]')
+    cy.get('[data-testid="member"]')
       .contains(username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains(roleString);
   } else {
     cy.get('p.mui--text-danger').should('be.visible');
@@ -62,7 +62,7 @@ Cypress.Commands.add('add_member', (username, role, fail = false) => {
   cy.route('POST', '**/new').as('add-member');
 
   cy.wait(2000);
-  cy.get('button[data-cy-btn="add-member"]').click();
+  cy.get('button[data-testid="add-member"]').click();
   cy.wait('@member-form');
   cy.get('.select2-selection__arrow').click({ multiple: true });
   cy.get('.select2-search__field').type(username, {
@@ -79,10 +79,10 @@ Cypress.Commands.add('add_member', (username, role, fail = false) => {
 
   if (!fail) {
     const roleString = role[0].toUpperCase() + role.slice(1);
-    cy.get('[data-cy="member"]')
+    cy.get('[data-testid="member"]')
       .contains(username)
       .parents('.member')
-      .find('[data-cy="role"]')
+      .find('[data-testid="role"]')
       .contains(roleString);
   } else {
     cy.get('p.mui--text-danger').should('be.visible');
@@ -95,15 +95,15 @@ Cypress.Commands.add('checkin', (ticketParticipant) => {
   cy.route('POST', '**/ticket_participants/checkin').as('checkin');
   cy.route('**/ticket_participants/json').as('ticket-participant-list');
 
-  cy.get('td[data-cy="ticket-participant"]')
+  cy.get('td[data-testid="ticket-participant"]')
     .contains(ticketParticipant)
     .parent()
-    .find('button[data-cy="checkin"]')
+    .find('button[data-testid="checkin"]')
     .click();
   cy.wait('@checkin', { timeout: 15000 });
   cy.wait('@ticket-participant-list', { timeout: 20000 });
   cy.wait('@ticket-participant-list', { timeout: 20000 });
   cy.wait('@ticket-participant-list', { timeout: 20000 }).then((xhr) => {
-    cy.get('button[data-cy="cancel-checkin"]').should('exist');
+    cy.get('button[data-testid="cancel-checkin"]').should('exist');
   });
 });
diff --git a/tests/playwright/fixtures/boxoffice.js b/tests/playwright/fixtures/boxoffice.js
new file mode 100644
index 000000000..128f881e0
--- /dev/null
+++ b/tests/playwright/fixtures/boxoffice.js
@@ -0,0 +1,8 @@
+module.exports = {
+  ticket_client: {
+    client_id: Cypress.env('BOXOFFICE_CLIENT_ID'),
+    secret: Cypress.env('BOXOFFICE_SECRET_KEY'),
+    access_key: Cypress.env('BOXOFFICE_ACCESS_KEY'),
+    ic_id: Cypress.env('BOXOFFICE_IC_ID'),
+  },
+};
diff --git a/tests/playwright/fixtures/cfp.json b/tests/playwright/fixtures/cfp.json
new file mode 100644
index 000000000..56e6dd2da
--- /dev/null
+++ b/tests/playwright/fixtures/cfp.json
@@ -0,0 +1,3 @@
+{
+  "instructions": "##Topics for proposing talks/workshops/tutorials for ReactFoo Delhi:We are accepting proposals for: \n1. Full talks -- 40 mins duration \n2. Crisp talks -- 20 mins duration \n3. Birds of Feather (BOF) sessions \n4. Tutorials (90 mins duration) 5. Hands-on workshops -- of 3-6 hours duration -- where participants follow instructors on their laptops."
+}
diff --git a/tests/playwright/fixtures/labels.json b/tests/playwright/fixtures/labels.json
new file mode 100644
index 000000000..9462e0ef3
--- /dev/null
+++ b/tests/playwright/fixtures/labels.json
@@ -0,0 +1,22 @@
+[
+  {
+    "title": "Section",
+    "label1": "Crisp talk",
+    "label2": "Full talk"
+  },
+  {
+    "title": "Status",
+    "label1": "Need more information",
+    "label2": "Under review",
+    "label3": "Waiting for review comments",
+    "adminLabel": true
+  },
+  {
+    "title": "Technical level",
+    "label1": "Advanced",
+    "label2": "Beginner"
+  },
+  {
+    "title": "Talk"
+  }
+]
diff --git a/tests/playwright/fixtures/profile.json b/tests/playwright/fixtures/profile.json
new file mode 100644
index 000000000..cbd2d8382
--- /dev/null
+++ b/tests/playwright/fixtures/profile.json
@@ -0,0 +1,6 @@
+{
+  "title": "testcypressproject",
+  "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
+  "logo_url": "https://images.hasgeek.com/embed/file/59ec36fb37774e6ea6aea474f9b98aa8",
+  "banner_url": "https://images.hasgeek.com/embed/file/82cacecfa2d64f289ea54cfe45d33df3"
+}
diff --git a/tests/playwright/fixtures/project.json b/tests/playwright/fixtures/project.json
new file mode 100644
index 000000000..70bc2d583
--- /dev/null
+++ b/tests/playwright/fixtures/project.json
@@ -0,0 +1,18 @@
+{
+  "url": "javascript-2020",
+  "title": "Javascript 2020",
+  "location": "Bangalore",
+  "tagline": "On JavaScript and Security",
+  "website": "https://hasgeek.com",
+  "description": "##About the conference:\nJSFoo is Hasgeek's annual JavaScript conference. JSFoo is in its eighth edition this year.",
+  "bg_image": "https://images.hasgeek.com/embed/file/10acd7709d8e45b598ea107ff29a985e",
+  "livestream_url": "https://www.youtube.com/watch?v=AlREWUAEMVk",
+  "youtube_video_id": "AlREWUAEMVk",
+  "comment": "Lorem ipsum dolor sit amet",
+  "reply_comment": "consectetur adipiscing elit",
+  "edit_comment": "sed do eiusmod tempor incididunt",
+  "update_title": "Lorem ipsum dolor sit amet",
+  "update_body": "# Heading level 1\nParagraphs are separated by a blank line.\n2nd paragraph. *Italic*, **bold**, and `monospace`. Itemized lists\nlook like:\n* this one\n* that one\n* the other one\nNote that --- not considering the asterisk --- the actual text\ncontent starts at 4-columns in.\n> Block quotes are\n> written like so.\n> They can span multiple paragraphs,\n> if you like.\nUse 3 dashes for an em-dash. Use 2 dashes for ranges (ex., 'it's all in chapters 12--14'). Three dots ... will be converted to an ellipsis.Unicode is supported. ☺\nInline-style:\n![alt text](https://images.hasgeek.com/embed/file/d80f546ae6844f89a37956128c788c85)",
+  "restricted_update_title": "Finibus Bonorum et Malorum",
+  "restricted_update_body": "# Heading \nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderi"
+}
diff --git a/tests/playwright/fixtures/proposal.json b/tests/playwright/fixtures/proposal.json
new file mode 100644
index 000000000..52d4b932c
--- /dev/null
+++ b/tests/playwright/fixtures/proposal.json
@@ -0,0 +1,14 @@
+{
+  "title": "End to end testing",
+  "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+  "preview_video": "https://www.youtube.com/watch?v=SLlSDI-N8iM",
+  "room": "Taj M G Road – Banquet hall",
+  "venue_room": "Banquet hall, Taj M G Road",
+  "time": "9:05",
+  "email": "memberuser@example.com",
+  "session_video": "https://youtu.be/T0RzSqm2nfc",
+  "comment": "Please update slides with code snippets",
+  "proposer_note": "Adding preview video next week",
+  "comment_2": "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s",
+  "comment_3": "It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages"
+}
diff --git a/tests/playwright/fixtures/session.json b/tests/playwright/fixtures/session.json
new file mode 100644
index 000000000..b6fa8aed3
--- /dev/null
+++ b/tests/playwright/fixtures/session.json
@@ -0,0 +1,10 @@
+{
+  "title": "Introduction to end to end testing",
+  "time": "9:00",
+  "timecolumn": "9am",
+  "room": "Hasgeek House – Second floor room",
+  "venue_room": "Second floor room, Hasgeek House",
+  "speaker": "Vidya Ramakrishnan",
+  "bg": "https://images.hasgeek.com/embed/file/0bdbaad7b31d41aab8c9ba5471bae178",
+  "video": "https://www.youtube.com/watch?v=YqUZokjvSTc"
+}
diff --git a/tests/playwright/fixtures/sponsor.json b/tests/playwright/fixtures/sponsor.json
new file mode 100644
index 000000000..1bd24d515
--- /dev/null
+++ b/tests/playwright/fixtures/sponsor.json
@@ -0,0 +1,7 @@
+{
+  "title": "Beta",
+  "name": "beta",
+  "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
+  "logo_url": "https://images.hasgeek.com/embed/file/59ec36fb37774e6ea6aea474f9b98aa8",
+  "banner_url": "https://images.hasgeek.com/embed/file/82cacecfa2d64f289ea54cfe45d33df3"
+}
diff --git a/tests/playwright/fixtures/ticket_events.json b/tests/playwright/fixtures/ticket_events.json
new file mode 100644
index 000000000..38773373c
--- /dev/null
+++ b/tests/playwright/fixtures/ticket_events.json
@@ -0,0 +1,10 @@
+[
+  {
+    "title": "Conference Day",
+    "badge_template": "https://images.hasgeek.com/embed/file/0b04f0eb68b0416f9c0146da5c8ccd62"
+  },
+  {
+    "title": "Workshop",
+    "badge_template": "https://images.hasgeek.com/embed/file/0b04f0eb68b0416f9c0146da5c8ccd62"
+  }
+]
diff --git a/tests/playwright/fixtures/ticket_participants.json b/tests/playwright/fixtures/ticket_participants.json
new file mode 100644
index 000000000..652e17953
--- /dev/null
+++ b/tests/playwright/fixtures/ticket_participants.json
@@ -0,0 +1,26 @@
+[
+  {
+    "fullname": "Alpha Bravo",
+    "email": "alpha@mailinator.com",
+    "phone": "9102345679",
+    "company": "Tango",
+    "twitter": "alpha_bravo",
+    "ticketEvent": "Conference Day"
+  },
+  {
+    "fullname": "Charlie Delta",
+    "email": "bravo@mailinator.com",
+    "phone": "9102345679",
+    "company": "Sierra",
+    "twitter": "bravo123",
+    "ticketEvent": "Conference Day"
+  },
+  {
+    "fullname": "Echo Foxtrot",
+    "email": "charlie@mailinator.com",
+    "phone": "9102345679",
+    "company": "Zulu",
+    "twitter": "delta",
+    "ticketEvent": "Workshop"
+  }
+]
diff --git a/tests/playwright/fixtures/user.json b/tests/playwright/fixtures/user.json
new file mode 100644
index 000000000..0e78dbd0d
--- /dev/null
+++ b/tests/playwright/fixtures/user.json
@@ -0,0 +1,42 @@
+{
+  "owner": {
+    "username": "profile_cypress",
+    "fullname": "profile-cypress",
+    "password": "profile-cypress123_St"
+  },
+  "admin": {
+    "username": "admin_user",
+    "fullname": "admin-user",
+    "password": "admin-user129_Ftz"
+  },
+  "promoter": {
+    "username": "promoter_user",
+    "fullname": "promoter-user",
+    "password": "promoter-user34_qQE"
+  },
+  "usher": {
+    "username": "usher_cypress",
+    "fullname": "usher-cypress",
+    "password": "usher-cypress566_YUt"
+  },
+  "editor": {
+    "username": "editor_cypress",
+    "fullname": "editor-cypress",
+    "password": "editor-cypress9_GH"
+  },
+  "user": {
+    "username": "member_user",
+    "fullname": "member-user",
+    "password": "member-user341_Wer"
+  },
+  "hguser": {
+    "username": "hg_user",
+    "fullname": "hg-user",
+    "password": "hg-user5_HE"
+  },
+  "newuser": {
+    "username": "new_user",
+    "fullname": "new-user",
+    "password": "new-user11_EveryOne"
+  }
+}
diff --git a/tests/playwright/fixtures/venues.json b/tests/playwright/fixtures/venues.json
new file mode 100644
index 000000000..af4ffd8a1
--- /dev/null
+++ b/tests/playwright/fixtures/venues.json
@@ -0,0 +1,24 @@
+[
+  {
+    "venue_title": "Hasgeek House",
+    "venue_description": "Hasgeek House second floor",
+    "venue_address1": "#2699, 19th Main, 5th Cross",
+    "venue_address2": "Indiranagar HAL 2nd Stage",
+    "venue_city": "Bangalore",
+    "venue_state": "Karnataka",
+    "venue_postcode": "560008",
+    "room": {
+      "title": "Second floor room",
+      "description": "Second floor room",
+      "bgcolor": "F7B89E"
+    }
+  },
+  {
+    "venue_title": "Online",
+    "venue_description": "Zoom meeting",
+    "room": {
+      "title": "Zoom",
+      "bgcolor": "6075B1"
+    }
+  }
+]
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
new file mode 100644
index 000000000..79abbd67f
--- /dev/null
+++ b/tests/playwright/page/create-project.js
@@ -0,0 +1,27 @@
+import { test, expect } from '@playwright/test';
+const project = require('../fixtures/project.json');
+
+export class ProjectPage {
+
+  constructor(page) {
+    this.page = page;
+  }
+
+
+  async createNewProject(projectName) {
+    await this.page.getByTestId('new-project').click();
+    await this.page.locator('input#title').fill(projectName);
+    await this.page.locator('input#location').type(project.location);
+    await this.page.locator('input#tagline').type(project.tagline);
+    await this.page.locator('#field-description .cm-editor .cm-line').fill(project.description);
+    await this.page.getByTestId('form-submit-btn').click();
+  }
+
+  async publishProject() {
+    await this.page.getByTestId('project-menu').click();
+    await this.page.getByTestId('settings').click();
+    await this.page.getByTestId('publish').click();
+    await this.page.getByTestId('member":has-text("Published")').isVisible();
+  }
+
+}
diff --git a/tests/playwright/page/login.js b/tests/playwright/page/login.js
new file mode 100644
index 000000000..f2accb060
--- /dev/null
+++ b/tests/playwright/page/login.js
@@ -0,0 +1,29 @@
+export class LoginPage {
+
+  constructor(page) {
+    this.page = page;
+    this.loginBtn = this.page.getByTestId('login');
+    this.loginOutBtn = this.page.getByTestId('logout');
+    this.usernameInputBox = this.page.locator('input.field-username');
+    this.passwordInputBox = this.page.locator('input.field-password');
+    this.passwordBtn = this.page.getByTestId('password-login');
+    this.submitBtn = this.page.getByTestId('login-submit');
+    this.accountBtn = this.page.getByTestId('my-account');
+  }
+
+  async login(route, username, password) {
+    await this.page.goto(route);
+    await this.loginBtn.click();
+    await this.usernameInputBox.fill(username);
+    await this.passwordBtn.click();
+    await this.passwordInputBox.fill(password);
+    await this.submitBtn.click();
+  }
+
+  async logout() {
+    await this.accountBtn.click();
+    await this.loginOutBtn.waitFor();
+    await this.loginOutBtn.click();
+  }
+
+}
diff --git a/tests/playwright/page/profile-crew-form.js b/tests/playwright/page/profile-crew-form.js
new file mode 100644
index 000000000..7c96b58c4
--- /dev/null
+++ b/tests/playwright/page/profile-crew-form.js
@@ -0,0 +1,53 @@
+import { test, expect } from '@playwright/test';
+
+export class ProfileCrewFormPage {
+
+  constructor(page) {
+    this.page = page;
+  }
+
+  async addMember(username, role, success=true) {
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('add-member').click()
+    ]);
+    await this.page.locator('.select2-selection__arrow').waitFor()
+    await this.page.locator('.select2-selection__arrow').click();
+    await this.page.locator('.select2-search__field').waitFor();
+    await this.page.locator('.select2-search__field').fill(username);
+    await this.page.locator('.select2-results__option').waitFor();
+    await this.page.locator('.select2-results__option').click();
+    if(role == 'admin') {
+      await this.page.locator('div#field-is_owner input[value="True"]').click();
+    }
+    else {
+      await this.page.locator('div#field-is_owner input[value="False"]').click();
+    }
+    await Promise.all([
+      this.page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
+      this.page.getByTestId('form-submit-btn').getByText('Add member').click()
+    ]);
+    if(success) {
+      await this.page.locator('data-test-id="member":has-text("' + username + '")').isVisible();
+      await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+    } else {
+      await this.page.locator('p.mui--text-danger').isVisible();
+      await this.page.locator('a.modal__close:visible').click();
+    }
+
+  }
+
+  async deleteMember(username) {
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('member').getByText(username).click(),
+    ]);
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/delete") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('revoke-btn').click(),
+    ]);
+    await this.page.getByTestId('form-submit-btn').waitFor(3000);
+    await this.page.getByTestId('form-submit-btn').click();
+  }
+
+}
diff --git a/tests/playwright/page/project-crew-form.js b/tests/playwright/page/project-crew-form.js
new file mode 100644
index 000000000..f6aad3268
--- /dev/null
+++ b/tests/playwright/page/project-crew-form.js
@@ -0,0 +1,49 @@
+import { test, expect } from '@playwright/test';
+
+export class ProjectCrewFormPage {
+
+  constructor(page) {
+    this.page = page;
+  }
+
+
+  async addMember(username, role, success=true) {
+    let label = `div#field-is_${role} label`;
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('add-member').click()
+    ]);
+    await this.page.locator('.select2-selection__arrow').waitFor();
+    await this.page.locator('.select2-selection__arrow').click();
+    await this.page.locator('.select2-search__field').waitFor();
+    await this.page.locator('.select2-search__field').fill(username);
+    await this.page.locator('.select2-results__option').waitFor();
+    await this.page.locator('.select2-results__option').click();
+    await this.page.locator(label).click();
+    await Promise.all([
+      this.page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
+      this.page.getByTestId('form-submit-btn').getByText('Add member').click()
+    ]);
+    if(success) {
+      await this.page.locator('data-test-id="member":has-text("' + username + '")').isVisible();
+      await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+    } else {
+      await this.page.locator('p.mui--text-danger').isVisible();
+      await this.page.locator('a.modal__close:visible').click();
+    }
+  }
+
+  async deleteMember(username) {
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('member').getByText(username).click(),
+    ]);
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/delete") && response.status() === 200, {timeout: 60000}),
+      this.page.getByTestId('revoke-btn').click(),
+    ]);
+    await this.page.getByTestId('form-submit-btn').waitFor(3000);
+    await this.page.getByTestId('form-submit-btn').click();
+  }
+
+}
diff --git a/tests/playwright/tests/add-crew-project.spec.js b/tests/playwright/tests/add-crew-project.spec.js
new file mode 100644
index 000000000..44179b8fd
--- /dev/null
+++ b/tests/playwright/tests/add-crew-project.spec.js
@@ -0,0 +1,32 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
+
+test('Add crew to project', async ({ page }) => {
+  let randomProjectName = Math.random().toString(36).substring(2, 7);
+  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  // await page.getByTestId('make-profile-public').click();
+  // await page.getByTestId('make-public-btn').waitFor();
+  // await page.getByTestId('make-public-btn').click();
+
+  let projectPage = new ProjectPage(page);
+  await projectPage.createNewProject(projectNameCapitalize);
+
+  //Add crew
+  let crewForm = new ProjectCrewFormPage(page);
+  await page.getByTestId('crew').click();
+  await crewForm.addMember(promoter.username, 'promoter');
+  await crewForm.addMember(usher.username, 'usher');
+  await crewForm.addMember(editor.username, 'editor');
+  await crewForm.addMember(hguser.username, 'usher', false);
+  await crewForm.deleteMember(promoter.username);
+
+});
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
new file mode 100644
index 000000000..3103866a2
--- /dev/null
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -0,0 +1,72 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const venues = require('../fixtures/venues.json');
+const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
+
+test('Add venue to project', async ({ page }) => {
+  let randomProjectName = Math.random().toString(36).substring(2, 7);
+  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  // await page.getByTestId('make-profile-public').click();
+  // await page.getByTestId('make-public-btn').waitFor();
+  // await page.getByTestId('make-public-btn').click();
+
+  let projectPage = new ProjectPage(page);
+  await projectPage.createNewProject(projectNameCapitalize);
+
+
+  await page.getByTestId('project-menu').locator("visible=true").click();
+  await page.getByTestId('settings').locator("visible=true").waitFor();
+  await page.getByTestId('settings').locator("visible=true").click();
+  await page.getByTestId('manage-venues').click();
+
+  let venue = venues[0];
+
+  await page.getByTestId('new-venue').click();
+  await page.locator('input#title').fill(venue.venue_title);
+  await page.locator('#field-description .cm-editor .cm-line').fill(venue.venue_description);
+  await page.locator('input#address1').fill(venue.venue_address1);
+  await page.locator('input#address2').fill(venue.venue_address2);
+  await page.locator('input#city').fill(venue.venue_city);
+  await page.locator('input#state').fill(venue.venue_state);
+  await page.locator('input#postcode').fill(venue.venue_postcode);
+  await page.getByTestId('form-submit-btn').click();
+
+  // cy.get(`[data-testid="${venues[1].venue_title}"]`).click();
+  // cy.get('[data-testid="set-primary-venue"]').click();
+  // cy.get(`[data-testid="${venues[1].venue_title}"]`).find('em').contains('(primary)');
+
+  // venues.forEach((venue) => {
+  //   cy.get(`.card[data-testid="${venue.venue_title}"]`)
+  //     .find('a[data-testid="add-room"]')
+  //     .click();
+  //   cy.location('pathname').should('contain', '/new');
+  //   cy.get('#title').type(venue.room.title);
+  //   cy.get('#field-description')
+  //     .find('.cm-editor .cm-line')
+  //     .type(venue.room.description, { force: true });
+  //   cy.get('#bgcolor').clear().type(venue.room.bgcolor);
+  //   cy.get('button[data-testid="form-submit-btn"]').click();
+  //   cy.location('pathname').should(
+  //     'include',
+  //     `/testcypressproject/${project.url}/venues`
+  //   );
+  //   cy.get(`.card[data-testid="${venue.venue_title}"]`)
+  //     .find('li')
+  //     .contains(venue.room.title);
+  // });
+
+  // venues.forEach((venue) => {
+  //   cy.get(`[data-testid="${venue.room.title}"]`).should('exist');
+  // });
+
+
+
+
+});
diff --git a/tests/playwright/tests/create-profile.spec.js b/tests/playwright/tests/create-profile.spec.js
new file mode 100644
index 000000000..be5485b53
--- /dev/null
+++ b/tests/playwright/tests/create-profile.spec.js
@@ -0,0 +1,60 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProfileCrewFormPage } = require('../page/profile-crew-form');
+const { owner, admin, promoter, hguser } = require('../fixtures/user.json');
+
+test('To create profile, edit, add crew and update banner', async ({ page }) => {
+  let randomOrgName = Math.random().toString(36).substring(2,7);
+  let orgNameCapitalize = randomOrgName.charAt(0).toUpperCase() + randomOrgName.slice(1);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login('/', owner.username, owner.password);
+  await page.getByTestId('my-account').click();
+  await page.getByTestId('org').click();
+  await page.getByTestId('new').click();
+  await page.locator('input#title').fill(orgNameCapitalize);
+  await page.locator('input#name').fill(randomOrgName);
+  await page.getByTestId('form-submit-btn').click();
+  await page.locator('#field-description .cm-editor .cm-line').fill('Lorem Ipsum is simply dummy text of the printing and typesetting industry');
+  await page.getByTestId('form-submit-btn').click();
+  let titleRegex = new RegExp(orgNameCapitalize);
+  await expect(page).toHaveTitle(titleRegex);
+
+  // Add, edit  crew
+  let crewForm = new ProfileCrewFormPage(page);
+  await page.getByTestId('admins').click();
+  await crewForm.addMember(admin.username, 'admin');
+  await crewForm.addMember(promoter.username, 'owner');
+  await crewForm.deleteMember(promoter.username);
+  await crewForm.addMember(hguser.username, 'admin', false);
+
+  // Profile  transition from public to private
+  await page.getByTestId('admin-dropdown').click();
+  await page.getByTestId('make-profile-private').waitFor();
+  await page.getByTestId('make-profile-private').click();
+  await page.getByTestId('make-private-btn').waitFor();
+  await page.getByTestId('make-private-btn').click();
+  await page.getByTestId('make-profile-public').isVisible();
+  await loginPage.logout();
+
+  // Permissions for profile owner
+  // await loginPage.login(`/${randomOrgName}`, admin.username, admin.password);
+  await page.getByTestId('admin-dropdown').locator('visible=true').click();
+  await expect.soft(page.getByTestId('edit-details').locator('visible=true')).toBeVisible();
+  await page.getByTestId('admins').click();
+  await expect.soft(page.getByTestId('add-member')).toBeHidden();
+
+  // Edit profile and update banner
+  await page.getByTestId('admin-dropdown').locator('visible=true').click();
+  await page.getByTestId('edit-details').locator('visible=true').waitFor(5000);
+  await page.getByTestId('edit-details').locator('visible=true').click();
+  await page.locator('#field-description .cm-editor .cm-line').fill('Lorem Ipsum is simply dummy');
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('add-banner').isVisible();
+
+  // Verify notification update
+  await page.getByTestId('my-updates').locator('visible=true').click();
+  await page.waitForResponse('/updates?page=1');
+  await page.getByTestId('notification-box:has-text("' + orgNameCapitalize + '")');
+});
diff --git a/tests/playwright/tests/create-project.spec.js b/tests/playwright/tests/create-project.spec.js
new file mode 100644
index 000000000..542725c69
--- /dev/null
+++ b/tests/playwright/tests/create-project.spec.js
@@ -0,0 +1,42 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { owner } = require('../fixtures/user.json');
+
+test('To create project, edit, publish', async ({ page }) => {
+  let randomProjectName = Math.random().toString(36).substring(2, 7);
+  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  await page.getByTestId('make-profile-public').click();
+  await page.getByTestId('make-public-btn').waitFor();
+  await page.getByTestId('make-public-btn').click();
+
+  let projectPage = new ProjectPage(page);
+  await projectPage.createNewProject(projectNameCapitalize);
+  let titleRegex = new RegExp(projectNameCapitalize);
+  await expect(page).toHaveTitle(titleRegex);
+  await page.getByTestId('add-project-banner"]').isVisible();
+
+  //Edit project (Failing)
+  // await page.getByTestId('project-menu').click();
+  // await page.getByTestId('edit').waitFor(3000);
+  // await page.getByTestId('edit').click();
+  // await page.locator('input#tagline').type(project.tagline);
+  // await page.getByTestId('form-submit-btn').waitFor(20000);
+  // await page.getByTestId('form-submit-btn').click();
+  // await expect(page).toHaveTitle(titleRegex);
+
+  //Publish project
+  await projectPage.publishProject();
+
+  await page.getByTestId('profile-link').click();
+  await page.getByTestId('admin-dropdown').locator("visible=true").click();
+  await page.getByTestId('make-profile-private').locator("visible=true").click();
+  await page.getByTestId('make-private-btn').locator("visible=true").click();
+
+});

From b1fdcf178c1bcb41dae8b26224316a69f92adc24 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Sat, 2 Dec 2023 18:20:44 +0530
Subject: [PATCH 02/14] Next set of tests

---
 funnel/templates/labels.html.jinja2           |   2 +-
 funnel/templates/otpform.html.jinja2          |   2 +-
 funnel/templates/project_schedule.html.jinja2 |   2 +-
 funnel/templates/schedule_edit.html.jinja2    |   2 +-
 funnel/templates/venues.html.jinja2           |   4 +-
 tests/cypress/cypress_initdb_test.py          |   2 +-
 tests/playwright/fixtures/labels.json         |   2 +-
 tests/playwright/fixtures/project.json        |  41 ++++-
 tests/playwright/fixtures/venues.json         |   1 +
 tests/playwright/page/create-project.js       |  74 ++++++++-
 tests/playwright/page/profile-crew-form.js    |   6 +-
 tests/playwright/page/project-crew-form.js    |   2 +-
 .../playwright/tests/add-crew-project.spec.js |   3 -
 tests/playwright/tests/add-submission.spec.js |  77 +++++++++
 .../tests/add-venue-project.spec.js           |  75 ++++-----
 tests/playwright/tests/create-profile.spec.js |   8 +-
 tests/playwright/tests/create-project.spec.js |   8 -
 tests/playwright/tests/open-cfp.spec.js       | 155 ++++++++++++++++++
 18 files changed, 389 insertions(+), 77 deletions(-)
 create mode 100644 tests/playwright/tests/add-submission.spec.js
 create mode 100644 tests/playwright/tests/open-cfp.spec.js

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index f8f823090..f7df9a27d 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -12,7 +12,7 @@
 {%- endblock description -%}
 {% block top_title %}
   <h1 class="mui--text-headline">
-    <a href="{{ project.url_for() }}">{{ project.title }}</a>
+    <a href="{{ project.url_for() }}" data-testid="project-page">{{ project.title }}</a>
   </h1>
   <p class="mui--text-subhead">{% trans %}Manage labels{% endtrans %}</p>
 {% endblock top_title %}
diff --git a/funnel/templates/otpform.html.jinja2 b/funnel/templates/otpform.html.jinja2
index 51890e3df..f85b43fea 100644
--- a/funnel/templates/otpform.html.jinja2
+++ b/funnel/templates/otpform.html.jinja2
@@ -2,7 +2,7 @@
 {% from "forms.html.jinja2" import renderform, renderform_inner %}
 
 {% block form %}
-  <form data-parsley-validate="true" id="{{ ref_id }}" method="post" hx-post="{{ action }}" action="{{ action }}" {%- if multipart %} enctype="multipart/form-data" {%- endif %} accept-charset="UTF-8" class="mui-form mui-form--margins hg-form" hx-target="#loginformwrapper">
+  <form data-parsley-validate="true" id="{{ ref_id }}" method="post" hx-post="{{ action }}" {%- if multipart %} enctype="multipart/form-data" {%- endif %} accept-charset="UTF-8" class="mui-form mui-form--margins hg-form" hx-target="#loginformwrapper">
     {{ renderform_inner(form, formid) }}
     <div class="mui-form form-actions mui--clearfix{% if css_class %} {{ css_class }}{% endif %}">
       <div>
diff --git a/funnel/templates/project_schedule.html.jinja2 b/funnel/templates/project_schedule.html.jinja2
index efc9113ba..e15ca1fd8 100644
--- a/funnel/templates/project_schedule.html.jinja2
+++ b/funnel/templates/project_schedule.html.jinja2
@@ -92,7 +92,7 @@
         <div>
           <p class="mui--text-right">
             <a class="mui-btn mui-btn--raised mui-btn--dark"
-              href="{{ project.urls['edit_schedule'] }}">
+              href="{{ project.urls['edit_schedule'] }}" data-testid="edit-schedule">
               {%- trans %}Edit schedule{% endtrans -%}
             </a>
           </p>
diff --git a/funnel/templates/schedule_edit.html.jinja2 b/funnel/templates/schedule_edit.html.jinja2
index 3876c5074..f3303c10f 100644
--- a/funnel/templates/schedule_edit.html.jinja2
+++ b/funnel/templates/schedule_edit.html.jinja2
@@ -70,7 +70,7 @@
               <div class="ui-draggable-box ui-draggable-box--header">
                 <input name="venue-seq" value="{{ venue.seq }}" readonly class="seq-input" data-venue="{{ venue.uuid_b58 }}" />
                 <div class="collapsible">
-                  <div class="collapsible__header" data-testid-collapsible="open">
+                  <div class="collapsible__header" data-testid="collapsible-open">
                     <input type="hidden" name="uuid" value="{{ venue.uuid_b58 }}" />
                     {{ faicon(icon='grip-vertical', icon_size='caption', baseline=false, css_class="mui--text-light drag-icon drag-handle") }}
                     <span class="mui--text-subhead">{{ venue.title }}</span>
diff --git a/funnel/templates/venues.html.jinja2 b/funnel/templates/venues.html.jinja2
index 303f1f661..f53bfb8e4 100644
--- a/funnel/templates/venues.html.jinja2
+++ b/funnel/templates/venues.html.jinja2
@@ -3,7 +3,7 @@
 {% block title %}{% trans %}Venues{% endtrans %}{% endblock title %}
 
 {% block top_title %}
-  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}">{{ project.title }}</a></h1>
+  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}" data-testid="project-page">{{ project.title }}</a></h1>
   <p class="mui--text-subhead">{% trans %}Venues{% endtrans %}</p>
 {% endblock top_title %}
 
@@ -43,7 +43,7 @@
   <div class="grid">
     {%- for venue in venues %}
       <div class="grid__col-xs-12 grid__col-sm-6">
-        <div class="card" data-testid="{{ venue.title }}">
+        <div class="card" data-testid="{{ venue.title }}-rooms">
           <div class="card__header">
             <h3><b>{{ venue.title }}</b>{%- if venue == project.primary_venue %}<em> (primary) </em>{% endif %}</h3>
             <div class="mui--text-body2">{{ venue.description }}</div>
diff --git a/tests/cypress/cypress_initdb_test.py b/tests/cypress/cypress_initdb_test.py
index 21abc62d8..471f22279 100644
--- a/tests/cypress/cypress_initdb_test.py
+++ b/tests/cypress/cypress_initdb_test.py
@@ -70,7 +70,7 @@ def init_models():
             name='testcypressproject', title='testcypressproject', owner=profile_owner
         )
         org.is_verified = True
-        org.publish()
+        org.make_profile_public()
 
         db.session.add_all(
             [
diff --git a/tests/playwright/fixtures/labels.json b/tests/playwright/fixtures/labels.json
index 9462e0ef3..46251a8f8 100644
--- a/tests/playwright/fixtures/labels.json
+++ b/tests/playwright/fixtures/labels.json
@@ -9,7 +9,7 @@
     "label1": "Need more information",
     "label2": "Under review",
     "label3": "Waiting for review comments",
-    "adminLabel": true
+    "adminLabel": "true"
   },
   {
     "title": "Technical level",
diff --git a/tests/playwright/fixtures/project.json b/tests/playwright/fixtures/project.json
index 70bc2d583..cd0c0350a 100644
--- a/tests/playwright/fixtures/project.json
+++ b/tests/playwright/fixtures/project.json
@@ -14,5 +14,44 @@
   "update_title": "Lorem ipsum dolor sit amet",
   "update_body": "# Heading level 1\nParagraphs are separated by a blank line.\n2nd paragraph. *Italic*, **bold**, and `monospace`. Itemized lists\nlook like:\n* this one\n* that one\n* the other one\nNote that --- not considering the asterisk --- the actual text\ncontent starts at 4-columns in.\n> Block quotes are\n> written like so.\n> They can span multiple paragraphs,\n> if you like.\nUse 3 dashes for an em-dash. Use 2 dashes for ranges (ex., 'it's all in chapters 12--14'). Three dots ... will be converted to an ellipsis.Unicode is supported. ☺\nInline-style:\n![alt text](https://images.hasgeek.com/embed/file/d80f546ae6844f89a37956128c788c85)",
   "restricted_update_title": "Finibus Bonorum et Malorum",
-  "restricted_update_body": "# Heading \nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderi"
+  "restricted_update_body": "# Heading \nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderi",
+  "cfp_instructions": "##Topics for proposing talks/workshops/tutorials for event",
+  "venue": {
+    "title": "Online",
+    "room": "Zoom"
+  },
+  "labels": [
+    {
+      "title": "Tracks",
+      "sublabels": [
+        "AI Engineering",
+        "Data Science",
+        "Devops"
+      ]
+    },
+    {
+      "title": "Track",
+      "sublabels": [
+        "Full talk",
+        "BOF/Panel discussion",
+        "Lighting talk",
+        "Demo"
+      ]
+    },
+    {
+      "title": "Status",
+      "sublabels": [
+        "Confirmed",
+        "Shortlisted",
+        "Requires more details",
+        "Not accepted"
+      ],
+      "adminLabel": "true"
+    }
+  ],
+  "session_title": "Check-in",
+  "session_content": "Check-in starts at 9am",
+  "session_timecolumn": "9am",
+  "proposal_title": "Consectetur adipiscing elit",
+  "proposal_content": "Lorem ipsum dolor sit amet"
 }
diff --git a/tests/playwright/fixtures/venues.json b/tests/playwright/fixtures/venues.json
index af4ffd8a1..6231fcb8a 100644
--- a/tests/playwright/fixtures/venues.json
+++ b/tests/playwright/fixtures/venues.json
@@ -18,6 +18,7 @@
     "venue_description": "Zoom meeting",
     "room": {
       "title": "Zoom",
+      "description": "Zoom link",
       "bgcolor": "6075B1"
     }
   }
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
index 79abbd67f..3726ccaae 100644
--- a/tests/playwright/page/create-project.js
+++ b/tests/playwright/page/create-project.js
@@ -1,13 +1,15 @@
 import { test, expect } from '@playwright/test';
+const { LoginPage } = require('../page/login');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
+const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
+const { owner } = require('../fixtures/user.json');
 
 export class ProjectPage {
-
   constructor(page) {
     this.page = page;
   }
 
-
   async createNewProject(projectName) {
     await this.page.getByTestId('new-project').click();
     await this.page.locator('input#title').fill(projectName);
@@ -24,4 +26,72 @@ export class ProjectPage {
     await this.page.getByTestId('member":has-text("Published")').isVisible();
   }
 
+  async addLabels() {
+    await this.page.getByTestId('project-menu').locator('visible=true').click();
+    await this.page.getByTestId('settings').locator('visible=true').click();
+    await this.page.getByTestId('manage-labels').click();
+
+    for (let label of project.labels) {
+      await this.page.getByTestId('add-labels').click();
+      await this.page.locator('input#title').fill(label.title);
+      if (label.sublabels) {
+        for (let i=0; i<label.sublabels.length; i++) {
+          await this.page.locator('#add-sublabel-form').click();
+          await this.page.locator('#child-form > .ui-draggable-box').locator(`nth=${i}`).locator('input#title').type(label.sublabels[i]);
+        }
+      }
+      if (label.adminLabel) {
+        await this.page.locator('#field-restricted label').click();
+      }
+      await this.page.getByTestId('save-label').click();
+    }
+    await this.page.getByTestId("project-page").click();
+  }
+
+  async addVenue() {
+    await this.page.getByTestId('project-menu').locator("visible=true").click();
+    await this.page.getByTestId('settings').locator("visible=true").waitFor();
+    await this.page.getByTestId('settings').locator("visible=true").click();
+    await this.page.getByTestId('manage-venues').click();
+    await this.page.getByTestId('new-venue').click();
+    await this.page.locator('input#title').fill('Online');
+    await this.page.locator('#field-description .cm-editor .cm-line').fill('Zoom Link');
+    await this.page.getByTestId('form-submit-btn').click();
+    await this.page.locator(`.card[data-testid="Online-rooms"] a[data-testid="add-room"]`).click();
+    await this.page.locator('input#title').fill('Zoom');
+    await this.page.locator('#field-description .cm-editor .cm-line').fill('Zoom link');
+    await this.page.getByTestId('form-submit-btn').click();
+    await this.page.getByTestId("Zoom").isVisible();
+    await this.page.getByTestId("project-page").click();
+  }
+
+  async openCFP() {
+    await this.page.getByTestId('submissions').click();
+    await this.page.getByTestId('add-cfp').click();
+    await this.page.locator('#field-instructions .cm-editor .cm-line').fill(project.cfp_instructions);
+    await this.page.getByTestId('add-cfp').click();
+    await this.page.locator('label.switch-label').locator("visible=true").click();
+  }
+
+  async addProject(loginUser, crew) {
+    let randomProjectName = Math.random().toString(36).substring(2, 7);
+    let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+    let loginPage;
+    loginPage = new LoginPage(this.page);
+    await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+    await this.createNewProject(projectNameCapitalize);
+    let crewForm = new ProjectCrewFormPage(this.page);
+    await this.page.getByTestId('crew').click();
+    for(let member in crew) {
+      await crewForm.addMember(member.username, member.role);
+    }
+    await this.addLabels();
+    await this.addVenue();
+    await this.openCFP();
+    await this.publishProject();
+
+    await loginPage.logout();
+    return randomProjectName;
+  }
+
 }
diff --git a/tests/playwright/page/profile-crew-form.js b/tests/playwright/page/profile-crew-form.js
index 7c96b58c4..ed164206c 100644
--- a/tests/playwright/page/profile-crew-form.js
+++ b/tests/playwright/page/profile-crew-form.js
@@ -6,7 +6,7 @@ export class ProfileCrewFormPage {
     this.page = page;
   }
 
-  async addMember(username, role, success=true) {
+  async addMember(username, owner=true, success=true) {
     await Promise.all([
       this.page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
       this.page.getByTestId('add-member').click()
@@ -17,7 +17,7 @@ export class ProfileCrewFormPage {
     await this.page.locator('.select2-search__field').fill(username);
     await this.page.locator('.select2-results__option').waitFor();
     await this.page.locator('.select2-results__option').click();
-    if(role == 'admin') {
+    if(owner) {
       await this.page.locator('div#field-is_owner input[value="True"]').click();
     }
     else {
@@ -32,7 +32,7 @@ export class ProfileCrewFormPage {
       await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
     } else {
       await this.page.locator('p.mui--text-danger').isVisible();
-      await this.page.locator('a.modal__close:visible').click();
+      await this.page.locator('a.modal__close').locator('visible=true').click();
     }
 
   }
diff --git a/tests/playwright/page/project-crew-form.js b/tests/playwright/page/project-crew-form.js
index f6aad3268..1396ce597 100644
--- a/tests/playwright/page/project-crew-form.js
+++ b/tests/playwright/page/project-crew-form.js
@@ -29,7 +29,7 @@ export class ProjectCrewFormPage {
       await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
     } else {
       await this.page.locator('p.mui--text-danger').isVisible();
-      await this.page.locator('a.modal__close:visible').click();
+      await this.page.locator('a.modal__close').locator('visible=true').click();
     }
   }
 
diff --git a/tests/playwright/tests/add-crew-project.spec.js b/tests/playwright/tests/add-crew-project.spec.js
index 44179b8fd..0a7a634be 100644
--- a/tests/playwright/tests/add-crew-project.spec.js
+++ b/tests/playwright/tests/add-crew-project.spec.js
@@ -13,9 +13,6 @@ test('Add crew to project', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login(`/${profile.title}`, owner.username, owner.password);
-  // await page.getByTestId('make-profile-public').click();
-  // await page.getByTestId('make-public-btn').waitFor();
-  // await page.getByTestId('make-public-btn').click();
 
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
new file mode 100644
index 000000000..23ab64263
--- /dev/null
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -0,0 +1,77 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { user, editor, usher } = require('../fixtures/user.json');
+const proposal = require('../fixtures/proposal.json');
+let randomProjectName;
+
+test('Submitting a proposal to a project', async ({ page }) => {
+  let projectPage = new ProjectPage(page);
+  randomProjectName = await projectPage.addProject(editor, {});
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
+
+  await page.getByTestId('propose-a-session').locator('visible=true').click();
+  await page.getByTestId('close-consent-modal').click();
+  await page.locator('#title').fill(proposal.title);
+  await page.locator('#field-body .cm-editor .cm-line').fill(proposal.content);
+  await page.getByTestId('add-video').click();
+  await page.locator('#field-video_url').waitFor(1000);
+  await page.locator('#video_url').fill(proposal.preview_video);
+  await page.getByTestId('save').locator('visible=true').click();
+  await page.getByTestId('add-label').click();
+  await page.locator('fieldset').waitFor(1000);
+  await page.getByLabel(project.labels[0].sublabels[0]).click();
+  await page.getByLabel(project.labels[1].sublabels[2]).click();
+  await page.getByTestId('save').locator('visible=true').click();
+  await page.getByTestId('form-submit-btn').click();
+
+  await expect(page.getByTestId('proposal-title')).toContainText(proposal.title);
+  await page.getByTestId('proposal-video iframe').isVisible();
+  await page.getByTestId('proposal-menu').locator('visible=true').click();
+  await page.getByTestId('edit').waitFor(1000);
+  await page.getByTestId('edit').locator('visible=true').click();
+  await page.getByTestId('close-consent-modal').click();
+
+  await page.getByTestId('add-collaborator-modal').click();
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('add-collaborator').click()
+  ]);
+  await page.locator('.select2-selection__arrow').waitFor();
+  await page.locator('.select2-selection__arrow').click();
+  await page.locator('.select2-search__field').waitFor();
+  await page.locator('.select2-search__field').fill(usher.username);
+  await page.locator('.select2-results__option').waitFor();
+  await page.locator('.select2-results__option').click();
+  await page.locator('#label').fill('Editor');
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
+    page.locator('.modal').locator('button[data-testid="form-submit-btn"]').locator('visible=true').click()
+  ]);
+  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+  await page.locator('a.modal__close').locator('visible=true').click();
+  await page.getByTestId('form-submit-btn').click();
+  await page.locator('.user__box__userid user__box__fullname', { hasText: usher.username }).isVisible();
+  await page.locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' }).isVisible();
+
+  await page.getByTestId('proposal-menu').locator('visible=true').click();
+  await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
+  await page.getByTestId('delete').isVisible();
+  await page.getByTestId('edit-proposal-video').isVisible();
+
+  await page.getByTestId('post-comment').click();
+  await page.getByTestId('new-form').locator('.cm-editor .cm-line').fill(proposal.proposer_note);
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
+    page.getByTestId('new-form').getByTestId('submit-comment').click()
+  ]);
+  await expect(page.locator('.comment__body')).toContainText(proposal.proposer_note);
+  await expect(page.locator('.comment__header')).toContainText(user.username);
+
+});
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index 3103866a2..2fc01aac0 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -5,7 +5,7 @@ const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const venues = require('../fixtures/venues.json');
-const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
+const { owner } = require('../fixtures/user.json');
 
 test('Add venue to project', async ({ page }) => {
   let randomProjectName = Math.random().toString(36).substring(2, 7);
@@ -13,60 +13,41 @@ test('Add venue to project', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login(`/${profile.title}`, owner.username, owner.password);
-  // await page.getByTestId('make-profile-public').click();
-  // await page.getByTestId('make-public-btn').waitFor();
-  // await page.getByTestId('make-public-btn').click();
-
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
 
-
   await page.getByTestId('project-menu').locator("visible=true").click();
   await page.getByTestId('settings').locator("visible=true").waitFor();
   await page.getByTestId('settings').locator("visible=true").click();
   await page.getByTestId('manage-venues').click();
 
-  let venue = venues[0];
-
-  await page.getByTestId('new-venue').click();
-  await page.locator('input#title').fill(venue.venue_title);
-  await page.locator('#field-description .cm-editor .cm-line').fill(venue.venue_description);
-  await page.locator('input#address1').fill(venue.venue_address1);
-  await page.locator('input#address2').fill(venue.venue_address2);
-  await page.locator('input#city').fill(venue.venue_city);
-  await page.locator('input#state').fill(venue.venue_state);
-  await page.locator('input#postcode').fill(venue.venue_postcode);
-  await page.getByTestId('form-submit-btn').click();
-
-  // cy.get(`[data-testid="${venues[1].venue_title}"]`).click();
-  // cy.get('[data-testid="set-primary-venue"]').click();
-  // cy.get(`[data-testid="${venues[1].venue_title}"]`).find('em').contains('(primary)');
-
-  // venues.forEach((venue) => {
-  //   cy.get(`.card[data-testid="${venue.venue_title}"]`)
-  //     .find('a[data-testid="add-room"]')
-  //     .click();
-  //   cy.location('pathname').should('contain', '/new');
-  //   cy.get('#title').type(venue.room.title);
-  //   cy.get('#field-description')
-  //     .find('.cm-editor .cm-line')
-  //     .type(venue.room.description, { force: true });
-  //   cy.get('#bgcolor').clear().type(venue.room.bgcolor);
-  //   cy.get('button[data-testid="form-submit-btn"]').click();
-  //   cy.location('pathname').should(
-  //     'include',
-  //     `/testcypressproject/${project.url}/venues`
-  //   );
-  //   cy.get(`.card[data-testid="${venue.venue_title}"]`)
-  //     .find('li')
-  //     .contains(venue.room.title);
-  // });
-
-  // venues.forEach((venue) => {
-  //   cy.get(`[data-testid="${venue.room.title}"]`).should('exist');
-  // });
-
-
+  for (let venue of venues) {
+    await page.getByTestId('new-venue').click();
+    await page.locator('input#title').fill(venue.venue_title);
+    await page.locator('#field-description .cm-editor .cm-line').fill(venue.venue_description);
+    if(venue.venue_address1) {
+      await page.locator('input#address1').fill(venue.venue_address1);
+      await page.locator('input#address2').fill(venue.venue_address2);
+      await page.locator('input#city').fill(venue.venue_city);
+      await page.locator('input#state').fill(venue.venue_state);
+      await page.locator('input#postcode').fill(venue.venue_postcode);
+    }
+    await page.getByTestId('form-submit-btn').click();
+  };
+
+  await page.getByTestId(`${venues[1].venue_title}`).click();
+  await page.getByTestId('set-primary-venue').click();
+  await page.locator(`data-testid=${venues[1].venue_title}-rooms em`, { hasText: 'Details' }).isVisible();
+
+  for (let venue of venues) {
+    await page.locator(`.card[data-testid="${venue.venue_title}-rooms"] a[data-testid="add-room"]`)
+      .click();
+    await page.locator('input#title').fill(venue.room.title);
+    await page.locator('#field-description .cm-editor .cm-line').fill(venue.room.description);
+    await page.locator('input#bgcolor').fill(venue.room.bgcolor);
+    await page.getByTestId('form-submit-btn').click();
+    await page.getByTestId(`${venue.room.title}`).isVisible();
+  };
 
 
 });
diff --git a/tests/playwright/tests/create-profile.spec.js b/tests/playwright/tests/create-profile.spec.js
index be5485b53..a70eecc10 100644
--- a/tests/playwright/tests/create-profile.spec.js
+++ b/tests/playwright/tests/create-profile.spec.js
@@ -24,10 +24,10 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   // Add, edit  crew
   let crewForm = new ProfileCrewFormPage(page);
   await page.getByTestId('admins').click();
-  await crewForm.addMember(admin.username, 'admin');
-  await crewForm.addMember(promoter.username, 'owner');
+  await crewForm.addMember(admin.username, false);
+  await crewForm.addMember(promoter.username, true);
   await crewForm.deleteMember(promoter.username);
-  await crewForm.addMember(hguser.username, 'admin', false);
+  await crewForm.addMember(hguser.username,false, false);
 
   // Profile  transition from public to private
   await page.getByTestId('admin-dropdown').click();
@@ -39,7 +39,7 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await loginPage.logout();
 
   // Permissions for profile owner
-  // await loginPage.login(`/${randomOrgName}`, admin.username, admin.password);
+  await loginPage.login(`/${randomOrgName}`, admin.username, admin.password);
   await page.getByTestId('admin-dropdown').locator('visible=true').click();
   await expect.soft(page.getByTestId('edit-details').locator('visible=true')).toBeVisible();
   await page.getByTestId('admins').click();
diff --git a/tests/playwright/tests/create-project.spec.js b/tests/playwright/tests/create-project.spec.js
index 542725c69..6ae291d28 100644
--- a/tests/playwright/tests/create-project.spec.js
+++ b/tests/playwright/tests/create-project.spec.js
@@ -12,9 +12,6 @@ test('To create project, edit, publish', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login(`/${profile.title}`, owner.username, owner.password);
-  await page.getByTestId('make-profile-public').click();
-  await page.getByTestId('make-public-btn').waitFor();
-  await page.getByTestId('make-public-btn').click();
 
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
@@ -34,9 +31,4 @@ test('To create project, edit, publish', async ({ page }) => {
   //Publish project
   await projectPage.publishProject();
 
-  await page.getByTestId('profile-link').click();
-  await page.getByTestId('admin-dropdown').locator("visible=true").click();
-  await page.getByTestId('make-profile-private').locator("visible=true").click();
-  await page.getByTestId('make-private-btn').locator("visible=true").click();
-
 });
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
new file mode 100644
index 000000000..19fdfbf19
--- /dev/null
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -0,0 +1,155 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { owner, editor } = require('../fixtures/user.json');
+const cfp = require('../fixtures/cfp.json');
+const labels = require('../fixtures/labels.json');
+const dayjs = require('dayjs');
+
+test('Open call for proposal of the project and add schedule', async ({ page }) => {
+  let randomProjectName = Math.random().toString(36).substring(2, 7);
+  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  let projectPage = new ProjectPage(page);
+  await projectPage.createNewProject(projectNameCapitalize);
+  let crewForm = new ProjectCrewFormPage(page);
+  await page.getByTestId('crew').click();
+  await crewForm.addMember(editor.username, 'editor');
+  projectPage.publish();
+  await loginPage.logout();
+
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
+
+  await page.getByTestId('submissions').click();
+  await page.getByTestId('add-cfp').click();
+  await page.locator('#field-instructions .cm-editor .cm-line').fill(cfp.instructions);
+  await page.getByTestId('add-cfp').click();
+  await page.locator('label.switch-label').click();
+  await page.getByTestId('cfp-state', { hasText: 'Accepting submissions' }).isVisible();
+  await page.getByTestId('propose-a-session').isVisible();
+
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').click();
+  await page.getByTestId('manage-labels').click();
+
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').click();
+  await page.getByTestId('manage-labels').click();
+
+  for (let label of labels) {
+    await page.getByTestId('add-labels').click();
+    await page.locator('input#title').fill(label.title);
+    await page.locator('.emojionearea-button').click();
+    await page.locator('.emojionearea-picker').waitFor();
+    await page.locator('.emojionearea-category[name="smileys_people"] i[title="Innocent"]').click();
+    await expect(page.locator('.emojionearea-picker')).toBeHidden();
+
+    if (label.label1) {
+      await page.locator('#add-sublabel-form').click();
+      await page.locator('#child-form > .ui-draggable-box #title').type(label.label1);
+      await page.locator('#child-form > .ui-draggable-box .emojionearea-button').click();
+      await page.locator('#child-form > .ui-draggable-box .emojionearea-picker').waitFor();
+
+      // Emoji Relaxed is throwing not a valid emoji error
+      await page.locator('#child-form > .ui-draggable-box .emojionearea-category[name="smileys_people"] i[title="Joy"]').click();
+      await expect(page.locator('#child-form > .ui-draggable-box .emojionearea-picker')).toBeHidden();
+    }
+
+    if (label.label2) {
+      await page.locator('#add-sublabel-form').click();
+      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('input#title').type(label.label2);
+      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-button').click();
+      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-picker').waitFor();
+      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-category[name="smileys_people"] i[title="Smile"]').click();
+      await expect(page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-picker')).toBeHidden();
+    }
+
+    if (label.adminLabel) {
+      await page.locator('#field-restricted label').click();
+    }
+    await page.getByTestId('save-label').click();
+  };
+
+  await page.locator('.ui-draggable-box').locator('nth=0').locator('.drag-handle').hover();
+  await page.mouse.down();
+  await page.locator('.ui-draggable-box').locator('nth=1').locator('.drag-box__action').hover();
+  await page.mouse.up();
+  await page.getByTestId('save-label-seq').click();
+  await expect(page.locator('.ui-draggable-box').locator('nth=0').locator('.label-box__inner__heading')).toContainText(labels[1].title);
+  await this.page.getByTestId("project-page").click();
+
+  await page.getByTestId('propose-a-session').locator('visible=true').click();
+  await page.getByTestId('close-consent-modal').click();
+  await page.locator('#title').fill(project.proposal_title);
+  await page.locator('#field-body .cm-editor .cm-line').fill(project.proposal_content);
+  await page.getByTestId('add-label').click();
+  await page.locator('fieldset').waitFor(1000);
+  await page.getByLabel(project.labels[0].sublabels[0]).click();
+  await page.getByLabel(project.labels[1].sublabels[2]).click();
+  await page.getByTestId('save').locator('visible=true').click();
+  await page.getByTestId('form-submit-btn').click();
+
+  await page.getByTestId('proposal-menu').locator('visible=true').click();
+  await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
+    await page.getByTestId('editor-panel').locator('visible=true').click()
+  ]);
+  await page.getByTestId('proposal-status').locator('button[value="awaiting_details"]').click();
+
+  await page.getByTestId('proposal-menu').locator('visible=true').click();
+  await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
+    await page.getByTestId('editor-panel').locator('visible=true').click()
+  ]);
+  await page.getByTestId('proposal-status').locator('button[value="under_evaluation"]').click();
+
+  await page.getByTestId('proposal-menu').locator('visible=true').click();
+  await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
+    await page.getByTestId('editor-panel').locator('visible=true').click()
+  ]);
+  await page.getByTestId('proposal-status').locator('button[value="confirm"]').click();
+
+  await page.getByTestId('schedule').click();
+  await page.getByTestId('edit-schedule').click();
+
+  const tomorrow = dayjs().add(1, 'days').format('YYYY-MM-DD');
+  await page.locator('#select-date').fill(tomorrow);
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
+    page.locator('.fc-slot108 .fc-widget-content').click(5, 5)
+  ]);
+  await page.locator('#title').fill(project.session_title);
+  await page.locator('select#venue_room_id').click();
+  await page.getByText(`${project.venue.title} – ${project.venue.room}`).locator('visible=true').click();
+  await page.locator('#speaker').fill(editor.username);
+  await page.locator('#is_break').click();
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
+    page.locator('#session-save').click()
+  ]);
+
+  const destinationElement = await page.locator('.fc-slot112 .fc-widget-content');
+  await page.locator('.js-unscheduled').hover();
+  await page.mouse.down();
+  const box = (await destinationElement.boundingBox());
+  await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+  await destinationElement.hover();
+  await destinationElement.hover();
+  await page.mouse.up();
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000})
+  ]);
+  await page.locator('#session-save').click();
+
+
+});

From 1e48562fb166c70bea39c26bb44810505cf15b54 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 5 Dec 2023 23:34:40 +0530
Subject: [PATCH 03/14] RSVP and livestream tests

---
 funnel/templates/project_layout.html.jinja2   |   2 +-
 .../templates/session_view_popup.html.jinja2  |   6 +-
 tests/playwright/fixtures/boxoffice.js        |   8 --
 tests/playwright/fixtures/embed_video.json    |   7 ++
 tests/playwright/fixtures/project.json        |  19 ++-
 tests/playwright/fixtures/session.json        |  10 --
 tests/playwright/page/create-project.js       |  30 ++---
 tests/playwright/page/login.js                |   5 +-
 .../playwright/tests/add-crew-project.spec.js |   1 -
 tests/playwright/tests/add-livestream.spec.js |  30 +++++
 tests/playwright/tests/add-submission.spec.js |  14 ++-
 .../tests/add-venue-project.spec.js           |  11 +-
 tests/playwright/tests/open-cfp.spec.js       | 113 ++++++++----------
 tests/playwright/tests/rsvp-checkin.spec.js   |  74 ++++++++++++
 14 files changed, 214 insertions(+), 116 deletions(-)
 delete mode 100644 tests/playwright/fixtures/boxoffice.js
 create mode 100644 tests/playwright/fixtures/embed_video.json
 delete mode 100644 tests/playwright/fixtures/session.json
 create mode 100644 tests/playwright/tests/add-livestream.spec.js
 create mode 100644 tests/playwright/tests/rsvp-checkin.spec.js

diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2
index c566dce23..1400d82b6 100644
--- a/funnel/templates/project_layout.html.jinja2
+++ b/funnel/templates/project_layout.html.jinja2
@@ -39,7 +39,7 @@
 
 {% macro livestream_edit_btn(project) %}
   {% if project.view_for('edit_livestream').is_available() %}
-    <a href="{{ project.url_for('edit_livestream') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn" aria-label="{% trans %}Update livestream URLs{% endtrans %}">{{ faicon(icon='video-plus', baseline=false) }}</a>
+    <a href="{{ project.url_for('edit_livestream') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn" data-testid="add-livestream" aria-label="{% trans %}Update livestream URLs{% endtrans %}">{{ faicon(icon='video-plus', baseline=false) }}</a>
   {% endif %}
 {% endmacro %}
 
diff --git a/funnel/templates/session_view_popup.html.jinja2 b/funnel/templates/session_view_popup.html.jinja2
index f202af95d..3c64ec734 100644
--- a/funnel/templates/session_view_popup.html.jinja2
+++ b/funnel/templates/session_view_popup.html.jinja2
@@ -5,11 +5,11 @@
   <h3 class="js-modal-title mui--text-headline session-modal__title" data-testid="title">{{ session.title }}</h3>
   <div class="mui--clearfix">
     {% if session.speaker %}
-      <p class="mui--text-subhead modal__header__text" data-testid="speaker">{{ faicon(icon='microphone-alt') }} {{ session.speaker }}</p>
+      <p class="mui--text-subhead modal__header__text" data-testid="speaker">{{ faicon(icon='microphone-alt', css_class="margin-right") }}{{ session.speaker }}</p>
     {% endif %}
     <div class="mui--pull-left modal__header__heading">
       {% if session.scheduled %}
-        <p class="mui--text-subhead modal__header__text" data-testid="time">{{ faicon(icon='calendar-alt') }} {{ session.start_at_localized|date }}, {{ session.start_at_localized|time }}–{{ session.end_at_localized|time }}
+        <p class="mui--text-subhead modal__header__text" data-testid="time">{{ faicon(icon='calendar-alt', css_class="margin-right") }}{{ session.start_at_localized|date }}, {{ session.start_at_localized|time }}–{{ session.end_at_localized|time }}
         </p>
       {% else %}
         <p class="mui--text-subhead modal__header__text">
@@ -17,7 +17,7 @@
         </p>
       {% endif %}
       {% if session.venue_room %}
-        <p class="mui--text-subhead modal__header__text" data-testid="room">{{ faicon(icon='map-marker-alt') }} {{ session.venue_room.title }}, {{ session.venue_room.venue.title }}</p>
+        <p class="mui--text-subhead modal__header__text" data-testid="room">{{ faicon(icon='map-marker-alt', css_class="margin-right") }}{{ session.venue_room.title }}, {{ session.venue_room.venue.title }}</p>
       {% endif %}
     </div>
     <div class="mui-dropdown mui--pull-right">
diff --git a/tests/playwright/fixtures/boxoffice.js b/tests/playwright/fixtures/boxoffice.js
deleted file mode 100644
index 128f881e0..000000000
--- a/tests/playwright/fixtures/boxoffice.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
-  ticket_client: {
-    client_id: Cypress.env('BOXOFFICE_CLIENT_ID'),
-    secret: Cypress.env('BOXOFFICE_SECRET_KEY'),
-    access_key: Cypress.env('BOXOFFICE_ACCESS_KEY'),
-    ic_id: Cypress.env('BOXOFFICE_IC_ID'),
-  },
-};
diff --git a/tests/playwright/fixtures/embed_video.json b/tests/playwright/fixtures/embed_video.json
new file mode 100644
index 000000000..cd04abeb0
--- /dev/null
+++ b/tests/playwright/fixtures/embed_video.json
@@ -0,0 +1,7 @@
+[
+  "https://www.youtube.com/watch?v=qY8QmpdYFfc",
+  "https://www.youtube.com/watch?v=qY8Qmpdfc",
+  "https://www.youtube.com/live/RfnjNskapNg?feature=shared",
+  "https://www.youtube.com/embed/3pbyEGZjgH8?si=7kKze11tNJh554b1",
+  "https://vimeo.com/860144207"
+]
diff --git a/tests/playwright/fixtures/project.json b/tests/playwright/fixtures/project.json
index cd0c0350a..0152b8732 100644
--- a/tests/playwright/fixtures/project.json
+++ b/tests/playwright/fixtures/project.json
@@ -16,10 +16,16 @@
   "restricted_update_title": "Finibus Bonorum et Malorum",
   "restricted_update_body": "# Heading \nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderi",
   "cfp_instructions": "##Topics for proposing talks/workshops/tutorials for event",
-  "venue": {
-    "title": "Online",
-    "room": "Zoom"
-  },
+  "venues": [
+    {
+      "title": "Online",
+      "room": "Zoom"
+    },
+    {
+    "title": "BIC",
+    "room": "Hall"
+    }
+  ],
   "labels": [
     {
       "title": "Tracks",
@@ -30,7 +36,7 @@
       ]
     },
     {
-      "title": "Track",
+      "title": "Type",
       "sublabels": [
         "Full talk",
         "BOF/Panel discussion",
@@ -53,5 +59,6 @@
   "session_content": "Check-in starts at 9am",
   "session_timecolumn": "9am",
   "proposal_title": "Consectetur adipiscing elit",
-  "proposal_content": "Lorem ipsum dolor sit amet"
+  "proposal_content": "Lorem ipsum dolor sit amet",
+  "session_video": "https://www.youtube.com/watch?v=YqUZokjvSTc"
 }
diff --git a/tests/playwright/fixtures/session.json b/tests/playwright/fixtures/session.json
deleted file mode 100644
index b6fa8aed3..000000000
--- a/tests/playwright/fixtures/session.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Introduction to end to end testing",
-  "time": "9:00",
-  "timecolumn": "9am",
-  "room": "Hasgeek House – Second floor room",
-  "venue_room": "Second floor room, Hasgeek House",
-  "speaker": "Vidya Ramakrishnan",
-  "bg": "https://images.hasgeek.com/embed/file/0bdbaad7b31d41aab8c9ba5471bae178",
-  "video": "https://www.youtube.com/watch?v=YqUZokjvSTc"
-}
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
index 3726ccaae..88cf7efc9 100644
--- a/tests/playwright/page/create-project.js
+++ b/tests/playwright/page/create-project.js
@@ -53,15 +53,20 @@ export class ProjectPage {
     await this.page.getByTestId('settings').locator("visible=true").waitFor();
     await this.page.getByTestId('settings').locator("visible=true").click();
     await this.page.getByTestId('manage-venues').click();
-    await this.page.getByTestId('new-venue').click();
-    await this.page.locator('input#title').fill('Online');
-    await this.page.locator('#field-description .cm-editor .cm-line').fill('Zoom Link');
-    await this.page.getByTestId('form-submit-btn').click();
-    await this.page.locator(`.card[data-testid="Online-rooms"] a[data-testid="add-room"]`).click();
-    await this.page.locator('input#title').fill('Zoom');
-    await this.page.locator('#field-description .cm-editor .cm-line').fill('Zoom link');
-    await this.page.getByTestId('form-submit-btn').click();
-    await this.page.getByTestId("Zoom").isVisible();
+    for (let venue of project.venues) {
+      await this.page.getByTestId('new-venue').click();
+      await this.page.locator('input#title').fill(venue.title);
+      await this.page.locator('#field-description .cm-editor .cm-line').waitFor(2000);
+      await this.page.locator('#field-description .cm-editor .cm-line').fill(venue.title);
+      await this.page.getByTestId('form-submit-btn').click();
+      await this.page.locator(`.card[data-testid="${venue.title}-rooms"] a[data-testid="add-room"]`)
+      .click();
+      await this.page.locator('input#title').fill(venue.room);
+      await this.page.locator('#field-description .cm-editor .cm-line').waitFor(2000);
+      await this.page.locator('#field-description .cm-editor .cm-line').fill(venue.room);
+      await this.page.getByTestId('form-submit-btn').click();
+      await this.page.getByTestId(venue.room).isVisible();
+    }
     await this.page.getByTestId("project-page").click();
   }
 
@@ -73,7 +78,7 @@ export class ProjectPage {
     await this.page.locator('label.switch-label').locator("visible=true").click();
   }
 
-  async addProject(loginUser, crew) {
+  async addProject(crew=[]) {
     let randomProjectName = Math.random().toString(36).substring(2, 7);
     let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
     let loginPage;
@@ -82,12 +87,9 @@ export class ProjectPage {
     await this.createNewProject(projectNameCapitalize);
     let crewForm = new ProjectCrewFormPage(this.page);
     await this.page.getByTestId('crew').click();
-    for(let member in crew) {
+    for(let member of crew) {
       await crewForm.addMember(member.username, member.role);
     }
-    await this.addLabels();
-    await this.addVenue();
-    await this.openCFP();
     await this.publishProject();
 
     await loginPage.logout();
diff --git a/tests/playwright/page/login.js b/tests/playwright/page/login.js
index f2accb060..7d7ab249a 100644
--- a/tests/playwright/page/login.js
+++ b/tests/playwright/page/login.js
@@ -17,7 +17,10 @@ export class LoginPage {
     await this.usernameInputBox.fill(username);
     await this.passwordBtn.click();
     await this.passwordInputBox.fill(password);
-    await this.submitBtn.click();
+    await Promise.all([
+      this.page.waitForResponse(response => response.url().includes("/login") && response.status() === 200, {timeout: 60000}),
+      this.submitBtn.click()
+    ]);
   }
 
   async logout() {
diff --git a/tests/playwright/tests/add-crew-project.spec.js b/tests/playwright/tests/add-crew-project.spec.js
index 0a7a634be..e0c0f023c 100644
--- a/tests/playwright/tests/add-crew-project.spec.js
+++ b/tests/playwright/tests/add-crew-project.spec.js
@@ -13,7 +13,6 @@ test('Add crew to project', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login(`/${profile.title}`, owner.username, owner.password);
-
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
 
diff --git a/tests/playwright/tests/add-livestream.spec.js b/tests/playwright/tests/add-livestream.spec.js
new file mode 100644
index 000000000..119c7b7bb
--- /dev/null
+++ b/tests/playwright/tests/add-livestream.spec.js
@@ -0,0 +1,30 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { owner, editor } = require('../fixtures/user.json');
+const videos = require('../fixtures/embed_video.json');
+
+test('Add livestream and verify embed youtube and vimeo urls', async ({ page }) => {
+  let projectPage = new ProjectPage(page);
+  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
+
+  await page.getByTestId('add-livestream').click();
+  for(let video of videos) {
+    await page.locator('#livestream_urls').type(video);
+    await page.locator('#livestream_urls').press('Enter');
+  }
+  await page.getByTestId('form-submit-btn').click();
+
+  for(let index=0; index<videos.length; index++) {
+    await page.locator(`#tab-${index+1}`).click();
+    await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('[aria-label="Play"]').click();
+    await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('video').isVisible();
+    await expect(page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('video')).toHaveAttribute('src');
+  }
+
+});
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index 23ab64263..74c719bfe 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -5,17 +5,20 @@ const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { user, editor, usher } = require('../fixtures/user.json');
+const { owner, user, usher } = require('../fixtures/user.json');
 const proposal = require('../fixtures/proposal.json');
 let randomProjectName;
 
 test('Submitting a proposal to a project', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  randomProjectName = await projectPage.addProject(editor, {});
-  let loginPage;
-  loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
+  randomProjectName = await projectPage.addProject();
+  let loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, owner.username, owner.password);
+  await projectPage.addLabels();
+  await projectPage.openCFP();
+  await loginPage.logout();
 
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
   await page.locator('#title').fill(proposal.title);
@@ -56,6 +59,7 @@ test('Submitting a proposal to a project', async ({ page }) => {
   ]);
   await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
   await page.locator('a.modal__close').locator('visible=true').click();
+  await page.getByTestId('form-submit-btn').waitFor(60000);
   await page.getByTestId('form-submit-btn').click();
   await page.locator('.user__box__userid user__box__fullname', { hasText: usher.username }).isVisible();
   await page.locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' }).isVisible();
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index 2fc01aac0..a63aea276 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -5,16 +5,13 @@ const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const venues = require('../fixtures/venues.json');
-const { owner } = require('../fixtures/user.json');
+const { owner, editor } = require('../fixtures/user.json');
 
 test('Add venue to project', async ({ page }) => {
-  let randomProjectName = Math.random().toString(36).substring(2, 7);
-  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
-  let loginPage;
-  loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
   let projectPage = new ProjectPage(page);
-  await projectPage.createNewProject(projectNameCapitalize);
+  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let loginPage = new LoginPage(page);
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
 
   await page.getByTestId('project-menu').locator("visible=true").click();
   await page.getByTestId('settings').locator("visible=true").waitFor();
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
index 19fdfbf19..ba467bdec 100644
--- a/tests/playwright/tests/open-cfp.spec.js
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -1,88 +1,38 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner, editor } = require('../fixtures/user.json');
+const { owner, editor, user } = require('../fixtures/user.json');
 const cfp = require('../fixtures/cfp.json');
 const labels = require('../fixtures/labels.json');
 const dayjs = require('dayjs');
 
 test('Open call for proposal of the project and add schedule', async ({ page }) => {
-  let randomProjectName = Math.random().toString(36).substring(2, 7);
-  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
-  let loginPage;
-  loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
   let projectPage = new ProjectPage(page);
-  await projectPage.createNewProject(projectNameCapitalize);
-  let crewForm = new ProjectCrewFormPage(page);
-  await page.getByTestId('crew').click();
-  await crewForm.addMember(editor.username, 'editor');
-  projectPage.publish();
-  await loginPage.logout();
-
+  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let loginPage = new LoginPage(page);
   await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
-
+  await projectPage.addVenue();
   await page.getByTestId('submissions').click();
   await page.getByTestId('add-cfp').click();
   await page.locator('#field-instructions .cm-editor .cm-line').fill(cfp.instructions);
   await page.getByTestId('add-cfp').click();
   await page.locator('label.switch-label').click();
   await page.getByTestId('cfp-state', { hasText: 'Accepting submissions' }).isVisible();
-  await page.getByTestId('propose-a-session').isVisible();
-
-  await page.getByTestId('project-menu').locator('visible=true').click();
-  await page.getByTestId('settings').locator('visible=true').click();
-  await page.getByTestId('manage-labels').click();
-
+  await page.getByTestId('propose-a-session').locator('nth=0').isVisible();
+  await projectPage.addLabels();
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('manage-labels').click();
-
-  for (let label of labels) {
-    await page.getByTestId('add-labels').click();
-    await page.locator('input#title').fill(label.title);
-    await page.locator('.emojionearea-button').click();
-    await page.locator('.emojionearea-picker').waitFor();
-    await page.locator('.emojionearea-category[name="smileys_people"] i[title="Innocent"]').click();
-    await expect(page.locator('.emojionearea-picker')).toBeHidden();
-
-    if (label.label1) {
-      await page.locator('#add-sublabel-form').click();
-      await page.locator('#child-form > .ui-draggable-box #title').type(label.label1);
-      await page.locator('#child-form > .ui-draggable-box .emojionearea-button').click();
-      await page.locator('#child-form > .ui-draggable-box .emojionearea-picker').waitFor();
-
-      // Emoji Relaxed is throwing not a valid emoji error
-      await page.locator('#child-form > .ui-draggable-box .emojionearea-category[name="smileys_people"] i[title="Joy"]').click();
-      await expect(page.locator('#child-form > .ui-draggable-box .emojionearea-picker')).toBeHidden();
-    }
-
-    if (label.label2) {
-      await page.locator('#add-sublabel-form').click();
-      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('input#title').type(label.label2);
-      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-button').click();
-      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-picker').waitFor();
-      await page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-category[name="smileys_people"] i[title="Smile"]').click();
-      await expect(page.locator('#child-form > .ui-draggable-box').locator('nth=1').locator('.emojionearea-picker')).toBeHidden();
-    }
-
-    if (label.adminLabel) {
-      await page.locator('#field-restricted label').click();
-    }
-    await page.getByTestId('save-label').click();
-  };
-
   await page.locator('.ui-draggable-box').locator('nth=0').locator('.drag-handle').hover();
   await page.mouse.down();
   await page.locator('.ui-draggable-box').locator('nth=1').locator('.drag-box__action').hover();
   await page.mouse.up();
   await page.getByTestId('save-label-seq').click();
-  await expect(page.locator('.ui-draggable-box').locator('nth=0').locator('.label-box__inner__heading')).toContainText(labels[1].title);
-  await this.page.getByTestId("project-page").click();
+  await expect(page.locator('.ui-draggable-box').locator('nth=0').locator('.label-box__inner__heading')).toContainText(project.labels[1].title);
+  await page.getByTestId("project-page").click();
 
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
@@ -122,7 +72,7 @@ test('Open call for proposal of the project and add schedule', async ({ page })
   await page.getByTestId('schedule').click();
   await page.getByTestId('edit-schedule').click();
 
-  const tomorrow = dayjs().add(1, 'days').format('YYYY-MM-DD');
+  let tomorrow = dayjs().add(1, 'days').format('YYYY-MM-DD');
   await page.locator('#select-date').fill(tomorrow);
   await Promise.all([
     page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
@@ -130,7 +80,7 @@ test('Open call for proposal of the project and add schedule', async ({ page })
   ]);
   await page.locator('#title').fill(project.session_title);
   await page.locator('select#venue_room_id').click();
-  await page.getByText(`${project.venue.title} – ${project.venue.room}`).locator('visible=true').click();
+  await page.getByText(`${project.venues[0].title} – ${project.venues[0].room}`).locator('visible=true').click();
   await page.locator('#speaker').fill(editor.username);
   await page.locator('#is_break').click();
   await Promise.all([
@@ -149,7 +99,50 @@ test('Open call for proposal of the project and add schedule', async ({ page })
   await Promise.all([
     page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000})
   ]);
+  await page.locator('select#venue_room_id').click();
+  await page.getByText(`${project.venues[1].title} – ${project.venues[1].room}`).locator('visible=true').click();
   await page.locator('#session-save').click();
 
+  await page.getByTestId('settings').click();
+  await page.getByTestId('collapsible-open').locator('nth=0').click();
+  await page.locator('#rooms_sortable .sp-dd').locator('nth=0').click();
+  await page.locator('.sp-palette-container').locator('nth=0').isVisible();
+
+  await page.getByTestId('project-page').click();
+  await page.getByTestId('schedule').click();
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('session-title').locator('nth=1').click()
+  ]);
+  await page.getByTestId('edit-session').click();
+  await page.locator('input#video_url').fill(project.session_video);
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('close-modal').click();
+  await loginPage.logout();
+
+  await loginPage.login('/', user.username, user.password);
+  await page.locator('.upcoming .card--upcoming').locator('nth=0').click();
+  await page.getByTestId('schedule').click();
+  await page.getByTestId('add-to-calendar').click();
+  await page.getByTestId('schedule-subscribe').isVisible();
+  await page.getByTestId('close-modal').click();
+
+  let tomorrowDate = dayjs().add(2, 'days').format('dddd, D MMMM YYYY');
+  await expect(page.locator('.schedule__date')).toContainText(tomorrowDate);
+  for (let venue of project.venues) {
+    await page.locator('.schedule__row__column--header', { hasText: `${venue.title} – ${venue.room}` }).isVisible();
+  };
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('session-title').locator('nth=1').click()
+  ]);
+  await page.locator('#session-modal').isVisible();
+  await expect(page.getByTestId('title')).toContainText(project.proposal_title);
+  await expect(page.getByTestId('speaker')).toContainText(editor.fullname);
+  await page.getByTestId('time').isVisible();
+  await expect(page.getByTestId('room')).toContainText(`${project.venues[1].room}, ${project.venues[1].title}`);
+  await page.getByTestId('session-video').locator('iframe').isVisible();
+  await page.getByTestId('view-proposal"]').isVisible();
+  await page.locator('#session-modal a.modal__close').click();
 
 });
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
new file mode 100644
index 000000000..03bce966c
--- /dev/null
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -0,0 +1,74 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { ProjectPage } = require('../page/create-project');
+const profile = require('../fixtures/profile.json');
+const project = require('../fixtures/project.json');
+const { promoter, usher, user } = require('../fixtures/user.json');
+const events = require('../fixtures/ticket_events.json');
+const ticket_participants = require('../fixtures/ticket_participants.json');
+
+test('Open rsvp, for all and members only', async ({ page }) => {
+  // let projectPage = new ProjectPage(page);
+  // let randomProjectName = await projectPage.addProject([{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
+  // let loginPage = new LoginPage(page);
+  // await loginPage.login(`/${profile.title}/${randomProjectName}`, promoter.username, promoter.password);
+
+  let loginPage = new LoginPage(page);
+  await loginPage.login('testcypressproject/zgs0w', promoter.username, promoter.password);
+
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').click();
+  await page.getByTestId('setup-ticket-events').click();
+
+  for (let event of events) {
+    await page.getByTestId('new-ticket-event').click();
+    await page.locator('#title').fill(event.title);
+    await page.locator('#badge_template').fill(event.badge_template);
+    await page.getByTestId('form-submit-btn').click();
+  }
+
+  await page.getByTestId('new-ticket-client').click();
+  await page.locator('#name').fill(process.env.BOXOFFICE_CLIENT_ID);
+  await page.locator('#clientid').fill(process.env.BOXOFFICE_CLIENT_ID);
+  await page.locator('#client_eventid').fill(process.env.BOXOFFICE_IC_ID);
+  await page.locator('#client_secret').fill(process.env.BOXOFFICE_SECRET_KEY);
+  await page.locator('#client_access_token').fill(process.env.BOXOFFICE_ACCESS_KEY);
+  await page.getByTestId('form-submit-btn').click();
+
+  await page.getByTestId('sync-tickets').click();
+  await page.waitForTimeout(12000);
+  await page.getByTestId('sync-tickets').click();
+
+  for (let event of events) {
+    await page.locator(`li[data-testid="${event.title}"] a[data-testid="ticket-edit"]`).click();
+    await page.getByLabel(event.title).click();
+    await page.getByTestId('form-submit-btn').click();
+  }
+
+  await page.getByTestId('sync-tickets').click();
+  await page.waitForTimeout(12000);
+  await page.getByTestId('sync-tickets').click();
+
+  for (let participant of ticket_participants) {
+    await page.getByTestId('add-ticket-participant').click();
+    await page.locator('#fullname').fill(participant.fullname);
+    await page.locator('#email').fill(participant.email);
+    await page.locator('#phone').fill(participant.phone);
+    await page.locator('#company').fill(participant.company);
+    await page.locator('#twitter').fill(participant.twitter);
+    await page.getByLabel(participant.ticketEvent).click();
+    await page.getByTestId('form-submit-btn').click();
+  }
+
+  await page.getByTestId(`{ticketEvents[0].title}`).click();
+  await page.getByTestId('ticket-participant', { hasText: ticketParticipants[0].fullname }).isVisible();
+  await page.getByTestId('ticket-participant', { hasText: ticketParticipants[1].fullname }).isVisible();
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/json") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('ticket-participant', { hasText: user.username }).getByTestId('checkin').click()
+  ]);
+  await page.getByTestId('cancel-checkin').isVisible();
+  await page.getByTestId('back-to-setup').click();
+
+});

From 317502fde25343485099ef3dd6291c407d0219f3 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 18 Dec 2023 12:08:36 +0530
Subject: [PATCH 04/14] Delete playwright.yml

---
 .github/workflows/playwright.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 .github/workflows/playwright.yml

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
deleted file mode 100644
index 90b6b700d..000000000
--- a/.github/workflows/playwright.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

From 43d09df397af57c25d1858848a8bce6095b44727 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 22 Dec 2023 00:24:56 +0530
Subject: [PATCH 05/14] Add rsvp playwright test. Fix cypress test with new
 data-testid

---
 funnel/templates/js/event_checkin.js.jinja2 |   2 +-
 funnel/templates/profile_layout.html.jinja2 |   2 +-
 funnel/templates/project_admin.html.jinja2  |   4 +-
 funnel/templates/project_layout.html.jinja2 |  10 +-
 package-lock.json                           | 471 ++++++++++++++++----
 package.json                                |  15 +-
 playwright.config.js                        |  27 +-
 tests/cypress/e2e/01_addCrewtoProfile.cy.js |   7 +-
 tests/cypress/e2e/05_publishProject.cy.js   |  12 +-
 tests/cypress/e2e/06_manageVenue.cy.js      |   4 +-
 tests/cypress/e2e/10_updateSchedule.cy.js   |   4 +-
 tests/cypress/e2e/23_addSponsor.cy.js       |   2 +-
 tests/cypress/support.js                    |   2 +-
 tests/playwright/globalSetup.js             |  12 +
 tests/playwright/tests/rsvp-checkin.spec.js |  45 +-
 15 files changed, 463 insertions(+), 156 deletions(-)
 create mode 100644 tests/playwright/globalSetup.js

diff --git a/funnel/templates/js/event_checkin.js.jinja2 b/funnel/templates/js/event_checkin.js.jinja2
index 7abf76de5..104273bc5 100644
--- a/funnel/templates/js/event_checkin.js.jinja2
+++ b/funnel/templates/js/event_checkin.js.jinja2
@@ -14,7 +14,7 @@
     {% raw %}
     <script id='ticket-participant-row' type='text/ractive'>
     {{#each ticket_participants}}
-      <tr id="p-{{ puuid_b58 }}">
+      <tr id="p-{{ puuid_b58 }}" data-testid="{{ fullname }}">
         <td class='js-searchable' data-th="Name" data-testid="ticket-participant">{{#if has_user }}<faicon icon='user-check' icon_size='subhead' baseline=true css_class="mui--text-success fa-icon--right-margin"></faicon>{{/if}}{{ fullname }}</td>
         <td class='js-searchable' data-th="Tickets">{{ ticket_type_titles }}</td>
         <td class='js-searchable' data-th="Email">{{ email }}</td>
diff --git a/funnel/templates/profile_layout.html.jinja2 b/funnel/templates/profile_layout.html.jinja2
index ee3c89b92..857d6b316 100644
--- a/funnel/templates/profile_layout.html.jinja2
+++ b/funnel/templates/profile_layout.html.jinja2
@@ -360,7 +360,7 @@
               </div>
               <div class="profile__banner__btns mui--hidden-xs mui--hidden-sm">
                 {% if profile.features.new_project() %}
-                  <a class="mui-btn mui-btn--primary mui-btn--raised profile-create-btn" href="{{ profile.url_for('new_project') }} ">{{ faicon(icon='plus', icon_size='caption') }} {% trans %}New project{% endtrans %}</a>
+                  <a class="mui-btn mui-btn--primary mui-btn--raised profile-create-btn" href="{{ profile.url_for('new_project') }}" data-testid="new-project-btn">{{ faicon(icon='plus', icon_size='caption') }} {% trans %}New project{% endtrans %}</a>
                 {% elif profile.features.make_public() %}
                   <a class="mui-btn mui-btn--raised mui-btn--primary profile-create-btn" href="#make-public-modal" rel="modal:open" role="button" aria-haspopup="true" data-testid="make-profile-public">{% trans %}Make account public{% endtrans %}</a>
                   <div class="modal" id="make-public-modal" role="dialog" aria-labelledby="profile-public-modal-title" aria-modal="true" tabindex="-1">
diff --git a/funnel/templates/project_admin.html.jinja2 b/funnel/templates/project_admin.html.jinja2
index 676b39a5f..03479c2cb 100644
--- a/funnel/templates/project_admin.html.jinja2
+++ b/funnel/templates/project_admin.html.jinja2
@@ -5,7 +5,7 @@
 {% block title %}{% trans %}Setup events for check-in{% endtrans %}{% endblock title %}
 
 {% block top_title %}
-  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}">{{ project.title }}</a></h1>
+  <h1 class="mui--text-headline"><a href="{{ project.url_for() }}" data-testid="project-page">{{ project.title }}</a></h1>
   <p class="mui--text-subhead">{% trans %}Setup events for check-in{% endtrans %}</p>
 {% endblock top_title %}
 
@@ -25,7 +25,7 @@
         <ol class="list--aligned">
           {%- for ticket_event in ticket_events %}
             <li>
-              <a href="{{ ticket_event.url_for('view') }}" class="mui--text-subhead" data-testid="{{ ticket_event.title }}" data-ga="View event">{{ ticket_event.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_event.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-ga="edit event">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
+              <a href="{{ ticket_event.url_for('view') }}" class="mui--text-subhead" data-testid="event-{{ ticket_event.title }}" data-ga="View event">{{ ticket_event.title }}</a>{%- if project.current_roles.promoter %}&nbsp;<a href="{{ ticket_event.url_for('edit') }}" aria-label="{% trans %}Edit{% endtrans %}" data-ga="edit event">{{ faicon(icon='edit', icon_size='subhead') }}</a>{%- endif %}
             </li>
           {%- endfor %}
         </ol>
diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2
index 523a98450..f31a831a7 100644
--- a/funnel/templates/project_layout.html.jinja2
+++ b/funnel/templates/project_layout.html.jinja2
@@ -39,7 +39,7 @@
 
 {% macro livestream_edit_btn(project) %}
   {% if project.view_for('edit_livestream').is_available() %}
-    <a href="{{ project.url_for('edit_livestream') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn" data-testid="add-livestream" aria-label="{% trans %}Update livestream URLs{% endtrans %}">{{ faicon(icon='video-plus', baseline=false) }}</a>
+    <a href="{{ project.url_for('edit_livestream') }}" class="mui-btn mui-btn--raised icon-btn project-banner__box__add-btn" data-testid="add-livestream-btn" aria-label="{% trans %}Update livestream URLs{% endtrans %}">{{ faicon(icon='video-plus', baseline=false) }}</a>
   {% endif %}
 {% endmacro %}
 
@@ -168,9 +168,9 @@
           <a class="mui-btn mui-btn--raised {% if project.features.show_tickets %} mui-btn--dark {%- else %} mui-btn--primary {%- endif %} register-block__btn" id="register-nav" href="{{ url_for('login', next=request.path + '#register-modal', modal='register-modal') }}" rel="modal:open" aria-haspopup="true" data-register-modal="register-modal">{{ project.views.register_button_text() }}</a>
         {% elif project.features.rsvp_unregistered -%}
           {% if not project.features.follow_mode and not project.features.rsvp_for_members %}<span class="register-block__content__txt mui--text-light">{% trans %}This is a free event{% endtrans %}</span>{% endif %}
-          <a id="rsvp-btn" class="mui-btn mui-btn--raised mui-btn--dark register-block__btn js-register-btn" href="{{ project.url_for('rsvp_modal') }}" rel="modal:open" role="button" aria-haspopup="true">
+          <a id="rsvp-btn" class="mui-btn mui-btn--raised mui-btn--dark register-block__btn js-register-btn" href="{{ project.url_for('rsvp_modal') }}" rel="modal:open" role="button" aria-haspopup="true" data-testid="member-rsvp">
             <span class="register-block__btn__txt" data-testid="unregistered">{{ project.views.register_button_text() }}</span>
-            <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt" data-testid="unregistered">{{ project.views.registration_text() }}</span>
+            <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt">{{ project.views.registration_text() }}</span>
           </a>
         {%- endif %}
       </div>
@@ -180,11 +180,11 @@
       </div>
     {% elif project.features.rsvp_for_members -%}
       <div class="register-block__content">
-        <button class="mui-btn mui-btn--accent register-block__btn mui--is-disabled">{% trans %}Registration for members only{% endtrans %}</button>
+        <button class="mui-btn mui-btn--accent register-block__btn mui--is-disabled" data-testid="rsvp-only-for-members">{% trans %}Registration for members only{% endtrans %}</button>
       </div>
     {% endif %}
     {% if project.current_roles.account_member %}
-      <div class="register-block__content"><button class="mui-btn mui-btn--accent register-block__btn mui--is-disabled">{% trans %}You are a member{% endtrans %}</button></div>
+      <div class="register-block__content"><button class="mui-btn mui-btn--accent register-block__btn mui--is-disabled" data-testid="project-member">{% trans %}You are a member{% endtrans %}</button></div>
     {% elif project.features.show_tickets %}
       <div class="register-block__content">
           <button class="js-open-ticket-widget register-block__btn mui-btn mui-btn--primary">
diff --git a/package-lock.json b/package-lock.json
index d33c92e94..0e93a8272 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,10 +17,7 @@
         "@codemirror/language": "^6.2.1",
         "@codemirror/view": "^6.4.0",
         "@lezer/highlight": "^1.1.3",
-        "copy-webpack-plugin": "^11.0.0",
         "emojionearea": "^3.4.2",
-        "eslint-plugin-cypress": "^2.11.3",
-        "eslint-webpack-plugin": "^2.5.4",
         "footable": "^2.0.6",
         "hammerjs": "^2.0.8",
         "htmx.org": "^1.8.0",
@@ -60,21 +57,27 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/preset-env": "^7.14.7",
         "@codemirror/state": "^6.0.0",
+        "@playwright/test": "^1.40.1",
         "babel-eslint": "^10.0.3",
         "babel-loader": "^8.2.2",
         "clean-webpack-plugin": "^3.0.0",
-        "cypress": "^13.1.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "cypress": "11.2",
         "dayjs": "^1.10.6",
+        "dotenv": "^16.3.1",
         "eslint": "^7.30.0",
         "eslint-config-airbnb": "^18.2.1",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-cypress": "^2.11.3",
         "eslint-plugin-import": "^2.23.4",
         "eslint-plugin-jsx-a11y": "^6.4.1",
         "eslint-plugin-prettier": "^3.4.0",
+        "eslint-webpack-plugin": "^2.5.4",
         "file-loader": "^6.2.0",
         "husky": "^7.0.4",
         "lint-staged": "^13.2.1",
+        "playwright": "^1.40.1",
         "prettier": "^2.3.2",
         "sass": "^1.62.1",
         "sass-loader": "^13.2.2",
@@ -88,6 +91,7 @@
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
       "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -449,6 +453,7 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
       "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -494,6 +499,7 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
       "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -1877,9 +1883,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -1895,7 +1901,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.10.4",
+        "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
@@ -1937,6 +1943,7 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
       "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1956,6 +1963,7 @@
       "version": "13.23.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
       "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -1970,6 +1978,7 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -1989,6 +1998,7 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
       "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.0",
         "debug": "^4.1.1",
@@ -2001,12 +2011,14 @@
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
       "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -2020,6 +2032,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
       "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2028,6 +2041,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
       "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2036,6 +2050,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
       "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -2044,12 +2059,14 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.20",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
       "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -2117,6 +2134,7 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -2129,6 +2147,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -2137,6 +2156,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2145,6 +2165,21 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.40.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.40.1.tgz",
+      "integrity": "sha512-EaaawMTOeEItCRvfmkI9v6rBkF1svM8wjl/YPRrg2N2Wmp+4qJYkWtJsbew1szfKKDm6fPLy4YAanBhIlf9dWw==",
+      "dev": true,
+      "dependencies": {
+        "playwright": "1.40.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -2462,6 +2497,7 @@
       "version": "7.29.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
       "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+      "dev": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2471,6 +2507,7 @@
       "version": "3.7.6",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz",
       "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==",
+      "dev": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -2499,7 +2536,8 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.14",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
-      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="
+      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
+      "dev": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
@@ -2517,6 +2555,7 @@
       "version": "20.8.10",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz",
       "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==",
+      "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2537,9 +2576,9 @@
       "dev": true
     },
     "node_modules/@types/sizzle": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.5.tgz",
-      "integrity": "sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
       "dev": true
     },
     "node_modules/@types/source-list-map": {
@@ -2604,9 +2643,9 @@
       }
     },
     "node_modules/@types/yauzl": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz",
-      "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -2627,6 +2666,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
       "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -2635,22 +2675,26 @@
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
       "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -2660,12 +2704,14 @@
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
       "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -2677,6 +2723,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
       "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -2685,6 +2732,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
       "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -2692,12 +2740,14 @@
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
       "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -2713,6 +2763,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
       "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
@@ -2725,6 +2776,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
       "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -2736,6 +2788,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
       "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -2749,6 +2802,7 @@
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
       "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
@@ -2793,17 +2847,20 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
     },
     "node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2815,6 +2872,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2836,6 +2894,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2851,6 +2910,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -2867,6 +2927,7 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -2881,12 +2942,14 @@
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -2903,6 +2966,7 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
       "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -2934,6 +2998,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -3143,6 +3208,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3175,6 +3241,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3344,7 +3411,8 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
@@ -3409,6 +3477,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3418,6 +3487,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -3429,6 +3499,7 @@
       "version": "4.22.1",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
       "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -3492,7 +3563,8 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
@@ -3533,6 +3605,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -3541,6 +3614,7 @@
       "version": "1.0.30001561",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
       "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -3566,6 +3640,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -3627,6 +3702,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -3745,6 +3821,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -3752,7 +3829,8 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "2.0.20",
@@ -3798,7 +3876,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/concat-with-sourcemaps": {
       "version": "1.1.0",
@@ -3824,6 +3903,7 @@
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
       "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
       "dependencies": {
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.1",
@@ -3847,6 +3927,7 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -3862,6 +3943,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -3872,12 +3954,14 @@
     "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
       "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -3927,6 +4011,7 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -3951,15 +4036,15 @@
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/cypress": {
-      "version": "13.4.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.4.0.tgz",
-      "integrity": "sha512-KeWNC9xSHG/ewZURVbaQsBQg2mOKw4XhjJZFKjWbEjgZCdxpPXLpJnfq5Jns1Gvnjp6AlnIfpZfWFlDgVKXdWQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz",
+      "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.0",
+        "@cypress/request": "^2.88.10",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^18.17.5",
+        "@types/node": "^14.14.31",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -3971,10 +4056,10 @@
         "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
-        "commander": "^6.2.1",
+        "commander": "^5.1.0",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
-        "debug": "^4.3.4",
+        "debug": "^4.3.2",
         "enquirer": "^2.3.6",
         "eventemitter2": "6.4.7",
         "execa": "4.1.0",
@@ -3989,13 +4074,12 @@
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.8",
+        "minimist": "^1.2.6",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.5.3",
+        "semver": "^7.3.2",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -4005,17 +4089,14 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/cypress/node_modules/@types/node": {
-      "version": "18.18.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz",
-      "integrity": "sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "dev": true
     },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
@@ -4078,6 +4159,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/cypress/node_modules/commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cypress/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4642,6 +4732,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -4657,7 +4748,8 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -4772,6 +4864,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -4783,6 +4876,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -4795,6 +4889,18 @@
       "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz",
       "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="
     },
+    "node_modules/dotenv": {
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -4829,7 +4935,8 @@
     "node_modules/electron-to-chromium": {
       "version": "1.4.576",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz",
-      "integrity": "sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA=="
+      "integrity": "sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==",
+      "dev": true
     },
     "node_modules/elkjs": {
       "version": "0.8.2",
@@ -4887,6 +4994,7 @@
       "version": "5.15.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
       "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -4899,6 +5007,7 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
       "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -4997,7 +5106,8 @@
     "node_modules/es-module-lexer": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="
+      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
+      "dev": true
     },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.2",
@@ -5051,6 +5161,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -5059,6 +5170,7 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -5212,6 +5324,7 @@
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz",
       "integrity": "sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==",
+      "dev": true,
       "dependencies": {
         "globals": "^13.20.0"
       },
@@ -5223,6 +5336,7 @@
       "version": "13.23.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
       "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -5237,6 +5351,7 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5426,6 +5541,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -5438,6 +5554,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -5446,6 +5563,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -5460,6 +5578,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -5468,6 +5587,7 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-2.7.0.tgz",
       "integrity": "sha512-bNaVVUvU4srexGhVcayn/F4pJAz19CWBkKoMx7aSQ4wtTbZQCnG5O9LHCE42mM+JSKOUp7n6vd5CIwzj7lOVGA==",
+      "dev": true,
       "dependencies": {
         "@types/eslint": "^7.29.0",
         "arrify": "^2.0.1",
@@ -5492,6 +5612,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -5509,6 +5630,7 @@
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
       "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
       "dependencies": {
         "@babel/highlight": "^7.10.4"
       }
@@ -5517,6 +5639,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -5531,6 +5654,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -5546,6 +5670,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -5556,12 +5681,14 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5573,6 +5700,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5581,6 +5709,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5592,6 +5721,7 @@
       "version": "13.23.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
       "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -5606,6 +5736,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -5614,6 +5745,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -5625,6 +5757,7 @@
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5639,6 +5772,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5650,6 +5784,7 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5660,12 +5795,14 @@
     "node_modules/eslint/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
       "dependencies": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -5679,6 +5816,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -5691,6 +5829,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -5702,6 +5841,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -5713,6 +5853,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -5727,6 +5868,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5747,6 +5889,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -5833,7 +5976,8 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
@@ -5845,6 +5989,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
       "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -5860,6 +6005,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5875,12 +6021,14 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
@@ -5895,6 +6043,7 @@
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
       "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -5927,6 +6076,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -6006,6 +6156,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -6056,6 +6207,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
       "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+      "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -6069,6 +6221,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -6082,7 +6235,8 @@
     "node_modules/flatted": {
       "version": "3.2.9",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "dev": true
     },
     "node_modules/footable": {
       "version": "2.0.6",
@@ -6142,7 +6296,8 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -6188,7 +6343,8 @@
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
@@ -6319,6 +6475,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6338,6 +6495,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -6348,7 +6506,8 @@
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
     },
     "node_modules/global-dirs": {
       "version": "3.0.1",
@@ -6393,6 +6552,7 @@
       "version": "13.2.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
       "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "dev": true,
       "dependencies": {
         "dir-glob": "^3.0.1",
         "fast-glob": "^3.3.0",
@@ -6411,6 +6571,7 @@
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
       "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -6430,7 +6591,8 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
     "node_modules/gulp-header": {
       "version": "1.8.12",
@@ -6464,6 +6626,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -6620,6 +6783,7 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -6634,6 +6798,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -6668,6 +6833,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -6685,6 +6851,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -6859,6 +7026,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6902,6 +7070,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -6956,6 +7125,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -7202,7 +7372,8 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
     },
     "node_modules/isobject": {
       "version": "3.0.1",
@@ -7324,6 +7495,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -7337,6 +7509,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -7345,6 +7518,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7412,6 +7586,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -7441,12 +7616,14 @@
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -7457,12 +7634,14 @@
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
     },
     "node_modules/json-stringify-pretty-compact": {
       "version": "3.0.0",
@@ -7578,6 +7757,7 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -7646,6 +7826,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -8122,6 +8303,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
       "engines": {
         "node": ">=6.11.5"
       }
@@ -8176,7 +8358,8 @@
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -8210,7 +8393,8 @@
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
@@ -8569,12 +8753,14 @@
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
     },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -8666,6 +8852,7 @@
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -8678,6 +8865,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -8686,6 +8874,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -8706,6 +8895,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -8725,7 +8915,8 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/muicss": {
       "version": "0.10.3",
@@ -8758,12 +8949,14 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "node_modules/node-fetch": {
       "version": "2.7.0",
@@ -8787,7 +8980,8 @@
     "node_modules/node-releases": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true
     },
     "node_modules/non-layered-tidy-tree-layout": {
       "version": "2.0.2",
@@ -8798,6 +8992,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8942,6 +9137,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -8965,6 +9161,7 @@
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
       "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
       "dependencies": {
         "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
@@ -9037,6 +9234,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -9062,6 +9260,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9076,6 +9275,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9090,6 +9290,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9115,6 +9316,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -9176,6 +9378,50 @@
         "node": ">=8"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.40.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.1.tgz",
+      "integrity": "sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.40.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.40.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz",
+      "integrity": "sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/po2json": {
       "version": "1.0.0-beta-3",
       "resolved": "https://registry.npmjs.org/po2json/-/po2json-1.0.0-beta-3.tgz",
@@ -9228,6 +9474,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -9279,15 +9526,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -9297,6 +9535,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -9338,6 +9577,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9367,6 +9607,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -9391,6 +9632,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -9544,6 +9786,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -9630,6 +9873,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9682,6 +9926,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -9703,6 +9948,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -9810,6 +10056,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -9992,6 +10239,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
       "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -10041,6 +10289,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -10052,6 +10301,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10080,6 +10330,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
       "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -10160,6 +10411,7 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -10363,6 +10615,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -10384,6 +10637,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -10407,6 +10661,7 @@
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
       "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
+      "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -10422,6 +10677,7 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -10437,6 +10693,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10451,6 +10708,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10461,17 +10719,20 @@
     "node_modules/table/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/table/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/table/node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -10488,6 +10749,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -10535,6 +10797,7 @@
       "version": "5.24.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
       "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -10552,6 +10815,7 @@
       "version": "5.3.9",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
       "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
@@ -10585,6 +10849,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -10602,6 +10867,7 @@
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
       "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -10612,18 +10878,23 @@
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
     },
     "node_modules/throttleit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-      "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
+      "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/through": {
       "version": "2.3.8",
@@ -10685,6 +10956,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -10814,6 +11086,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -10916,7 +11189,8 @@
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -11002,6 +11276,7 @@
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
       "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -11031,6 +11306,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -11062,7 +11338,8 @@
     "node_modules/v8-compile-cache": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
-      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
+      "dev": true
     },
     "node_modules/vcards-js": {
       "version": "2.10.0",
@@ -11585,6 +11862,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -11607,6 +11885,7 @@
       "version": "5.89.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
       "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+      "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -11752,6 +12031,7 @@
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -11760,6 +12040,7 @@
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
       "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -11771,6 +12052,7 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
       "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -11779,6 +12061,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -11805,6 +12088,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -12244,7 +12528,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
diff --git a/package.json b/package.json
index 253ea4a42..9d95a5518 100644
--- a/package.json
+++ b/package.json
@@ -15,28 +15,34 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.14.7",
     "@codemirror/state": "^6.0.0",
+    "@playwright/test": "^1.40.1",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.2.2",
-    "cypress": "^13.1.0",
     "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "cypress": "11.2",
     "dayjs": "^1.10.6",
+    "dotenv": "^16.3.1",
     "eslint": "^7.30.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-cypress": "^2.11.3",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.4.0",
+    "eslint-webpack-plugin": "^2.5.4",
     "file-loader": "^6.2.0",
     "husky": "^7.0.4",
     "lint-staged": "^13.2.1",
+    "playwright": "^1.40.1",
     "prettier": "^2.3.2",
     "sass": "^1.62.1",
     "sass-loader": "^13.2.2",
     "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2",
-    "workbox-webpack-plugin": "^6.1.5",
-    "webpack-manifest-plugin": "^5.0.0"
+    "webpack-manifest-plugin": "^5.0.0",
+    "workbox-webpack-plugin": "^6.1.5"
   },
   "dependencies": {
     "@codemirror/autocomplete": "^6.3.0",
@@ -47,10 +53,7 @@
     "@codemirror/language": "^6.2.1",
     "@codemirror/view": "^6.4.0",
     "@lezer/highlight": "^1.1.3",
-    "copy-webpack-plugin": "^11.0.0",
     "emojionearea": "^3.4.2",
-    "eslint-plugin-cypress": "^2.11.3",
-    "eslint-webpack-plugin": "^2.5.4",
     "footable": "^2.0.6",
     "hammerjs": "^2.0.8",
     "htmx.org": "^1.8.0",
diff --git a/playwright.config.js b/playwright.config.js
index b611cf6b0..75f10e16c 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -11,6 +11,7 @@ const { defineConfig, devices } = require('@playwright/test');
  * @see https://playwright.dev/docs/test-configuration
  */
 module.exports = defineConfig({
+  globalSetup: './tests/playwright/globalSetup.js',
   testDir: './tests/playwright/tests',
   /* Run tests in files in parallel */
   fullyParallel: true,
@@ -48,33 +49,7 @@ module.exports = defineConfig({
       name: 'webkit',
       use: { ...devices['Desktop Safari'] },
     },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
   ],
 
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://127.0.0.1:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
 });
 
diff --git a/tests/cypress/e2e/01_addCrewtoProfile.cy.js b/tests/cypress/e2e/01_addCrewtoProfile.cy.js
index 6cdd8e7db..5ab33e3ac 100644
--- a/tests/cypress/e2e/01_addCrewtoProfile.cy.js
+++ b/tests/cypress/e2e/01_addCrewtoProfile.cy.js
@@ -25,7 +25,7 @@ describe('Adding crew to profile', () => {
 
     cy.get('[data-testid="member"]').contains(admin.username).click();
     cy.wait('@edit-form');
-    cy.get('button[data-testid="revoke"]').click();
+    cy.get('button[data-testid="revoke-btn"]').click();
     cy.wait('@delete-form');
     cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait('@delete-member');
@@ -48,9 +48,6 @@ describe('Adding crew to profile', () => {
     cy.get('a.modal__close:visible').click();
     cy.wait(1000);
 
-    cy.get('a[data-testid="profile-public"]:visible').click();
-    cy.wait(1000);
-    cy.get('button[data-testid="make-public-btn"]:visible').click();
-    cy.wait(1000);
+    cy.get('a[data-testid="new-profile-btn"]:visible').click();
   });
 });
diff --git a/tests/cypress/e2e/05_publishProject.cy.js b/tests/cypress/e2e/05_publishProject.cy.js
index 71ef19f5f..0eb055b11 100644
--- a/tests/cypress/e2e/05_publishProject.cy.js
+++ b/tests/cypress/e2e/05_publishProject.cy.js
@@ -1,6 +1,6 @@
 /* eslint-disable global-require */
 describe('Verify roles of editor and publish project', () => {
-  const { editor } = require('../fixtures/user.json');
+  const { editor, promoter } = require('../fixtures/user.json');
   const profile = require('../fixtures/profile.json');
   const project = require('../fixtures/project.json');
 
@@ -27,5 +27,15 @@ describe('Verify roles of editor and publish project', () => {
     cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
     cy.get('[data-testid="project-state"]').contains('Published');
+    cy.logout();
+
+    cy.login(`/${profile.title}`, promoter.username, promoter.password);
+    cy.get(`[data-testid="${project.title}"]`).first().click();
+    cy.get('a[data-testid="project-menu"]:visible').click();
+    cy.wait(1000);
+    cy.get('a[data-testid="settings"]:visible').click();
+    cy.get('a[data-testid="add-tickets"]').click();
+    cy.get('#rsvp_state').find('li').eq(1).find('input').click();
+    cy.get('button[data-testid="form-submit-btn"]').click();
   });
 });
diff --git a/tests/cypress/e2e/06_manageVenue.cy.js b/tests/cypress/e2e/06_manageVenue.cy.js
index 75ff3556c..8dd8a9f94 100644
--- a/tests/cypress/e2e/06_manageVenue.cy.js
+++ b/tests/cypress/e2e/06_manageVenue.cy.js
@@ -39,7 +39,7 @@ describe('Manage project venue', () => {
       cy.get(`[data-testid="${venues[1].venue_title}"]`).find('em').contains('(primary)');
 
       venues.forEach((venue) => {
-        cy.get(`.card[data-testid="${venue.venue_title}"]`)
+        cy.get(`.card[data-testid="${venue.venue_title}-rooms"]`)
           .find('a[data-testid="add-room"]')
           .click();
         cy.location('pathname').should('contain', '/new');
@@ -53,7 +53,7 @@ describe('Manage project venue', () => {
           'include',
           `/testcypressproject/${project.url}/venues`
         );
-        cy.get(`.card[data-testid="${venue.venue_title}"]`)
+        cy.get(`.card[data-testid="${venue.venue_title}-rooms"]`)
           .find('li')
           .contains(venue.room.title);
       });
diff --git a/tests/cypress/e2e/10_updateSchedule.cy.js b/tests/cypress/e2e/10_updateSchedule.cy.js
index cbde43cc1..2610f22a1 100644
--- a/tests/cypress/e2e/10_updateSchedule.cy.js
+++ b/tests/cypress/e2e/10_updateSchedule.cy.js
@@ -53,7 +53,7 @@ describe('Add schedule and livestream', () => {
     cy.wait('@add-session');
 
     cy.get('[data-testid="settings"]').click();
-    cy.get('[data-testid="open"]').eq(0).click();
+    cy.get('[data-testid="collapsible-open"]').eq(0).click();
     cy.get('.sp-dd').eq(0).click();
     cy.get('.sp-palette-container').should('exist');
 
@@ -63,7 +63,7 @@ describe('Add schedule and livestream', () => {
     cy.wait(1000);
     cy.get('a[data-testid="settings"]:visible').click();
     cy.location('pathname').should('contain', 'settings');
-    cy.get('a[data-testid="add-livestream"]').click();
+    cy.get('a[data-testid="add-livestream-btn"]').click();
     cy.location('pathname').should('contain', '/edit');
 
     cy.get('#field-livestream_urls')
diff --git a/tests/cypress/e2e/23_addSponsor.cy.js b/tests/cypress/e2e/23_addSponsor.cy.js
index 12c78ba26..574f468b7 100644
--- a/tests/cypress/e2e/23_addSponsor.cy.js
+++ b/tests/cypress/e2e/23_addSponsor.cy.js
@@ -31,7 +31,7 @@ describe('Add sponsor to project', () => {
     cy.get('.select2-results__options', { timeout: 10000 }).should('not.exist');
     cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait(2000);
-    cy.get('[data-testid="profile-link"]').contains(sponsor.title);
+    cy.get('[data-testid="sponsor-link"]').contains(sponsor.title);
 
     cy.get('a[data-testid="edit-sponsor"]:visible').click();
     cy.wait('@edit-sponsor-form');
diff --git a/tests/cypress/support.js b/tests/cypress/support.js
index 59340c3fc..97e3dc705 100644
--- a/tests/cypress/support.js
+++ b/tests/cypress/support.js
@@ -9,7 +9,7 @@ Cypress.Commands.add('login', (route, username, password) => {
 Cypress.Commands.add('logout', () => {
   cy.get('#hgnav').find('a[data-testid="my-account"]').click();
   cy.wait(1000);
-  cy.get('button[data-testid="Logout"]:visible').click();
+  cy.get('button[data-testid="logout"]:visible').click();
 });
 
 Cypress.Commands.add('fill_login_details', (username, password) => {
diff --git a/tests/playwright/globalSetup.js b/tests/playwright/globalSetup.js
new file mode 100644
index 000000000..3b7ec124a
--- /dev/null
+++ b/tests/playwright/globalSetup.js
@@ -0,0 +1,12 @@
+//globalSetup.js
+const { FullConfig } = require("@playwright/test");
+const dotenv = require('dotenv');
+
+async function globalSetup(config) {
+  dotenv.config({
+    path: '.env.testing',
+    override: true
+  });
+}
+
+module.exports = globalSetup;
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
index 03bce966c..ff2250f3d 100644
--- a/tests/playwright/tests/rsvp-checkin.spec.js
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -7,15 +7,13 @@ const project = require('../fixtures/project.json');
 const { promoter, usher, user } = require('../fixtures/user.json');
 const events = require('../fixtures/ticket_events.json');
 const ticket_participants = require('../fixtures/ticket_participants.json');
+const dayjs = require('dayjs');
 
 test('Open rsvp, for all and members only', async ({ page }) => {
-  // let projectPage = new ProjectPage(page);
-  // let randomProjectName = await projectPage.addProject([{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
-  // let loginPage = new LoginPage(page);
-  // await loginPage.login(`/${profile.title}/${randomProjectName}`, promoter.username, promoter.password);
-
+  let projectPage = new ProjectPage(page);
+  let randomProjectName = await projectPage.addProject([{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login('testcypressproject/zgs0w', promoter.username, promoter.password);
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, promoter.username, promoter.password);
 
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
@@ -61,14 +59,41 @@ test('Open rsvp, for all and members only', async ({ page }) => {
     await page.getByTestId('form-submit-btn').click();
   }
 
-  await page.getByTestId(`{ticketEvents[0].title}`).click();
-  await page.getByTestId('ticket-participant', { hasText: ticketParticipants[0].fullname }).isVisible();
-  await page.getByTestId('ticket-participant', { hasText: ticketParticipants[1].fullname }).isVisible();
+  await page.getByTestId(`event-${events[0].title}`).click();
+  await page.getByTestId('ticket-participant', { hasText: ticket_participants[0].fullname }).isVisible();
+  await page.getByTestId('ticket-participant', { hasText: ticket_participants[1].fullname }).isVisible();
   await Promise.all([
     page.waitForResponse(response => response.url().includes("/json") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('ticket-participant', { hasText: user.username }).getByTestId('checkin').click()
+    page.getByTestId(user.fullname).getByTestId('checkin').click()
   ]);
   await page.getByTestId('cancel-checkin').isVisible();
   await page.getByTestId('back-to-setup').click();
+  await page.getByTestId('project-page').click();
+
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('edit').locator('visible=true').click();
+  let eventStartDate = dayjs().add(1, 'days').format('YYYY-MM-DDTHH:MM');
+  let eventEndDate = dayjs().add(10, 'days').format('YYYY-MM-DDTHH:MM');
+  await page.locator('#start_at').fill(eventStartDate);
+  await page.locator('#end_at').fill(eventEndDate);
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').click();
+  await page.getByTestId('publish').click();
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').click();
+  await page.getByTestId('add-tickets').click();
+  await page.getByLabel('Only members can register').click();
+  await page.locator('#has_membership').click();
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('rsvp-only-for-members').isVisible();
+  await loginPage.logout();
+
+  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
+  await page.getByTestId('project-member').isVisible();
+  await page.getByTestId('member-rsvp').click();
+  await page.locator('#rsvp-form').waitFor(60000);
+  await page.getByTestId('confirm').click();
+  await page.getByTestId('registered').isVisible();
 
 });

From 05974e7f287b9394d483b98dafa4a929c24013c8 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 26 Dec 2023 12:04:07 +0530
Subject: [PATCH 06/14] Fix  playwright test login

---
 tests/cypress/e2e/06_manageVenue.cy.js        |  4 +-
 tests/cypress/e2e/11_respondToAttend.cy.js    |  3 +-
 tests/cypress/e2e/13_verifyattendeeList.cy.js |  3 +-
 .../7_updatebadgeprintstatus.cy.js            |  3 +-
 tests/cypress/fixtures/profile.json           |  2 +-
 tests/cypress/fixtures/user.json              | 23 +++++++-----
 tests/playwright/fixtures/profile.json        |  2 +-
 tests/playwright/page/create-project.js       |  5 +--
 .../playwright/tests/add-crew-project.spec.js |  4 +-
 tests/playwright/tests/add-livestream.spec.js |  7 ++--
 tests/playwright/tests/add-submission.spec.js | 10 ++---
 .../tests/add-venue-project.spec.js           |  7 ++--
 tests/playwright/tests/create-project.spec.js |  5 +--
 tests/playwright/tests/open-cfp.spec.js       |  6 +--
 tests/playwright/tests/rsvp-checkin.spec.js   |  8 ++--
 ..._dropdb_test.py => test_fixture_dropdb.py} |  0
 ..._initdb_test.py => test_fixture_initdb.py} | 37 ++++++++++++++++++-
 17 files changed, 82 insertions(+), 47 deletions(-)
 rename tests/{cypress/cypress_dropdb_test.py => test_fixture_dropdb.py} (100%)
 rename tests/{cypress/cypress_initdb_test.py => test_fixture_initdb.py} (75%)

diff --git a/tests/cypress/e2e/06_manageVenue.cy.js b/tests/cypress/e2e/06_manageVenue.cy.js
index 8dd8a9f94..fce2377e8 100644
--- a/tests/cypress/e2e/06_manageVenue.cy.js
+++ b/tests/cypress/e2e/06_manageVenue.cy.js
@@ -30,7 +30,7 @@ describe('Manage project venue', () => {
         cy.get('button[data-testid="form-submit-btn"]').click();
         cy.location('pathname').should(
           'include',
-          `/testcypressproject/${project.url}/venues`
+          `/${profile.title}/${project.url}/venues`
         );
       });
 
@@ -51,7 +51,7 @@ describe('Manage project venue', () => {
         cy.get('button[data-testid="form-submit-btn"]').click();
         cy.location('pathname').should(
           'include',
-          `/testcypressproject/${project.url}/venues`
+          `/${profile.title}/${project.url}/venues`
         );
         cy.get(`.card[data-testid="${venue.venue_title}-rooms"]`)
           .find('li')
diff --git a/tests/cypress/e2e/11_respondToAttend.cy.js b/tests/cypress/e2e/11_respondToAttend.cy.js
index 78ce3061c..29948140c 100644
--- a/tests/cypress/e2e/11_respondToAttend.cy.js
+++ b/tests/cypress/e2e/11_respondToAttend.cy.js
@@ -1,13 +1,14 @@
 /* eslint-disable global-require */
 describe('Responding yes to attend a project', () => {
   const { user } = require('../fixtures/user.json');
+  const profile = require('../fixtures/profile.json');
   const project = require('../fixtures/project.json');
 
   it('Respond to attend a project', () => {
     cy.server();
     cy.route('POST', '**/save').as('bookmark-project');
 
-    cy.login('/testcypressproject', user.username, user.password);
+    cy.login(`/${profile.title}`, user.username, user.password);
 
     cy.get('.upcoming').find('.card').contains(project.title).click({ force: true });
     cy.location('pathname').should('contain', project.url);
diff --git a/tests/cypress/e2e/13_verifyattendeeList.cy.js b/tests/cypress/e2e/13_verifyattendeeList.cy.js
index c2072a903..833b0285a 100644
--- a/tests/cypress/e2e/13_verifyattendeeList.cy.js
+++ b/tests/cypress/e2e/13_verifyattendeeList.cy.js
@@ -1,10 +1,11 @@
 /* eslint-disable global-require */
 describe('Verify attendee list', () => {
   const { user, promoter } = require('../fixtures/user.json');
+  const profile = require('../fixtures/profile.json');
   const project = require('../fixtures/project.json');
 
   it('Verify list of attendees who have responded yes to attending a project', () => {
-    cy.login('/testcypressproject', promoter.username, promoter.password);
+    cy.login(`/${profile.title}`, promoter.username, promoter.password);
 
     cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
diff --git a/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js b/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
index 4cda2b5aa..20bb15d4b 100644
--- a/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/7_updatebadgeprintstatus.cy.js
@@ -1,6 +1,7 @@
 /* eslint-disable global-require */
 describe('View and update print status of badge', () => {
   const { admin } = require('../../fixtures/user.json');
+  const profile = require('../fixtures/profile.json');
   const project = require('../../fixtures/project.json');
   const ticketEvents = require('../../fixtures/ticket_events.json');
 
@@ -9,7 +10,7 @@ describe('View and update print status of badge', () => {
     cy.route('POST', '**/ticket_participants/checkin?*').as('checkin');
     cy.route('**/ticket_participants/json').as('ticket-participant-list');
 
-    cy.login('/testcypressproject', admin.username, admin.password);
+    cy.login(`/${profile.title}`, admin.username, admin.password);
 
     cy.get(`[data-testid="${project.title}"]`).first().click();
     cy.location('pathname').should('contain', project.url);
diff --git a/tests/cypress/fixtures/profile.json b/tests/cypress/fixtures/profile.json
index cbd2d8382..cabcaef19 100644
--- a/tests/cypress/fixtures/profile.json
+++ b/tests/cypress/fixtures/profile.json
@@ -1,5 +1,5 @@
 {
-  "title": "testcypressproject",
+  "title": "testprofile",
   "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
   "logo_url": "https://images.hasgeek.com/embed/file/59ec36fb37774e6ea6aea474f9b98aa8",
   "banner_url": "https://images.hasgeek.com/embed/file/82cacecfa2d64f289ea54cfe45d33df3"
diff --git a/tests/cypress/fixtures/user.json b/tests/cypress/fixtures/user.json
index 0e78dbd0d..8dd66d909 100644
--- a/tests/cypress/fixtures/user.json
+++ b/tests/cypress/fixtures/user.json
@@ -2,27 +2,32 @@
   "owner": {
     "username": "profile_cypress",
     "fullname": "profile-cypress",
-    "password": "profile-cypress123_St"
+    "password": "profile-cypress123_St",
+    "owns_profile": "fifthelephant",
   },
   "admin": {
     "username": "admin_user",
     "fullname": "admin-user",
-    "password": "admin-user129_Ftz"
+    "password": "admin-user129_Ftz",
+    "owns_profile": "rootconf",
+  },
+  "editor": {
+    "username": "editor_cypress",
+    "fullname": "editor-cypress",
+    "password": "editor-cypress9_GH",
+    "owns_profile": "jsfoo",
   },
   "promoter": {
     "username": "promoter_user",
     "fullname": "promoter-user",
-    "password": "promoter-user34_qQE"
+    "password": "promoter-user34_qQE",
+    "owns_profile": "metarefresh",
   },
   "usher": {
     "username": "usher_cypress",
     "fullname": "usher-cypress",
-    "password": "usher-cypress566_YUt"
-  },
-  "editor": {
-    "username": "editor_cypress",
-    "fullname": "editor-cypress",
-    "password": "editor-cypress9_GH"
+    "password": "usher-cypress566_YUt",
+    "owns_profile": "kilter",
   },
   "user": {
     "username": "member_user",
diff --git a/tests/playwright/fixtures/profile.json b/tests/playwright/fixtures/profile.json
index cbd2d8382..cabcaef19 100644
--- a/tests/playwright/fixtures/profile.json
+++ b/tests/playwright/fixtures/profile.json
@@ -1,5 +1,5 @@
 {
-  "title": "testcypressproject",
+  "title": "testprofile",
   "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
   "logo_url": "https://images.hasgeek.com/embed/file/59ec36fb37774e6ea6aea474f9b98aa8",
   "banner_url": "https://images.hasgeek.com/embed/file/82cacecfa2d64f289ea54cfe45d33df3"
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
index 88cf7efc9..ec187dfdb 100644
--- a/tests/playwright/page/create-project.js
+++ b/tests/playwright/page/create-project.js
@@ -3,7 +3,6 @@ const { LoginPage } = require('../page/login');
 const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner } = require('../fixtures/user.json');
 
 export class ProjectPage {
   constructor(page) {
@@ -78,12 +77,12 @@ export class ProjectPage {
     await this.page.locator('label.switch-label').locator("visible=true").click();
   }
 
-  async addProject(crew=[]) {
+  async addProject(owner, crew=[]) {
     let randomProjectName = Math.random().toString(36).substring(2, 7);
     let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
     let loginPage;
     loginPage = new LoginPage(this.page);
-    await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+    await loginPage.login(`/${owner.owns_profile}`, owner.username, owner.password);
     await this.createNewProject(projectNameCapitalize);
     let crewForm = new ProjectCrewFormPage(this.page);
     await this.page.getByTestId('crew').click();
diff --git a/tests/playwright/tests/add-crew-project.spec.js b/tests/playwright/tests/add-crew-project.spec.js
index e0c0f023c..eabb73953 100644
--- a/tests/playwright/tests/add-crew-project.spec.js
+++ b/tests/playwright/tests/add-crew-project.spec.js
@@ -3,8 +3,6 @@ import { test, expect } from '@playwright/test';
 const { LoginPage } = require('../page/login');
 const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
-const project = require('../fixtures/project.json');
 const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
 
 test('Add crew to project', async ({ page }) => {
@@ -12,7 +10,7 @@ test('Add crew to project', async ({ page }) => {
   let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
   let loginPage;
   loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  await loginPage.login(`/${owner.owns_profile}`, owner.username, owner.password);
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
 
diff --git a/tests/playwright/tests/add-livestream.spec.js b/tests/playwright/tests/add-livestream.spec.js
index 119c7b7bb..a5f3e6701 100644
--- a/tests/playwright/tests/add-livestream.spec.js
+++ b/tests/playwright/tests/add-livestream.spec.js
@@ -2,16 +2,15 @@ import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner, editor } = require('../fixtures/user.json');
+const { admin, editor } = require('../fixtures/user.json');
 const videos = require('../fixtures/embed_video.json');
 
 test('Add livestream and verify embed youtube and vimeo urls', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let randomProjectName = await projectPage.addProject(admin, [{'username': editor.username, 'role': 'editor'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
+  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, editor.username, editor.password);
 
   await page.getByTestId('add-livestream').click();
   for(let video of videos) {
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index 74c719bfe..bbcf9855b 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -1,24 +1,22 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner, user, usher } = require('../fixtures/user.json');
+const { user, usher } = require('../fixtures/user.json');
 const proposal = require('../fixtures/proposal.json');
 let randomProjectName;
 
 test('Submitting a proposal to a project', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  randomProjectName = await projectPage.addProject();
+  randomProjectName = await projectPage.addProject(usher);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, owner.username, owner.password);
+  await loginPage.login(`/${usher.owns_profile}/${randomProjectName}`, usher.username, usher.password);
   await projectPage.addLabels();
   await projectPage.openCFP();
   await loginPage.logout();
 
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
+  await loginPage.login(`/${usher.owns_profile}/${randomProjectName}`, user.username, user.password);
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
   await page.locator('#title').fill(proposal.title);
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index a63aea276..71c35b198 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -3,15 +3,14 @@ import { test, expect } from '@playwright/test';
 const { LoginPage } = require('../page/login');
 const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
 const venues = require('../fixtures/venues.json');
-const { owner, editor } = require('../fixtures/user.json');
+const { promoter, usher } = require('../fixtures/user.json');
 
 test('Add venue to project', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let randomProjectName = await projectPage.addProject(promoter, [{'username': usher.username, 'role': 'editor'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
+  await loginPage.login(`/${promoter.owns_profile}/${randomProjectName}`, usher.username, usher.password);
 
   await page.getByTestId('project-menu').locator("visible=true").click();
   await page.getByTestId('settings').locator("visible=true").waitFor();
diff --git a/tests/playwright/tests/create-project.spec.js b/tests/playwright/tests/create-project.spec.js
index 6ae291d28..ef74097a6 100644
--- a/tests/playwright/tests/create-project.spec.js
+++ b/tests/playwright/tests/create-project.spec.js
@@ -2,16 +2,15 @@ import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner } = require('../fixtures/user.json');
+const { admin } = require('../fixtures/user.json');
 
 test('To create project, edit, publish', async ({ page }) => {
   let randomProjectName = Math.random().toString(36).substring(2, 7);
   let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
   let loginPage;
   loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}`, owner.username, owner.password);
+  await loginPage.login(`/${admin.owns_profile}`, admin.username, admin.password);
 
   let projectPage = new ProjectPage(page);
   await projectPage.createNewProject(projectNameCapitalize);
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
index ba467bdec..bf451c800 100644
--- a/tests/playwright/tests/open-cfp.spec.js
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -4,16 +4,16 @@ const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { owner, editor, user } = require('../fixtures/user.json');
+const { promoter, editor, user } = require('../fixtures/user.json');
 const cfp = require('../fixtures/cfp.json');
 const labels = require('../fixtures/labels.json');
 const dayjs = require('dayjs');
 
 test('Open call for proposal of the project and add schedule', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject([{'username': editor.username, 'role': 'editor'}]);
+  let randomProjectName = await projectPage.addProject(promoter, [{'username': editor.username, 'role': 'editor'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, editor.username, editor.password);
+  await loginPage.login(`/${promoter.owns_profile}/${randomProjectName}`, editor.username, editor.password);
   await projectPage.addVenue();
   await page.getByTestId('submissions').click();
   await page.getByTestId('add-cfp').click();
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
index ff2250f3d..832d2b0da 100644
--- a/tests/playwright/tests/rsvp-checkin.spec.js
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -4,16 +4,16 @@ const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
 const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { promoter, usher, user } = require('../fixtures/user.json');
+const { admin, promoter, usher, user } = require('../fixtures/user.json');
 const events = require('../fixtures/ticket_events.json');
 const ticket_participants = require('../fixtures/ticket_participants.json');
 const dayjs = require('dayjs');
 
 test('Open rsvp, for all and members only', async ({ page }) => {
   let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject([{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
+  let randomProjectName = await projectPage.addProject(admin, [{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, promoter.username, promoter.password);
+  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, promoter.username, promoter.password);
 
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
@@ -89,7 +89,7 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('rsvp-only-for-members').isVisible();
   await loginPage.logout();
 
-  await loginPage.login(`/${profile.title}/${randomProjectName}`, user.username, user.password);
+  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, user.username, user.password);
   await page.getByTestId('project-member').isVisible();
   await page.getByTestId('member-rsvp').click();
   await page.locator('#rsvp-form').waitFor(60000);
diff --git a/tests/cypress/cypress_dropdb_test.py b/tests/test_fixture_dropdb.py
similarity index 100%
rename from tests/cypress/cypress_dropdb_test.py
rename to tests/test_fixture_dropdb.py
diff --git a/tests/cypress/cypress_initdb_test.py b/tests/test_fixture_initdb.py
similarity index 75%
rename from tests/cypress/cypress_initdb_test.py
rename to tests/test_fixture_initdb.py
index 471f22279..51270c13d 100644
--- a/tests/cypress/cypress_initdb_test.py
+++ b/tests/test_fixture_initdb.py
@@ -67,11 +67,41 @@ def init_models():
         )
 
         org = Organization(
-            name='testcypressproject', title='testcypressproject', owner=profile_owner
+            name='testprofile', title='testprofile', owner=profile_owner
         )
         org.is_verified = True
         org.make_profile_public()
 
+        org1 = Organization(
+            name='fifthelephant', title='Fifth elephant', owner=profile_owner
+        )
+        org1.is_verified = True
+        org1.make_profile_public()
+
+        org2 = Organization(
+            name='rootconf', title='Rootconf', owner=user_admin
+        )
+        org2.is_verified = True
+        org2.make_profile_public()
+
+        org3 = Organization(
+            name='jsfoo', title='JSFoo', owner=editor
+        )
+        org3.is_verified = True
+        org3.make_profile_public()
+
+        org4 = Organization(
+            name='metarefresh', title='Metarefresh', owner=promoter
+        )
+        org4.is_verified = True
+        org4.make_profile_public()
+
+        org5 = Organization(
+            name='kilter', title='Kilter', owner=usher
+        )
+        org5.is_verified = True
+        org5.make_profile_public()
+
         db.session.add_all(
             [
                 user_admin,
@@ -90,6 +120,11 @@ def init_models():
                 user3,
                 sm,
                 org,
+                org1,
+                org2,
+                org3,
+                org4,
+                org5
             ]
         )
         db.session.commit()

From 09096bd7a70af06bf93178a3cab8988b75f2d6cf Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 8 Jan 2024 10:38:49 +0530
Subject: [PATCH 07/14] Create projects in fixture to reduce number of steps in
 frontend tests

---
 playwright.config.js                          |  12 +-
 tests/playwright/fixtures/embed_video.json    |  30 ++-
 tests/playwright/fixtures/project.json        |   4 +-
 tests/playwright/fixtures/user.json           |  28 ++-
 .../playwright/tests/add-crew-project.spec.js |  26 ---
 tests/playwright/tests/add-livestream.spec.js |  21 +--
 .../tests/add-sponsor-project.spec.js         |  51 +++++
 tests/playwright/tests/add-submission.spec.js |  18 +-
 .../tests/add-venue-project.spec.js           |  11 +-
 tests/playwright/tests/create-project.spec.js |  12 +-
 tests/playwright/tests/open-cfp.spec.js       |  15 +-
 tests/playwright/tests/post-update.spec.js    |  43 +++++
 tests/playwright/tests/rsvp-checkin.spec.js   |  39 ++--
 tests/test_fixture_initdb.py                  | 178 ++++++++++++------
 14 files changed, 308 insertions(+), 180 deletions(-)
 delete mode 100644 tests/playwright/tests/add-crew-project.spec.js
 create mode 100644 tests/playwright/tests/add-sponsor-project.spec.js
 create mode 100644 tests/playwright/tests/post-update.spec.js

diff --git a/playwright.config.js b/playwright.config.js
index 75f10e16c..922be7a57 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -14,7 +14,7 @@ module.exports = defineConfig({
   globalSetup: './tests/playwright/globalSetup.js',
   testDir: './tests/playwright/tests',
   /* Run tests in files in parallel */
-  fullyParallel: true,
+  fullyParallel: false,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
@@ -39,16 +39,6 @@ module.exports = defineConfig({
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
   ],
 
 });
diff --git a/tests/playwright/fixtures/embed_video.json b/tests/playwright/fixtures/embed_video.json
index cd04abeb0..18345fe19 100644
--- a/tests/playwright/fixtures/embed_video.json
+++ b/tests/playwright/fixtures/embed_video.json
@@ -1,7 +1,27 @@
 [
-  "https://www.youtube.com/watch?v=qY8QmpdYFfc",
-  "https://www.youtube.com/watch?v=qY8Qmpdfc",
-  "https://www.youtube.com/live/RfnjNskapNg?feature=shared",
-  "https://www.youtube.com/embed/3pbyEGZjgH8?si=7kKze11tNJh554b1",
-  "https://vimeo.com/860144207"
+  {
+    "url": "https://www.youtube.com/watch?v=qY8QmpdYFfc",
+    "video_classname": ".ytp-title",
+    "valid": true
+  },
+  {
+    "url": "https://www.youtube.com/watch?v=qY8Qmpdfc",
+    "video_classname": ".ytp-title",
+    "valid": false
+  },
+  {
+    "url": "https://www.youtube.com/live/RfnjNskapNg?feature=shared",
+    "video_classname": ".ytp-title",
+    "valid": true
+  },
+  {
+    "url": "https://www.youtube.com/embed/3pbyEGZjgH8?si=7kKze11tNJh554b1",
+    "video_classname": ".ytp-title",
+    "valid": true
+  },
+  {
+    "url": "https://vimeo.com/860144207",
+    "video_title_class": ".vp-title",
+    "video_classname": true
+  }
 ]
diff --git a/tests/playwright/fixtures/project.json b/tests/playwright/fixtures/project.json
index 0152b8732..73d968cea 100644
--- a/tests/playwright/fixtures/project.json
+++ b/tests/playwright/fixtures/project.json
@@ -22,8 +22,8 @@
       "room": "Zoom"
     },
     {
-    "title": "BIC",
-    "room": "Hall"
+    "title": "Hasgeek House",
+    "room": "Second floor room"
     }
   ],
   "labels": [
diff --git a/tests/playwright/fixtures/user.json b/tests/playwright/fixtures/user.json
index 0e78dbd0d..12e0a2315 100644
--- a/tests/playwright/fixtures/user.json
+++ b/tests/playwright/fixtures/user.json
@@ -2,27 +2,37 @@
   "owner": {
     "username": "profile_cypress",
     "fullname": "profile-cypress",
-    "password": "profile-cypress123_St"
+    "password": "profile-cypress123_St",
+    "owns_profile": "fifthelephant",
+    "project": "summer-edition"
   },
   "admin": {
     "username": "admin_user",
     "fullname": "admin-user",
-    "password": "admin-user129_Ftz"
+    "password": "admin-user129_Ftz",
+    "owns_profile": "rootconf",
+    "project": "autumn-edition"
+  },
+  "editor": {
+    "username": "editor_cypress",
+    "fullname": "editor-cypress",
+    "password": "editor-cypress9_GH",
+    "owns_profile": "jsfoo",
+    "project": "monsoon-edition"
   },
   "promoter": {
     "username": "promoter_user",
     "fullname": "promoter-user",
-    "password": "promoter-user34_qQE"
+    "password": "promoter-user34_qQE",
+    "owns_profile": "metarefresh",
+    "project": "winter-edition"
   },
   "usher": {
     "username": "usher_cypress",
     "fullname": "usher-cypress",
-    "password": "usher-cypress566_YUt"
-  },
-  "editor": {
-    "username": "editor_cypress",
-    "fullname": "editor-cypress",
-    "password": "editor-cypress9_GH"
+    "password": "usher-cypress566_YUt",
+    "owns_profile": "kilter",
+    "project": "spring-edition"
   },
   "user": {
     "username": "member_user",
diff --git a/tests/playwright/tests/add-crew-project.spec.js b/tests/playwright/tests/add-crew-project.spec.js
deleted file mode 100644
index eabb73953..000000000
--- a/tests/playwright/tests/add-crew-project.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-const { LoginPage } = require('../page/login');
-const { ProjectCrewFormPage } = require('../page/project-crew-form');
-const { ProjectPage } = require('../page/create-project');
-const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
-
-test('Add crew to project', async ({ page }) => {
-  let randomProjectName = Math.random().toString(36).substring(2, 7);
-  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
-  let loginPage;
-  loginPage = new LoginPage(page);
-  await loginPage.login(`/${owner.owns_profile}`, owner.username, owner.password);
-  let projectPage = new ProjectPage(page);
-  await projectPage.createNewProject(projectNameCapitalize);
-
-  //Add crew
-  let crewForm = new ProjectCrewFormPage(page);
-  await page.getByTestId('crew').click();
-  await crewForm.addMember(promoter.username, 'promoter');
-  await crewForm.addMember(usher.username, 'usher');
-  await crewForm.addMember(editor.username, 'editor');
-  await crewForm.addMember(hguser.username, 'usher', false);
-  await crewForm.deleteMember(promoter.username);
-
-});
diff --git a/tests/playwright/tests/add-livestream.spec.js b/tests/playwright/tests/add-livestream.spec.js
index a5f3e6701..9b51242b2 100644
--- a/tests/playwright/tests/add-livestream.spec.js
+++ b/tests/playwright/tests/add-livestream.spec.js
@@ -1,29 +1,28 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { ProjectPage } = require('../page/create-project');
-const project = require('../fixtures/project.json');
-const { admin, editor } = require('../fixtures/user.json');
+const { admin } = require('../fixtures/user.json');
 const videos = require('../fixtures/embed_video.json');
 
 test('Add livestream and verify embed youtube and vimeo urls', async ({ page }) => {
-  let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject(admin, [{'username': editor.username, 'role': 'editor'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, editor.username, editor.password);
+  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, admin.username, admin.password);
 
-  await page.getByTestId('add-livestream').click();
+  await page.getByTestId('add-livestream-btn').click();
   for(let video of videos) {
-    await page.locator('#livestream_urls').type(video);
+    await page.locator('#livestream_urls').type(video.url);
     await page.locator('#livestream_urls').press('Enter');
   }
   await page.getByTestId('form-submit-btn').click();
 
   for(let index=0; index<videos.length; index++) {
     await page.locator(`#tab-${index+1}`).click();
-    await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('[aria-label="Play"]').click();
-    await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('video').isVisible();
-    await expect(page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator('video')).toHaveAttribute('src');
+    await await page.locator(`#pane-justified-${index+1}`).waitFor(6000);
+    if(videos[index].valid) {
+      await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator(videos[index].video_classname).isVisible();
+    } else {
+      await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator(videos[index].video_classname).isHidden();
+    }
   }
 
 });
diff --git a/tests/playwright/tests/add-sponsor-project.spec.js b/tests/playwright/tests/add-sponsor-project.spec.js
new file mode 100644
index 000000000..4adfa383b
--- /dev/null
+++ b/tests/playwright/tests/add-sponsor-project.spec.js
@@ -0,0 +1,51 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { editor, admin } = require('../fixtures/user.json');
+
+test('Add sponsor to project', async ({ page }) => {
+  let loginPage = new LoginPage(page);
+  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, editor.username, editor.password);
+
+  await page.getByTestId('site-editor-menu').locator('visible=true').click();
+  await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/sponsor"), {timeout: 60000}),
+    await page.getByTestId('add-sponsor').click()
+  ]);
+  await page.locator('.select2-selection__arrow').waitFor();
+  await page.locator('.select2-selection__arrow').click();
+  await page.locator('.select2-search__field').waitFor();
+  await page.locator('.select2-search__field').fill(admin.owns_profile);
+  await page.locator('.select2-results__option').waitFor();
+  await page.locator('.select2-results__option').click();
+
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/sponsor") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('form-submit-btn').click()
+  ]);
+  await page.getByTestId('sponsor-link":has-text(`${admin.owns_profile}`)').isVisible();
+
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/edit"), {timeout: 60000}),
+    await page.getByTestId('edit-sponsor').locator('nth=1').click()
+  ]);
+  await page.locator('#is_promoted').click();
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
+    page.getByTestId('form-submit-btn').click()
+  ]);
+  await page.reload();
+  await page.getByTestId('promoted').locator('nth=1').isVisible();
+
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/remove"), {timeout: 60000}),
+    await page.getByTestId('remove-sponsor').locator('nth=1').click()
+  ]);
+  await Promise.all([
+    page.waitForResponse(response => response.url().includes("/remove") && response.status() === 200, {timeout: 60000}),
+    page.locator('input[value="Remove"]').click()
+  ]);
+  await page.reload();
+  await expect.soft(page.getByTestId('sponsor-card')).toBeHidden();
+});
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index bbcf9855b..32b8a2656 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -3,20 +3,18 @@ import { test, expect } from '@playwright/test';
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
 const project = require('../fixtures/project.json');
-const { user, usher } = require('../fixtures/user.json');
+const { usher, owner } = require('../fixtures/user.json');
 const proposal = require('../fixtures/proposal.json');
 let randomProjectName;
 
-test('Submitting a proposal to a project', async ({ page }) => {
-  let projectPage = new ProjectPage(page);
-  randomProjectName = await projectPage.addProject(usher);
+test('Submitting a proposal to a project and commenting on proposal', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${usher.owns_profile}/${randomProjectName}`, usher.username, usher.password);
+  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, usher.username, usher.password);
+  let projectPage = new ProjectPage(page);
   await projectPage.addLabels();
-  await projectPage.openCFP();
   await loginPage.logout();
 
-  await loginPage.login(`/${usher.owns_profile}/${randomProjectName}`, user.username, user.password);
+  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, owner.username, owner.password);
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
   await page.locator('#title').fill(proposal.title);
@@ -55,7 +53,7 @@ test('Submitting a proposal to a project', async ({ page }) => {
     page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
     page.locator('.modal').locator('button[data-testid="form-submit-btn"]').locator('visible=true').click()
   ]);
-  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 10000});
   await page.locator('a.modal__close').locator('visible=true').click();
   await page.getByTestId('form-submit-btn').waitFor(60000);
   await page.getByTestId('form-submit-btn').click();
@@ -63,7 +61,7 @@ test('Submitting a proposal to a project', async ({ page }) => {
   await page.locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' }).isVisible();
 
   await page.getByTestId('proposal-menu').locator('visible=true').click();
-  await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
+  await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(3000);
   await page.getByTestId('delete').isVisible();
   await page.getByTestId('edit-proposal-video').isVisible();
 
@@ -74,6 +72,6 @@ test('Submitting a proposal to a project', async ({ page }) => {
     page.getByTestId('new-form').getByTestId('submit-comment').click()
   ]);
   await expect(page.locator('.comment__body')).toContainText(proposal.proposer_note);
-  await expect(page.locator('.comment__header')).toContainText(user.username);
+  await expect(page.locator('.comment__header')).toContainText(owner.username);
 
 });
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index 71c35b198..2d53c3006 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -1,16 +1,13 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { ProjectCrewFormPage } = require('../page/project-crew-form');
-const { ProjectPage } = require('../page/create-project');
 const venues = require('../fixtures/venues.json');
-const { promoter, usher } = require('../fixtures/user.json');
+const { owner } = require('../fixtures/user.json');
 
 test('Add venue to project', async ({ page }) => {
-  let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject(promoter, [{'username': usher.username, 'role': 'editor'}]);
-  let loginPage = new LoginPage(page);
-  await loginPage.login(`/${promoter.owns_profile}/${randomProjectName}`, usher.username, usher.password);
+  let loginPage;
+  loginPage = new LoginPage(page);
+  await loginPage.login(`/${owner.owns_profile}/${owner.project}`, owner.username, owner.password);
 
   await page.getByTestId('project-menu').locator("visible=true").click();
   await page.getByTestId('settings').locator("visible=true").waitFor();
diff --git a/tests/playwright/tests/create-project.spec.js b/tests/playwright/tests/create-project.spec.js
index ef74097a6..3e33ac898 100644
--- a/tests/playwright/tests/create-project.spec.js
+++ b/tests/playwright/tests/create-project.spec.js
@@ -2,10 +2,11 @@ import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
+const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const project = require('../fixtures/project.json');
-const { admin } = require('../fixtures/user.json');
+const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
 
-test('To create project, edit, publish', async ({ page }) => {
+test('To create project, edit, publish and add crew', async ({ page }) => {
   let randomProjectName = Math.random().toString(36).substring(2, 7);
   let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
   let loginPage;
@@ -29,5 +30,12 @@ test('To create project, edit, publish', async ({ page }) => {
 
   //Publish project
   await projectPage.publishProject();
+  let crewForm = new ProjectCrewFormPage(page);
+  await page.getByTestId('crew').click();
+  await crewForm.addMember(promoter.username, 'promoter');
+  await crewForm.addMember(usher.username, 'usher');
+  await crewForm.addMember(editor.username, 'editor');
+  await crewForm.addMember(hguser.username, 'usher', false);
+  await crewForm.deleteMember(promoter.username);
 
 });
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
index bf451c800..89cad7a2c 100644
--- a/tests/playwright/tests/open-cfp.spec.js
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -2,19 +2,16 @@ import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
 const project = require('../fixtures/project.json');
-const { promoter, editor, user } = require('../fixtures/user.json');
+const { promoter, user } = require('../fixtures/user.json');
 const cfp = require('../fixtures/cfp.json');
 const labels = require('../fixtures/labels.json');
 const dayjs = require('dayjs');
 
-test('Open call for proposal of the project and add schedule', async ({ page }) => {
-  let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject(promoter, [{'username': editor.username, 'role': 'editor'}]);
+test('Add schedule to a  project (open cfp, add labels, sort labels, add session, publish schedule)', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${promoter.owns_profile}/${randomProjectName}`, editor.username, editor.password);
-  await projectPage.addVenue();
+  let projectPage = new ProjectPage(page);
+  await loginPage.login(`/${promoter.owns_profile}/${promoter.project}`, promoter.username, promoter.password);
   await page.getByTestId('submissions').click();
   await page.getByTestId('add-cfp').click();
   await page.locator('#field-instructions .cm-editor .cm-line').fill(cfp.instructions);
@@ -81,7 +78,7 @@ test('Open call for proposal of the project and add schedule', async ({ page })
   await page.locator('#title').fill(project.session_title);
   await page.locator('select#venue_room_id').click();
   await page.getByText(`${project.venues[0].title} – ${project.venues[0].room}`).locator('visible=true').click();
-  await page.locator('#speaker').fill(editor.username);
+  await page.locator('#speaker').fill(promoter.username);
   await page.locator('#is_break').click();
   await Promise.all([
     page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
@@ -138,7 +135,7 @@ test('Open call for proposal of the project and add schedule', async ({ page })
   ]);
   await page.locator('#session-modal').isVisible();
   await expect(page.getByTestId('title')).toContainText(project.proposal_title);
-  await expect(page.getByTestId('speaker')).toContainText(editor.fullname);
+  await expect(page.getByTestId('speaker')).toContainText(promoter.fullname);
   await page.getByTestId('time').isVisible();
   await expect(page.getByTestId('room')).toContainText(`${project.venues[1].room}, ${project.venues[1].title}`);
   await page.getByTestId('session-video').locator('iframe').isVisible();
diff --git a/tests/playwright/tests/post-update.spec.js b/tests/playwright/tests/post-update.spec.js
new file mode 100644
index 000000000..7f278efa2
--- /dev/null
+++ b/tests/playwright/tests/post-update.spec.js
@@ -0,0 +1,43 @@
+import { test, expect } from '@playwright/test';
+
+const { LoginPage } = require('../page/login');
+const { usher, admin } = require('../fixtures/user.json');
+const project = require('../fixtures/project.json');
+
+test('Add update to project', async ({ page }) => {
+  let loginPage = new LoginPage(page);
+  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, usher.username, usher.password);
+
+  await page.getByTestId('updates').click();
+  await page.getByTestId('add-update').click();
+  await page.locator('#title').fill(project.update_title);
+  await page.locator('#field-body .cm-editor .cm-line').fill(project.update_body);
+  await page.locator('#is_pinned').click();
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('add-update').click();
+  await page.locator('#title').fill(project.restricted_update_title);
+  await page.locator('#field-body .cm-editor .cm-line').fill(project.restricted_update_body);
+  await page.locator('#is_restricted').click();
+  await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('form-submit-btn').click();
+  await loginPage.logout();
+
+  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, user.username, user.password);
+  await expect(page.locator('.pinned__update__heading')).toContainText(project.update_title);
+  await page.getByTestId('updates').click();
+  await expect(page.locator('.update').locator('nth=1').locator('h3')).toContainText(project.restricted_update_title);
+  await page.getByTestId('my-updates').locator('visible=true').click();
+  await Promise.all([
+    page.waitForRequest(request => request.url().includes("/updates"), {timeout: 60000}),
+  ]);
+  await expect(page.locator('.update').getByTestId('notification-box').locator('h2')).contains(project.update_title);
+  await loginPage.logout();
+
+  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, newuser.username, newuser.password);
+  await page.getByTestId('updates').click();
+  await expect(page.locator('.pinned__update__heading')).toContainText(project.update_title);
+  await page.getByTestId('updates').click();
+  await expect(page.locator('.update').locator('nth=1')).toBeHidden();
+
+});
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
index 832d2b0da..5817bb75f 100644
--- a/tests/playwright/tests/rsvp-checkin.spec.js
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -1,31 +1,19 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { ProjectPage } = require('../page/create-project');
-const profile = require('../fixtures/profile.json');
-const project = require('../fixtures/project.json');
-const { admin, promoter, usher, user } = require('../fixtures/user.json');
+const { admin, user } = require('../fixtures/user.json');
 const events = require('../fixtures/ticket_events.json');
 const ticket_participants = require('../fixtures/ticket_participants.json');
 const dayjs = require('dayjs');
 
 test('Open rsvp, for all and members only', async ({ page }) => {
-  let projectPage = new ProjectPage(page);
-  let randomProjectName = await projectPage.addProject(admin, [{'username': promoter.username, 'role': 'promoter'}, {'username': usher.username, 'role': 'usher'}]);
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, promoter.username, promoter.password);
+  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, admin.username, admin.password);
 
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('setup-ticket-events').click();
 
-  for (let event of events) {
-    await page.getByTestId('new-ticket-event').click();
-    await page.locator('#title').fill(event.title);
-    await page.locator('#badge_template').fill(event.badge_template);
-    await page.getByTestId('form-submit-btn').click();
-  }
-
   await page.getByTestId('new-ticket-client').click();
   await page.locator('#name').fill(process.env.BOXOFFICE_CLIENT_ID);
   await page.locator('#clientid').fill(process.env.BOXOFFICE_CLIENT_ID);
@@ -35,7 +23,14 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('form-submit-btn').click();
 
   await page.getByTestId('sync-tickets').click();
-  await page.waitForTimeout(12000);
+
+  for (let event of events) {
+    await page.getByTestId('new-ticket-event').click();
+    await page.locator('#title').fill(event.title);
+    await page.locator('#badge_template').fill(event.badge_template);
+    await page.getByTestId('form-submit-btn').click();
+  }
+
   await page.getByTestId('sync-tickets').click();
 
   for (let event of events) {
@@ -44,8 +39,6 @@ test('Open rsvp, for all and members only', async ({ page }) => {
     await page.getByTestId('form-submit-btn').click();
   }
 
-  await page.getByTestId('sync-tickets').click();
-  await page.waitForTimeout(12000);
   await page.getByTestId('sync-tickets').click();
 
   for (let participant of ticket_participants) {
@@ -70,16 +63,6 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('back-to-setup').click();
   await page.getByTestId('project-page').click();
 
-  await page.getByTestId('project-menu').locator('visible=true').click();
-  await page.getByTestId('edit').locator('visible=true').click();
-  let eventStartDate = dayjs().add(1, 'days').format('YYYY-MM-DDTHH:MM');
-  let eventEndDate = dayjs().add(10, 'days').format('YYYY-MM-DDTHH:MM');
-  await page.locator('#start_at').fill(eventStartDate);
-  await page.locator('#end_at').fill(eventEndDate);
-  await page.getByTestId('form-submit-btn').click();
-  await page.getByTestId('project-menu').locator('visible=true').click();
-  await page.getByTestId('settings').locator('visible=true').click();
-  await page.getByTestId('publish').click();
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('add-tickets').click();
@@ -89,7 +72,7 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('rsvp-only-for-members').isVisible();
   await loginPage.logout();
 
-  await loginPage.login(`/${admin.owns_profile}/${randomProjectName}`, user.username, user.password);
+  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, user.username, user.password);
   await page.getByTestId('project-member').isVisible();
   await page.getByTestId('member-rsvp').click();
   await page.locator('#rsvp-form').waitFor(60000);
diff --git a/tests/test_fixture_initdb.py b/tests/test_fixture_initdb.py
index 51270c13d..92f7c1fb2 100644
--- a/tests/test_fixture_initdb.py
+++ b/tests/test_fixture_initdb.py
@@ -13,7 +13,13 @@
     SiteMembership,
     User,
     db,
+    Project,
+    Venue,
+    VenueRoom
 )
+from coaster.utils import utcnow
+from datetime import datetime, timedelta
+from pytz import utc
 
 
 def init_models():
@@ -21,113 +27,165 @@ def init_models():
         db.drop_all()
         db.create_all()
 
-        user_admin = User(username='admin_user', fullname='admin-user')
-        user_admin.password = 'admin-user129_Ftz'  # nosec
-        user_admin_email = AccountEmail(
-            email='adminuser@example.com', account=user_admin
-        )
-        db.session.add(user_admin.add_phone('+918123456789', primary=True))
-
-        user = User(username='member_user', fullname='member-user')
-        user.password = 'member-user341_Wer'  # nosec
-        user_email = AccountEmail(email='memberuser@example.com', account=user)
-        db.session.add(user.add_phone('+12015550123', primary=True))
-
-        profile_owner = User(
+        owner = User(
             username='profile_cypress',
             fullname='profile-cypress',
         )
-        profile_owner.password = 'profile-cypress123_St'  # nosec
-        profile_owner_email = AccountEmail(
-            email='profileowner@example.com', account=profile_owner
-        )
-        db.session.add(profile_owner.add_phone('+15062345678', primary=True))
-
-        promoter = User(username='promoter_user', fullname='promoter-user')
-        promoter.password = 'promoter-user34_qQE'  # nosec
-        promoter_email = AccountEmail(email='promoter@example.com', account=promoter)
-
-        usher = User(username='usher_cypress', fullname='usher-cypress')
-        usher.password = 'usher-cypress566_YUt'  # nosec
-        usher_email = AccountEmail(email='usher@example.com', account=usher)
-
-        editor = User(username='editor_cypress', fullname='editor-cypress')
-        editor.password = 'editor-cypress9_GH'  # nosec
-        editor_email = AccountEmail(email='editor@example.com', account=editor)
-        db.session.add(editor.add_phone('+447400123456', primary=True))
-
-        user2 = User(username='hg_user', fullname='hg-user')
-        user2.password = 'hg-user5_HE'  # nosec
-
-        user3 = User(username='new_user', fullname='new-user')
-        user3.password = 'new-user11_EveryOne'  # nosec
-
-        sm = SiteMembership(
-            member=profile_owner, is_site_editor=True, granted_by=profile_owner
-        )
-
-        org = Organization(
-            name='testprofile', title='testprofile', owner=profile_owner
+        owner.password = 'profile-cypress123_St'  # nosec
+        owner_email = AccountEmail(
+            email='profileowner@example.com', account=owner
         )
-        org.is_verified = True
-        org.make_profile_public()
+        db.session.add(owner.add_phone('+15062345678', primary=True))
 
         org1 = Organization(
-            name='fifthelephant', title='Fifth elephant', owner=profile_owner
+            name='fifthelephant', title='Fifth elephant', owner=owner
         )
         org1.is_verified = True
         org1.make_profile_public()
 
+        project1 = Project(
+            name='summer-edition', title='Summer Edition', created_by=owner,
+            account=org1, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+        )
+
+        admin = User(username='admin_user', fullname='admin-user')
+        admin.password = 'admin-user129_Ftz'  # nosec
+        admin_email = AccountEmail(
+            email='adminuser@example.com', account=admin
+        )
+        db.session.add(admin.add_phone('+918123456789', primary=True))
         org2 = Organization(
-            name='rootconf', title='Rootconf', owner=user_admin
+            name='rootconf', title='Rootconf', owner=admin
         )
         org2.is_verified = True
         org2.make_profile_public()
 
+        project2 = Project(
+            name='autumn-edition', title='Autumn Edition', created_by=admin,
+            account=org2, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+        )
+
+        editor = User(username='editor_cypress', fullname='editor-cypress')
+        editor.password = 'editor-cypress9_GH'  # nosec
+        editor_email = AccountEmail(email='editor@example.com', account=editor)
+        db.session.add(editor.add_phone('+447400123456', primary=True))
+
         org3 = Organization(
             name='jsfoo', title='JSFoo', owner=editor
         )
         org3.is_verified = True
         org3.make_profile_public()
 
+        project3 = Project(
+            name='monsoon-edition', title='Monsoon Edition', created_by=editor,
+            account=org3, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+        )
+
+        promoter = User(username='promoter_user', fullname='promoter-user')
+        promoter.password = 'promoter-user34_qQE'  # nosec
+        promoter_email = AccountEmail(email='promoter@example.com', account=promoter)
+        db.session.add(promoter.add_phone('+919845012345', primary=True))
+
         org4 = Organization(
             name='metarefresh', title='Metarefresh', owner=promoter
         )
         org4.is_verified = True
         org4.make_profile_public()
 
+        project4 = Project(
+            name='winter-edition', title='Winter Edition', created_by=promoter,
+            account=org4, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+        )
+
+        usher = User(username='usher_cypress', fullname='usher-cypress')
+        usher.password = 'usher-cypress566_YUt'  # nosec
+        usher_email = AccountEmail(email='usher@example.com', account=usher)
+        db.session.add(usher.add_phone('+918123456788', primary=True))
+
         org5 = Organization(
             name='kilter', title='Kilter', owner=usher
         )
         org5.is_verified = True
         org5.make_profile_public()
 
+        project5 = Project(
+            name='spring-edition', title='Spring Edition', created_by=usher,
+            account=org5, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+        )
+
+        user = User(username='member_user', fullname='member-user')
+        user.password = 'member-user341_Wer'  # nosec
+        user_email = AccountEmail(email='memberuser@example.com', account=user)
+        db.session.add(user.add_phone('+12015550123', primary=True))
+
+        hguser = User(username='hg_user', fullname='hg-user')
+        hguser.password = 'hg-user5_HE'  # nosec
+
+        newuser = User(username='new_user', fullname='new-user')
+        newuser.password = 'new-user11_EveryOne'  # nosec
+
+        sm = SiteMembership(
+            member=owner, is_site_editor=True, granted_by=owner
+        )
+
         db.session.add_all(
             [
-                user_admin,
-                user_admin_email,
-                user,
-                user_email,
-                profile_owner,
-                profile_owner_email,
+                owner,
+                owner_email,
+                admin,
+                admin_email,
+                editor,
+                editor_email,
                 promoter,
                 promoter_email,
                 usher,
                 usher_email,
-                editor,
-                editor_email,
-                user2,
-                user3,
+                user,
+                user_email,
+                hguser,
+                newuser,
                 sm,
-                org,
                 org1,
                 org2,
                 org3,
                 org4,
-                org5
+                org5,
+                project1,
+                project2,
+                project3,
+                project4,
+                project5
             ]
         )
         db.session.commit()
+        project1.publish()
+        project2.publish()
+        project3.publish()
+        project4.publish()
+        venue1 = Venue(name='hasgeek', title='Hasgeek House', description='Hasgeek House second floor', project=project4, seq=1)
+        venue2 = Venue(name='online', title='Online', description='Zoom', project=project4, seq=2)
+        room1 = VenueRoom(name='second-floor-room', title='Second floor room', description='Hasgeek House second floor', bgcolor='F7B89E', venue=venue1, seq=1)
+        room2 = VenueRoom(name='zoom', title='Zoom', description='Zoom', bgcolor='6075B1', venue=venue2, seq=2)
+        project5.publish()
+        project5.cfp_start_at = datetime.now(utc)
+        project5.cfp_end_at = datetime.now(utc) + timedelta(days=10)
+        project5.instructions = 'If you are interested in speaking at The Fifth Elephant.Submit a description of your talk, explaining the problem that your talk covers, and one concrete takeaway for audience. Talks have to give at least one practical insight to the audience'
+        project5.open_cfp()
+        db.session.add_all(
+            [
+                venue1,
+                venue2,
+                room1,
+                room2
+            ]
+        )
+        db.session.commit()
+
 
 
 if __name__ == '__main__':

From 7ec5747f509e28d69ce1de0bdc9afc6b8dd7b55c Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 9 Jan 2024 14:07:23 +0530
Subject: [PATCH 08/14] Fix tests

---
 .gitignore                                    |  1 +
 funnel/templates/js/comments.js.jinja2        |  4 ++--
 funnel/templates/js/update.js.jinja2          | 10 ++++----
 playwright.config.js                          |  2 +-
 runfrontendtests.sh                           |  4 ++--
 runplaywrighttests.sh                         | 23 +++++++++++++++++++
 .../tests/add-sponsor-project.spec.js         |  4 ++--
 tests/playwright/tests/add-submission.spec.js | 15 ++++++------
 .../tests/add-venue-project.spec.js           |  4 ++--
 tests/playwright/tests/post-update.spec.js    | 15 ++++--------
 tests/test_fixture_initdb.py                  |  6 +++++
 11 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 runplaywrighttests.sh

diff --git a/.gitignore b/.gitignore
index 2d48b9b7a..47ac37501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ tests/screenshots
 tests/unit/utils/markdown/data/output.html
 coverage/
 tests/playwright/test-results
+playwright-report
 
 # Instance files that should not be checked-in
 instance/development.py
diff --git a/funnel/templates/js/comments.js.jinja2 b/funnel/templates/js/comments.js.jinja2
index 671e042d9..355764d56 100644
--- a/funnel/templates/js/comments.js.jinja2
+++ b/funnel/templates/js/comments.js.jinja2
@@ -59,7 +59,7 @@
               <useravatar :user='comment.posted_by' :addprofilelink=true></useravatar>
               <div class="user__box__header comment__header__details__user">
                 <h3 class="mui--text-body2 user__box__fullname zero-bottom-margin">
-                  <span class="commenter">{{ comment.posted_by.fullname }}</span>
+                  <span class="commenter" data-testid="commenter">{{ comment.posted_by.fullname }}</span>
                   <span class="commenter mui--text-light mui--text-caption" v-if="comment.state && comment.state.DELETED">[deleted]</span>
                   <span class="commenter mui--text-light mui--text-caption" v-if="comment.state && comment.state.SPAM">[removed]</span>
                 </h3>
@@ -71,7 +71,7 @@
         <transition name="slide">
           <div class="comment__body" v-if="!hide">
             <div class="comment__body__inner">
-              <div v-if="!comment.state" v-html="comment.message.html" class="markdown"></div>
+              <div v-if="!comment.state" v-html="comment.message.html" class="markdown" data-testid="comment-content"></div>
               <a class="mui--text-caption mui--text-light comment--permalink hg-link-btn" :href="'#c-' + comment.uuid_b58">Posted {{ created_at_age }}</a>
               <span class="mui--text-caption mui--text-light" v-if="comment.edited_at">({{ gettext('edited %s', edited_at_age) }})</span>
               <div class="js-comment-form">
diff --git a/funnel/templates/js/update.js.jinja2 b/funnel/templates/js/update.js.jinja2
index 4973f7eb2..4c29ffc2c 100644
--- a/funnel/templates/js/update.js.jinja2
+++ b/funnel/templates/js/update.js.jinja2
@@ -4,7 +4,7 @@
       <div v-if="isEditor">
         <h2 class="mui--text-left" v-if="draft">{{ gettext('Draft') }}</h2>
         <ul v-if="draft" class="draft-updates">
-          <li v-for="update in draft"><a :href="update.urls.view">{{ update.title }}</a></li>
+          <li v-for="update in draft" data-testid="project-update"><a :href="update.urls.view">{{ update.title }}</a></li>
         </ul>
       </div>
       <ul class="mui-list--unstyled zero-bottom-margin" v-if="updates.length">
@@ -36,15 +36,15 @@
               </div>
               <a href="#" onclick="return false;" class="mui--text-subhead nounderline mui--text-light hg-link-btn mui--hide" :data-title="update.title" :data-url="update.urls.view + '?utm_source=webshare'"><faicon :icon="'share-alt'" :icon_size="'subhead'" :baseline=true></faicon></a>
               <div class="mui-dropdown mui-dropdown--update" v-if="iseditor">
-                <a href="#" onclick="return false;" class="mui--text-light" data-mui-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" :aria-label="gettext('Menu')"><faicon :icon="'ellipsis-v'" :icon_size="'subhead'" css_class="fa-icon--left-margin"></faicon></a>
+                <a href="#" onclick="return false;" class="mui--text-light" data-mui-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" :aria-label="gettext('Menu')" data-testid="update-menu"><faicon :icon="'ellipsis-v'" :icon_size="'subhead'" css_class="fa-icon--left-margin"></faicon></a>
                 <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link mui-dropdown__menu--small" data-testid="share-dropdown">
-                  <li><a class="mui--text-body2 nounderline" v-if="update.urls.edit" :href="update.urls.edit"><faicon :icon="'edit'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Edit</a></li>
-                  <li><a class="mui--text-body2 nounderline" v-if="update.urls.delete" :href="update.urls.delete"><faicon :icon="'trash-alt'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Delete</a></li>
+                  <li><a class="mui--text-body2 nounderline" v-if="update.urls.edit" :href="update.urls.edit"  data-testid="edit-update"><faicon :icon="'edit'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Edit</a></li>
+                  <li><a class="mui--text-body2 nounderline" v-if="update.urls.delete" :href="update.urls.delete" data-testid="delete-update"><faicon :icon="'trash-alt'" :icon_size="'caption'" :baseline=true :css_class="'mui--text-light fa-icon--right-margin'"></faicon>Delete</a></li>
                 </ul>
               </div>
             </div>
           </div>
-          <h3 class="mui--text-heading text-bold margin-bottom"><a class="mui--text-dark nounderline" :href="update.urls.view">{{ update.title }}</a></h3>
+          <h3 class="mui--text-heading text-bold margin-bottom"><a class="mui--text-dark nounderline" :href="update.urls.view" data-testid="update-heading">{{ update.title }}</a></h3>
           <div class="user__box mui--clearfix update__header">
             <useravatar :user='update.created_by' :addprofilelink=true></useravatar>
             <div class="user__box__header">
diff --git a/playwright.config.js b/playwright.config.js
index 922be7a57..b94595c91 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -14,7 +14,7 @@ module.exports = defineConfig({
   globalSetup: './tests/playwright/globalSetup.js',
   testDir: './tests/playwright/tests',
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
diff --git a/runfrontendtests.sh b/runfrontendtests.sh
index 158adaad7..55ddc72ca 100755
--- a/runfrontendtests.sh
+++ b/runfrontendtests.sh
@@ -11,11 +11,11 @@ set +o allexport
 # Break on errors instead of continuing
 set -o errexit
 
-python -m tests.cypress.cypress_initdb_test
+python -m tests.test_fixture_initdb
 flask run -p 3002 --no-reload --debugger 2>&1 1>/tmp/funnel-server.log & echo $! > /tmp/funnel-server.pid
 function killserver() {
     kill $(cat /tmp/funnel-server.pid)
-    python -m tests.cypress.cypress_dropdb_test
+    python -m tests.test_fixture_dropdb
     rm /tmp/funnel-server.pid
 }
 trap killserver INT
diff --git a/runplaywrighttests.sh b/runplaywrighttests.sh
new file mode 100644
index 000000000..b964410d3
--- /dev/null
+++ b/runplaywrighttests.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Load config into environment variables
+set -o allexport
+source .flaskenv
+source .env
+source .testenv
+source .env.testing
+set +o allexport
+
+# Break on errors instead of continuing
+set -o errexit
+
+python -m tests.test_fixture_initdb
+flask run -p 3002 --no-reload --debugger 2>&1 1>/tmp/funnel-server.log & echo $! > /tmp/funnel-server.pid
+function killserver() {
+    kill $(cat /tmp/funnel-server.pid)
+    python -m tests.test_fixture_dropdb
+    rm /tmp/funnel-server.pid
+}
+trap killserver INT
+npx playwright test
+killserver
diff --git a/tests/playwright/tests/add-sponsor-project.spec.js b/tests/playwright/tests/add-sponsor-project.spec.js
index 4adfa383b..567912d73 100644
--- a/tests/playwright/tests/add-sponsor-project.spec.js
+++ b/tests/playwright/tests/add-sponsor-project.spec.js
@@ -1,11 +1,11 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { editor, admin } = require('../fixtures/user.json');
+const { owner, editor, admin } = require('../fixtures/user.json');
 
 test('Add sponsor to project', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, editor.username, editor.password);
+  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, owner.username, owner.password);
 
   await page.getByTestId('site-editor-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index 32b8a2656..e68019519 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test';
 const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
 const project = require('../fixtures/project.json');
-const { usher, owner } = require('../fixtures/user.json');
+const { usher, owner, admin } = require('../fixtures/user.json');
 const proposal = require('../fixtures/proposal.json');
 let randomProjectName;
 
@@ -45,7 +45,7 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
   await page.locator('.select2-selection__arrow').waitFor();
   await page.locator('.select2-selection__arrow').click();
   await page.locator('.select2-search__field').waitFor();
-  await page.locator('.select2-search__field').fill(usher.username);
+  await page.locator('.select2-search__field').fill(admin.username);
   await page.locator('.select2-results__option').waitFor();
   await page.locator('.select2-results__option').click();
   await page.locator('#label').fill('Editor');
@@ -53,11 +53,12 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
     page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
     page.locator('.modal').locator('button[data-testid="form-submit-btn"]').locator('visible=true').click()
   ]);
-  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 10000});
+  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 120000});
+  await page.locator('a.modal__close').locator('visible=true').waitFor(60000);
   await page.locator('a.modal__close').locator('visible=true').click();
-  await page.getByTestId('form-submit-btn').waitFor(60000);
+  await page.getByTestId('form-submit-btn').waitFor(120000);
   await page.getByTestId('form-submit-btn').click();
-  await page.locator('.user__box__userid user__box__fullname', { hasText: usher.username }).isVisible();
+  await page.locator('.user__box__userid user__box__fullname', { hasText: admin.username }).isVisible();
   await page.locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' }).isVisible();
 
   await page.getByTestId('proposal-menu').locator('visible=true').click();
@@ -71,7 +72,7 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
     page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
     page.getByTestId('new-form').getByTestId('submit-comment').click()
   ]);
-  await expect(page.locator('.comment__body')).toContainText(proposal.proposer_note);
-  await expect(page.locator('.comment__header')).toContainText(owner.username);
+  await expect(page.getByTestId('comment-content')).toContainText(proposal.proposer_note);
+  await expect(page.getByTestId('commenter')).toContainText(owner.fullname);
 
 });
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index 2d53c3006..30af88730 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -2,12 +2,12 @@ import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
 const venues = require('../fixtures/venues.json');
-const { owner } = require('../fixtures/user.json');
+const { editor } = require('../fixtures/user.json');
 
 test('Add venue to project', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
-  await loginPage.login(`/${owner.owns_profile}/${owner.project}`, owner.username, owner.password);
+  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, editor.username, editor.password);
 
   await page.getByTestId('project-menu').locator("visible=true").click();
   await page.getByTestId('settings').locator("visible=true").waitFor();
diff --git a/tests/playwright/tests/post-update.spec.js b/tests/playwright/tests/post-update.spec.js
index 7f278efa2..710114865 100644
--- a/tests/playwright/tests/post-update.spec.js
+++ b/tests/playwright/tests/post-update.spec.js
@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 
 const { LoginPage } = require('../page/login');
-const { usher, admin } = require('../fixtures/user.json');
+const { usher, user, newuser } = require('../fixtures/user.json');
 const project = require('../fixtures/project.json');
 
 test('Add update to project', async ({ page }) => {
@@ -24,20 +24,15 @@ test('Add update to project', async ({ page }) => {
   await loginPage.logout();
 
   await loginPage.login(`/${usher.owns_profile}/${usher.project}`, user.username, user.password);
-  await expect(page.locator('.pinned__update__heading')).toContainText(project.update_title);
+  await expect(page.locator('.pinned__update__heading').locator('visible=true')).toContainText(project.update_title);
   await page.getByTestId('updates').click();
-  await expect(page.locator('.update').locator('nth=1').locator('h3')).toContainText(project.restricted_update_title);
-  await page.getByTestId('my-updates').locator('visible=true').click();
-  await Promise.all([
-    page.waitForRequest(request => request.url().includes("/updates"), {timeout: 60000}),
-  ]);
-  await expect(page.locator('.update').getByTestId('notification-box').locator('h2')).contains(project.update_title);
+  await expect(page.locator('.update').locator('nth=1').getByTestId('update-heading')).toContainText(project.restricted_update_title);
   await loginPage.logout();
 
   await loginPage.login(`/${usher.owns_profile}/${usher.project}`, newuser.username, newuser.password);
   await page.getByTestId('updates').click();
-  await expect(page.locator('.pinned__update__heading')).toContainText(project.update_title);
+  await expect(page.locator('.pinned__update__heading').locator('visible=true')).toContainText(project.update_title);
   await page.getByTestId('updates').click();
   await expect(page.locator('.update').locator('nth=1')).toBeHidden();
-
+  await loginPage.logout();
 });
diff --git a/tests/test_fixture_initdb.py b/tests/test_fixture_initdb.py
index 92f7c1fb2..542234d4f 100644
--- a/tests/test_fixture_initdb.py
+++ b/tests/test_fixture_initdb.py
@@ -37,6 +37,11 @@ def init_models():
         )
         db.session.add(owner.add_phone('+15062345678', primary=True))
 
+        org = Organization(
+            name='testcypressproject', title='testcypressproject', owner=owner
+        )
+        org.is_verified = True
+        org.make_profile_public()
         org1 = Organization(
             name='fifthelephant', title='Fifth elephant', owner=owner
         )
@@ -150,6 +155,7 @@ def init_models():
                 hguser,
                 newuser,
                 sm,
+                org,
                 org1,
                 org2,
                 org3,

From 68bbf8973d47b224b71f14957cb026a5b4310f1e Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 11 Jan 2024 10:57:04 +0530
Subject: [PATCH 09/14] Merge branch 'main' into playwright-e2e

---
 .dockerignore                                 |    2 +-
 .github/workflows/mypy-ratchet.yml            |   30 -
 .gitignore                                    |    3 +
 .pre-commit-config.yaml                       |   86 +-
 .prettierrc.js                                |    1 +
 .testenv                                      |    2 +-
 Makefile                                      |   44 +
 docker/entrypoints/ci-test.sh                 |    2 +-
 docker/entrypoints/dev.sh                     |    2 +-
 funnel/__init__.py                            |   41 +-
 funnel/assets/js/schedule_view.js             |    5 +-
 funnel/assets/sass/components/_video.scss     |   44 +
 funnel/assets/sass/pages/schedule.scss        |    9 +-
 funnel/auth.py                                |   41 +
 funnel/cli/geodata.py                         |   10 +-
 funnel/cli/periodic/notification.py           |    6 +-
 funnel/cli/refresh/markdown.py                |   13 +-
 funnel/devtest.py                             |   31 +-
 funnel/extapi/__init__.py                     |    6 +-
 funnel/extapi/boxoffice.py                    |    9 +-
 funnel/extapi/explara.py                      |   38 +-
 funnel/extapi/typing.py                       |   19 +
 funnel/forms/__init__.py                      |  266 +-
 funnel/forms/account.py                       |   57 +-
 funnel/forms/auth_client.py                   |    6 +-
 funnel/forms/helpers.py                       |   18 +-
 funnel/forms/login.py                         |   17 +-
 funnel/forms/membership.py                    |    4 +-
 funnel/forms/notification.py                  |   28 +-
 funnel/forms/organization.py                  |    4 +-
 funnel/forms/profile.py                       |    8 +-
 funnel/forms/project.py                       |   18 +-
 funnel/forms/proposal.py                      |   10 +-
 funnel/forms/sync_ticket.py                   |   13 +-
 funnel/forms/venue.py                         |    4 +-
 funnel/loginproviders/__init__.py             |   31 +-
 funnel/loginproviders/github.py               |    3 +-
 funnel/loginproviders/google.py               |    5 +-
 .../{init_app.py => helpers.py}               |    4 +-
 funnel/loginproviders/linkedin.py             |    3 +-
 funnel/loginproviders/twitter.py              |    7 +-
 funnel/loginproviders/zoom.py                 |    3 +-
 funnel/models/__init__.py                     |  334 ++-
 funnel/models/__init__.pyi                    |  476 ++++
 funnel/models/account.py                      | 1096 +++++++--
 funnel/models/account_membership.py           |  156 +-
 funnel/models/auth_client.py                  |  288 +--
 funnel/models/base.py                         |  102 +
 funnel/models/comment.py                      |  248 +-
 funnel/models/commentset_membership.py        |  165 +-
 funnel/models/contact_exchange.py             |   81 +-
 funnel/models/draft.py                        |    7 +-
 funnel/models/email_address.py                |  138 +-
 funnel/models/geoname.py                      |  242 +-
 funnel/models/helpers.py                      |   92 +-
 funnel/models/label.py                        |  100 +-
 funnel/models/login_session.py                |   76 +-
 funnel/models/mailer.py                       |  165 +-
 funnel/models/membership_mixin.py             |  383 +--
 funnel/models/moderation.py                   |   71 +-
 funnel/models/notification.py                 |  281 +--
 funnel/models/notification_types.py           |    4 +-
 funnel/models/phone_number.py                 |  126 +-
 funnel/models/project.py                      | 1039 ++++++--
 funnel/models/project_membership.py           |  179 +-
 funnel/models/proposal.py                     |  285 +--
 funnel/models/proposal_membership.py          |  141 +-
 funnel/models/reorder_mixin.py                |   62 +-
 funnel/models/rsvp.py                         |  154 +-
 funnel/models/saved.py                        |   82 +-
 funnel/models/session.py                      |  505 +---
 funnel/models/shortlink.py                    |   38 +-
 funnel/models/site_membership.py              |   86 +-
 funnel/models/sponsor_membership.py           |  240 +-
 funnel/models/sync_ticket.py                  |  273 +--
 funnel/models/types.py                        |    5 +-
 funnel/models/typing.py                       |  134 +-
 funnel/models/update.py                       |  115 +-
 funnel/models/user_signals.py                 |   52 +-
 funnel/models/utils.py                        |   33 +-
 funnel/models/venue.py                        |   82 +-
 funnel/models/video_mixin.py                  |    8 +-
 funnel/proxies/__init__.py                    |    4 +-
 funnel/proxies/request.py                     |   13 +-
 funnel/registry.py                            |   14 +-
 funnel/templates/account_menu.html.jinja2     |   36 +-
 funnel/templates/index.html.jinja2            |    6 +-
 funnel/templates/macros.html.jinja2           |    5 +-
 funnel/templates/project_layout.html.jinja2   |   48 +-
 funnel/templates/rsvp_modal.html.jinja2       |    2 +
 funnel/transports/__init__.py                 |    3 +-
 funnel/transports/base.py                     |    2 +-
 funnel/transports/email/__init__.py           |   27 +-
 funnel/transports/email/aws_ses/__init__.py   |   35 +-
 funnel/transports/email/send.py               |   11 +-
 funnel/transports/sms/__init__.py             |   41 +-
 funnel/transports/sms/template.py             |    5 +-
 funnel/utils/__init__.py                      |   58 +-
 funnel/utils/markdown/__init__.py             |   32 +-
 funnel/utils/markdown/base.py                 |    4 +-
 funnel/utils/markdown/escape.py               |   37 +-
 .../utils/markdown/mdit_plugins/__init__.py   |   63 +-
 .../markdown/mdit_plugins/block_code_ext.py   |    8 +-
 funnel/utils/markdown/mdit_plugins/del_tag.py |    3 +-
 funnel/utils/markdown/mdit_plugins/embeds.py  |    5 +-
 .../markdown/mdit_plugins/footnote_ext.py     |    8 +-
 .../mdit_plugins/heading_anchors_fix.py       |   50 +-
 funnel/utils/markdown/mdit_plugins/ins_tag.py |    3 +-
 .../utils/markdown/mdit_plugins/mark_tag.py   |    3 +-
 funnel/utils/markdown/mdit_plugins/sub_tag.py |    3 +-
 funnel/utils/markdown/mdit_plugins/sup_tag.py |    3 +-
 funnel/utils/markdown/mdit_plugins/toc.py     |    7 +-
 funnel/utils/misc.py                          |    2 +-
 funnel/views/account.py                       |   35 +-
 funnel/views/account_reset.py                 |    2 +-
 funnel/views/api/account.py                   |    8 +-
 funnel/views/api/geoname.py                   |   24 +-
 funnel/views/api/oauth.py                     |   79 +-
 funnel/views/api/resource.py                  |   10 +-
 funnel/views/api/shortlink.py                 |    2 +-
 funnel/views/api/sms_events.py                |   22 +-
 funnel/views/api/support.py                   |    2 +-
 funnel/views/auth_client.py                   |   46 +-
 funnel/views/auth_notify.py                   |   12 +-
 funnel/views/comment.py                       |   63 +-
 funnel/views/contact.py                       |   25 +-
 funnel/views/decorators.py                    |   25 +-
 funnel/views/errors.py                        |    5 +-
 funnel/views/helpers.py                       |  138 +-
 funnel/views/index.py                         |   64 +-
 funnel/views/jobs.py                          |   33 +-
 funnel/views/label.py                         |   23 +-
 funnel/views/login.py                         |   28 +-
 funnel/views/login_session.py                 |   40 +-
 funnel/views/membership.py                    |   82 +-
 funnel/views/mixins.py                        |  172 +-
 funnel/views/notification.py                  |  101 +-
 funnel/views/notification_feed.py             |   11 +-
 funnel/views/notification_preferences.py      |   19 +-
 .../notifications/account_notification.py     |    8 +-
 .../notifications/comment_notification.py     |   51 +-
 funnel/views/notifications/mixins.py          |    6 +-
 .../organization_membership_notification.py   |   27 +-
 .../project_crew_notification.py              |   43 +-
 .../notifications/proposal_notification.py    |   23 +-
 .../views/notifications/rsvp_notification.py  |    6 +-
 funnel/views/organization.py                  |   27 +-
 funnel/views/otp.py                           |   11 +-
 funnel/views/profile.py                       |   35 +-
 funnel/views/project.py                       |   74 +-
 funnel/views/project_sponsor.py               |   38 +-
 funnel/views/proposal.py                      |  110 +-
 funnel/views/schedule.py                      |   64 +-
 funnel/views/search.py                        |  185 +-
 funnel/views/session.py                       |   63 +-
 funnel/views/siteadmin.py                     |   23 +-
 funnel/views/sitemap.py                       |    5 +-
 funnel/views/ticket_event.py                  |   50 +-
 funnel/views/ticket_participant.py            |   79 +-
 funnel/views/update.py                        |   33 +-
 funnel/views/venue.py                         |   61 +-
 funnel/views/video.py                         |    2 +-
 gunicorn.conf.py                              |    2 +-
 migrations/env.py                             |   12 +-
 ...8b_complement_email_md5sum_with_blake2b.py |    6 +-
 ...46_add_version_numbers_for_timestamped_.py |   12 +-
 .../1c9cbf3a1e5e_add_commenset_memberships.py |   30 +-
 .../1d5e1a11661a_add_json_field_rsvp.py       |    4 +-
 ..._replace_allow_columns_with_has_columns.py |    4 +-
 ...2ca9e3e_add_proposal_sponsor_membership.py |   12 +-
 ...c10efdbce_deprecate_session_speaker_bio.py |    2 +-
 .../294362dc7e49_add_organization_state.py    |   12 +-
 ...7_uuid_columns_for_proposal_and_session.py |    4 +-
 ...321b11b6a413_add_participant_uuid_field.py |    2 +-
 ...b_account_merges_user_organization_and_.py |   16 +-
 ...03545045_sponsor_label_check_constraint.py |    2 +-
 ...9f4_urls_now_use_string_instead_of_text.py |    4 +-
 ..._drop_support_for_128_bit_blake2b_hash_.py |    4 +-
 ...65411775c_project_end_at_after_start_at.py |    8 +-
 ...c_project_cfp_end_at_after_cfp_start_at.py |    2 +-
 .../63c44675b6cd_migrate_to_phonenumber.py    |   25 +-
 ...46_drop_organization_and_profile_tables.py |    8 +-
 .../versions/6835596b1eee_shortlink_model.py  |    8 +-
 .../versions/69c2ced88981_team_org_uuid.py    |    4 +-
 .../versions/6d031c17a6ee_start_enums_at_1.py |    4 +-
 .../7aa9eb80aab4_add_sysadmin_flag.py         |    4 +-
 .../7d5b77aada1e_add_geoname_models.py        |   12 +-
 .../versions/7f8114c73092_add_rsvp_uuid.py    |    2 +-
 .../832a4481cda9_tagline_for_profile.py       |    4 +-
 .../83b6643891ec_hash_check_constraint.py     |    4 +-
 .../887db555cca9_adding_uuid_to_commentset.py |    2 +-
 .../896137ace892_remove_voteset_and_vote.py   |    8 +-
 .../99e99507a595_add_commentset_state.py      |   12 +-
 .../9ad724b3e8cc_remove_userphoneclaim.py     |    8 +-
 .../versions/a116118d086b_add_frozen_title.py |    4 +-
 ...3f843e4_add_start_end_check_constraints.py |    6 +-
 .../ad5013552ec6_simplify_proposal_fields.py  |    2 +-
 .../ae075a249493_migrate_email_addresses.py   |   16 +-
 .../aebd5a9e5af1_project_timestamps.py        |    2 +-
 ...d_columns_for_project_profile_user_team.py |   14 +-
 ...c_track_oauth2_refresh_token_and_expiry.py |    4 +-
 ...ersionid_is_now_revisionid_and_in_more_.py |    4 +-
 .../c3069d33419a_comment_uuid_field.py        |    2 +-
 ...populate_usersession_geonameid_from_ip_.py |    2 +-
 ...24ab35cc2_limit_session_duration_to_24h.py |    8 +-
 ...7f_add_label_to_project_crew_membership.py |    4 +-
 ...eb04a529_remove_incorrect_nullable_flag.py |   40 +
 ...2b28adfa135_add_proposal_suuid_redirect.py |    2 +-
 .../e2be4ab896d3_migrate_old_labels.py        |    4 +-
 ...9_move_participant_to_emailaddressmixin.py |    4 +-
 .../versions/eec2fad0f3e9_venue_uuid_field.py |    2 +-
 ...cc783a_use_underscores_in_account_names.py |    4 +-
 ...a05ebecbc0f_populate_proposalmembership.py |    2 +-
 .../versions/fb90ab2af4c2_add_phonenumber.py  |    4 +-
 mypy-ratchet.json                             | 2134 -----------------
 package-lock.json                             | 1294 +++++-----
 pyproject.toml                                |   60 +-
 requirements/base.in                          |    5 +-
 requirements/base.txt                         |   74 +-
 requirements/dev.in                           |   11 +-
 requirements/dev.txt                          |   82 +-
 requirements/test.in                          |    4 +-
 requirements/test.txt                         |   19 +-
 runfrontendtests.sh                           |    4 +
 tests/conftest.py                             | 1261 +++++-----
 tests/e2e/__init__.py                         |    0
 tests/e2e/account/__init__.py                 |    0
 tests/e2e/account/register_test.py            |   78 +-
 tests/e2e/basic/__init__.py                   |    0
 tests/e2e/basic/live_server_test.py           |   16 +-
 tests/e2e/conftest.py                         |    3 +-
 tests/e2e/follow/__init__.py                  |    0
 tests/integration/views/account_add_test.py   |   38 +-
 .../integration/views/account_delete_test.py  |   17 +-
 .../views/comment_moderation_test.py          |   78 +-
 tests/integration/views/conftest.py           |   10 +-
 tests/integration/views/label_views_test.py   |   47 +-
 tests/integration/views/login_test.py         |  170 +-
 .../views/membership_views_test.py            |   12 +-
 tests/integration/views/oauth_test.py         |   20 +-
 tests/integration/views/project_views_test.py |    9 +-
 .../integration/views/pwned_password_test.py  |   62 +
 tests/unit/forms/account_test.py              |   39 +-
 tests/unit/forms/login_test.py                |   83 +-
 tests/unit/forms/proposal_forms_test.py       |   26 +-
 tests/unit/forms/rsvp_json_test.py            |   12 +-
 .../unit/models/account_Organization_test.py  |   33 +-
 tests/unit/models/account_User_test.py        |   84 +-
 tests/unit/models/account_name_test.py        |   39 +-
 tests/unit/models/account_profile_test.py     |   32 +-
 .../auth_client_AuthClientPermissions_test.py |   16 +-
 .../unit/models/auth_client_AuthToken_test.py |   18 +-
 .../models/auth_client_ScopeMixin_test.py     |   30 +-
 tests/unit/models/db_test.py                  |   10 +-
 tests/unit/models/email_address_test.py       |   90 +-
 tests/unit/models/helpers_test.py             |   59 +-
 tests/unit/models/label_test.py               |   16 +-
 tests/unit/models/merge_membership_test.py    |  130 +-
 tests/unit/models/merge_notification_test.py  |   94 +-
 tests/unit/models/merge_team_test.py          |   13 +-
 tests/unit/models/models_utils_test.py        |   24 +-
 tests/unit/models/notification_test.py        |   41 +-
 tests/unit/models/phone_number_test.py        |  117 +-
 .../models/project_crew_membership_test.py    |   28 +-
 tests/unit/models/project_test.py             |   29 +-
 tests/unit/models/proposal_test.py            |    8 +-
 tests/unit/models/session_test.py             |   24 +-
 tests/unit/models/shortlink_test.py           |   19 +-
 tests/unit/models/site_membership_test.py     |   18 +-
 tests/unit/models/sponsor_membership_test.py  |   98 +-
 tests/unit/models/sync_ticket_test.py         |   46 +-
 tests/unit/models/user_session_test.py        |   27 +-
 tests/unit/proxies/request_wants_test.py      |   16 +-
 tests/unit/tests/__init__.py                  |    0
 tests/unit/tests/conftest_test.py             |   10 +-
 tests/unit/transports/email_test.py           |    1 +
 tests/unit/transports/sms_send_test.py        |   15 +-
 tests/unit/utils/markdown/conftest.py         |  180 --
 tests/unit/utils/md/__init__.py               |    0
 tests/unit/utils/md/conftest.py               |  197 ++
 .../utils/{markdown => md}/data/abbr.toml     |    0
 .../utils/{markdown => md}/data/basic.toml    |    0
 .../{markdown => md}/data/basic_plugins.toml  |    0
 .../utils/{markdown => md}/data/code.toml     |    0
 .../utils/{markdown => md}/data/deflists.toml |    0
 .../{markdown => md}/data/footnotes.toml      |    0
 .../utils/{markdown => md}/data/headings.toml |    0
 .../utils/{markdown => md}/data/images.toml   |    0
 .../utils/{markdown => md}/data/links.toml    |    0
 .../utils/{markdown => md}/data/lists.toml    |    0
 .../utils/{markdown => md}/data/markmap.toml  |    0
 .../utils/{markdown => md}/data/mermaid.toml  |    0
 .../utils/{markdown => md}/data/readme.md     |    0
 .../utils/{markdown => md}/data/tables.toml   |    0
 .../utils/{markdown => md}/data/tabs.toml     |    0
 .../utils/{markdown => md}/data/template.html |    0
 .../data/test_case_id.toml.sample             |    0
 .../{markdown => md}/data/vega-lite.toml      |    6 +-
 .../utils/{markdown => md}/markdown_test.py   |   15 +-
 tests/unit/utils/misc_test.py                 |    2 +-
 tests/unit/views/account_menu_test.py         |   18 +-
 tests/unit/views/account_test.py              |   70 +-
 tests/unit/views/api_shortlink_test.py        |   44 +-
 tests/unit/views/api_support_test.py          |   13 +-
 tests/unit/views/helpers_test.py              |    6 +-
 tests/unit/views/login_session_test.py        |   11 +-
 tests/unit/views/notification_test.py         |   43 +-
 tests/unit/views/notifications/__init__.py    |    0
 tests/unit/views/notifications/conftest.py    |   14 +-
 ...ganization_membership_notification_test.py |   82 +-
 .../project_crew_notification_test.py         |  132 +-
 tests/unit/views/project_spa_test.py          |   30 +-
 tests/unit/views/project_sponsorship_test.py  |   82 +-
 tests/unit/views/project_test.py              |    4 +-
 tests/unit/views/rsvp_test.py                 |   40 +-
 tests/unit/views/search_test.py               |   58 +-
 tests/unit/views/session_temp_vars_test.py    |   15 +-
 tests/unit/views/shortlink_test.py            |   20 +-
 tests/unit/views/siteadmin_test.py            |   18 +-
 tests/unit/views/sitemap_test.py              |    4 +-
 tests/unit/views/video_test.py                |   27 +-
 321 files changed, 10280 insertions(+), 9810 deletions(-)
 delete mode 100644 .github/workflows/mypy-ratchet.yml
 create mode 100644 funnel/auth.py
 create mode 100644 funnel/extapi/typing.py
 rename funnel/loginproviders/{init_app.py => helpers.py} (97%)
 create mode 100644 funnel/models/__init__.pyi
 create mode 100644 funnel/models/base.py
 create mode 100644 migrations/versions/d79beb04a529_remove_incorrect_nullable_flag.py
 delete mode 100644 mypy-ratchet.json
 create mode 100644 tests/e2e/__init__.py
 create mode 100644 tests/e2e/account/__init__.py
 create mode 100644 tests/e2e/basic/__init__.py
 create mode 100644 tests/e2e/follow/__init__.py
 create mode 100644 tests/integration/views/pwned_password_test.py
 create mode 100644 tests/unit/tests/__init__.py
 delete mode 100644 tests/unit/utils/markdown/conftest.py
 create mode 100644 tests/unit/utils/md/__init__.py
 create mode 100644 tests/unit/utils/md/conftest.py
 rename tests/unit/utils/{markdown => md}/data/abbr.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/basic.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/basic_plugins.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/code.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/deflists.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/footnotes.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/headings.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/images.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/links.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/lists.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/markmap.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/mermaid.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/readme.md (100%)
 rename tests/unit/utils/{markdown => md}/data/tables.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/tabs.toml (100%)
 rename tests/unit/utils/{markdown => md}/data/template.html (100%)
 rename tests/unit/utils/{markdown => md}/data/test_case_id.toml.sample (100%)
 rename tests/unit/utils/{markdown => md}/data/vega-lite.toml (99%)
 rename tests/unit/utils/{markdown => md}/markdown_test.py (79%)
 create mode 100644 tests/unit/views/notifications/__init__.py

diff --git a/.dockerignore b/.dockerignore
index 5f760dd00..66836b0a8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -39,7 +39,7 @@ geckodriver.log
 tests/cypress/screenshots
 tests/cypress/videos
 tests/screenshots
-tests/unit/utils/markdown/data/output.html
+tests/unit/utils/md/data/output.html
 coverage/
 
 # Instance files that should not be checked-in
diff --git a/.github/workflows/mypy-ratchet.yml b/.github/workflows/mypy-ratchet.yml
deleted file mode 100644
index 0a8d46e0b..000000000
--- a/.github/workflows/mypy-ratchet.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Mypy Ratchet
-
-on:
-  push:
-    paths:
-      - '**.py'
-      - 'requirements/*.txt'
-      - '.github/workflows/mypy-ratchet.yml'
-
-jobs:
-  mypy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-          cache: pip
-          cache-dependency-path: 'requirements/*.txt'
-
-      - name: Install Python dependencies
-        run: |
-          make install-python-dev
-
-      - name: Run mypy
-        run: |
-          mypy . --strict --no-warn-unused-ignores | mypy-json-report parse --diff-old-report mypy-ratchet.json --output-file mypy-ratchet.json || true
diff --git a/.gitignore b/.gitignore
index 47ac37501..add1e6c3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.egg-info
 *.pyc
 .coverage
+coverage/
+coverage.xml
 .eslintcache
 .mypy_cache
 .pytest_cache
@@ -49,6 +51,7 @@ tests/unit/utils/markdown/data/output.html
 coverage/
 tests/playwright/test-results
 playwright-report
+tests/unit/utils/md/data/output.html
 
 # Instance files that should not be checked-in
 instance/development.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 126c39fb8..7b12ba5ac 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,19 +12,24 @@ ci:
       'no-commit-to-branch',
       # 'hadolint-docker',
       'docker-compose-check',
+      'mypy', # Runs as a local hook now
     ]
 repos:
   - repo: https://github.com/pre-commit-ci/pre-commit-ci-config
     rev: v1.6.1
     hooks:
       - id: check-pre-commit-ci-config
+  - repo: https://github.com/mxr/sync-pre-commit-deps
+    rev: v0.0.1
+    hooks:
+      - id: sync-pre-commit-deps
   - repo: https://github.com/peterdemin/pip-compile-multi
     rev: v2.6.3
     hooks:
       - id: pip-compile-multi-verify
         files: ^requirements/.*\.(in|txt)$
   - repo: https://github.com/pypa/pip-audit
-    rev: v2.6.1
+    rev: v2.6.3
     hooks:
       - id: pip-audit
         args: [
@@ -51,7 +56,7 @@ repos:
       - id: pyupgrade
         args: ['--keep-runtime-typing', '--py311-plus']
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.1.11
     hooks:
       - id: ruff
         args: ['--fix', '--exit-non-zero-on-fix']
@@ -91,42 +96,30 @@ repos:
           - toml
           - tomli
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         additional_dependencies:
           - tomli
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 23.12.1
     hooks:
       - id: black
-  # Mypy is temporarily disabled until the SQLAlchemy 2.0 migration is complete
-  # - repo: https://github.com/pre-commit/mirrors-mypy
-  #   rev: v1.3.0
-  #   hooks:
-  #     - id: mypy
-  #       # warn-unused-ignores is unsafe with pre-commit, see
-  #       # https://github.com/python/mypy/issues/2960
-  #       args: ['--no-warn-unused-ignores', '--ignore-missing-imports']
-  #       additional_dependencies:
-  #         - flask
-  #         - lxml-stubs
-  #         - sqlalchemy
-  #         - toml
-  #         - tomli
-  #         - types-chevron
-  #         - types-geoip2
-  #         - types-python-dateutil
-  #         - types-pytz
-  #         - types-requests
-  #         - typing-extensions
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies: *flake8deps
+  - repo: https://github.com/PyCQA/flake8
+    rev: 7.0.0
+    hooks:
+      - id: flake8
+        name: flake8-pyi
+        types: [pyi]
+        additional_dependencies:
+          - flake8-pyi
   - repo: https://github.com/PyCQA/pylint
-    rev: v3.0.1
+    rev: v3.0.3
     hooks:
       - id: pylint
         args: [
@@ -138,7 +131,7 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.7.6
     hooks:
       - id: bandit
         language_version: python3
@@ -149,23 +142,12 @@ repos:
     rev: v3.0.0
     hooks:
       - id: creosote
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.9.0.6
+    hooks:
+      - id: shellcheck
         args:
-          - --venv=.venv
-          - --path=funnel
-          - --path=tests
-          - --path=migrations/versions
-          - --deps-file=requirements/base.in
-          - --exclude-dep=argon2-cffi # Optional dep for passlib
-          - --exclude-dep=bcrypt # Optional dep for passlib
-          - --exclude-dep=greenlet # Optional dep for SQLAlchemy's asyncio support
-          - --exclude-dep=gunicorn # Not imported, used as server
-          - --exclude-dep=linkify-it-py # Optional dep for markdown-it-py
-          - --exclude-dep=psycopg # Optional dep for SQLAlchemy
-          - --exclude-dep=rq-dashboard # Creosote fails to recognise the import
-          - --exclude-dep=tzdata # Data-only dep, therefore no import statement
-          - --exclude-dep=urllib3 # Required to silence a pip-audit warning
-          - --exclude-dep=wtforms-sqlalchemy # Temp dep on an unreleased git branch
-
+          - --external-sources
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -208,11 +190,10 @@ repos:
       - id: forbid-tabs
       - id: remove-tabs
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.1.0
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
-        args:
-          ['--single-quote', '--trailing-comma', 'es5', '--end-of-line', 'lf']
+        args: ['--single-quote', '--trailing-comma', 'es5', '--end-of-line', 'lf']
         exclude: funnel/templates/js/
   - repo: https://github.com/ducminh-phan/reformat-gherkin
     rev: v3.0.1
@@ -232,3 +213,16 @@ repos:
     rev: v3.0.1
     hooks:
       - id: docker-compose-check
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        entry: .venv/bin/mypy
+        args:
+          - --no-warn-unused-ignores
+          - --no-warn-redundant-casts
+          - . # Required to honour settings in pyproject.toml
+        language: system
+        types_or: [python, pyi]
+        require_serial: true
+        pass_filenames: false # Mypy is unreliable if module import order varies
diff --git a/.prettierrc.js b/.prettierrc.js
index c90450753..1aed56ad4 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -2,4 +2,5 @@ module.exports = {
   endOfLine: 'lf',
   singleQuote: true,
   trailingComma: 'es5',
+  printWidth: 88,
 };
diff --git a/.testenv b/.testenv
index f60567fe7..12a9accf4 100644
--- a/.testenv
+++ b/.testenv
@@ -21,7 +21,7 @@ FLASK_LOG_TELEGRAM_APIKEY=null
 FLASK_LOG_SLACK_WEBHOOKS='[]'
 # Run RQ jobs inline in tests
 FLASK_RQ_ASYNC=false
-# Recaptcha keys from https://developers.google.com/recaptcha/docfaq#id-like-to-run-automated-tests-with-recaptcha.-what-should-i-do
+# Recaptcha keys from https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha.-what-should-i-do
 FLASK_RECAPTCHA_USE_SSL=true
 FLASK_RECAPTCHA_PUBLIC_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
 FLASK_RECAPTCHA_PRIVATE_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
diff --git a/Makefile b/Makefile
index 991b6a35c..22d701d81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,36 @@
+ifeq ($(shell test -d .venv/bin && echo 1 || echo 0), 1)
+    export PATH := .venv/bin:$(PATH)
+endif
+
 all:
 	@echo "You must have an active Python virtualenv (3.11+) before using any of these."
 	@echo
 	@echo "For production deployment:"
+	@echo
 	@echo "  make install       # For first time setup and after dependency upgrades"
 	@echo "  make assets        # For only Node asset changes"
 	@echo
 	@echo "For testing and CI:"
+	@echo
 	@echo "  make install-test  # Install everything needed for a test environment"
 	@echo "  make install-playwright  # Install browsers for Playwright-based tests"
 	@echo
 	@echo "For development:"
+	@echo
 	@echo "  make install-dev   # For first time setup and after dependency upgrades"
 	@echo "  make deps-noup     # Rebuild for dependency changes, but skip upgrades"
 	@echo "  make deps          # Scan for dependency upgrades (remember to test!)"
 	@echo "  make deps-python   # Scan for Python dependency upgrades"
 	@echo "  make deps-npm      # Scan for NPM dependency upgrades"
 	@echo
+	@echo "To export a new symbol from any Python file, regenerate '__init__.py' files:"
+	@echo
+	@echo "  make initpy"
+	@echo
+	@echo "After editing any UI strings, regenerate Babel translation databases:"
+	@echo
+	@echo "  make babel"
+	@echo
 	@echo "To upgrade dependencies in a development environment, use all in order and"
 	@echo "commit changes only if all tests pass:"
 	@echo
@@ -101,6 +116,35 @@ deps-noup: deps-python-noup
 
 deps: deps-python deps-npm
 
+initpy: initpy-models initpy-forms initpy-loginproviders initpy-transports initpy-utils
+
+initpy-models:
+	mkinit --inplace --relative --black --lazy_loader_typed funnel/models/__init__.py
+	isort funnel/models/__init__.py funnel/models/__init__.pyi
+	black funnel/models/__init__.py funnel/models/__init__.pyi
+
+initpy-forms:
+	mkinit --inplace --relative --black funnel/forms/__init__.py
+	isort funnel/forms/__init__.py
+	black funnel/forms/__init__.py
+
+initpy-loginproviders:
+	mkinit --inplace --relative --black funnel/loginproviders/__init__.py
+	isort funnel/loginproviders/__init__.py
+	black funnel/loginproviders/__init__.py
+
+initpy-transports:
+	# Do not auto-gen funnel/transports/__init__.py, only sub-packages
+	mkinit --inplace --relative --black funnel/transports/email
+	mkinit --inplace --relative --black  funnel/transports/sms
+	isort funnel/transports/*/__init__.py
+	black funnel/transports/*/__init__.py
+
+initpy-utils:
+	mkinit --inplace --relative --black --recursive funnel/utils
+	isort funnel/utils/__init__.py funnel/utils/*/__init__.py funnel/utils/*/*/__init__.py
+	black funnel/utils/__init__.py funnel/utils/*/__init__.py funnel/utils/*/*/__init__.py
+
 install-npm:
 	npm install
 
diff --git a/docker/entrypoints/ci-test.sh b/docker/entrypoints/ci-test.sh
index 4da374e54..ad996e1fa 100755
--- a/docker/entrypoints/ci-test.sh
+++ b/docker/entrypoints/ci-test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 make install-test
-pytest --allow-hosts=127.0.0.1,::1,$(hostname -i),$(getent ahosts db-test | awk '/STREAM/ { print $1}'),$(getent ahosts redis-test | awk '/STREAM/ { print $1}') --gherkin-terminal-reporter -vv --showlocals --cov=funnel
+pytest "--allow-hosts=127.0.0.1,::1,$(hostname -i),$(getent ahosts db-test | awk '/STREAM/ { print $1}'),$(getent ahosts redis-test | awk '/STREAM/ { print $1}')" --gherkin-terminal-reporter -vv --showlocals --cov=funnel
 coverage lcov -o coverage/funnel.lcov
diff --git a/docker/entrypoints/dev.sh b/docker/entrypoints/dev.sh
index 9135c8ff1..a1930f1ef 100755
--- a/docker/entrypoints/dev.sh
+++ b/docker/entrypoints/dev.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$(psql -XtA -U postgres -h $DB_HOST funnel -c "select count(*) from information_schema.tables where table_schema = 'public';")" = "0" ]; then
+if [ "$(psql -XtA -U postgres -h "$DB_HOST" funnel -c "select count(*) from information_schema.tables where table_schema = 'public';")" = "0" ]; then
     flask dbcreate
     flask db stamp
 fi
diff --git a/funnel/__init__.py b/funnel/__init__.py
index eeef7cee0..534228ceb 100644
--- a/funnel/__init__.py
+++ b/funnel/__init__.py
@@ -26,14 +26,14 @@
 
 #: Main app for hasgeek.com
 app = Flask(__name__, instance_relative_config=True)
-app.name = 'funnel'
+app.name = 'funnel'  # pyright: ignore[reportGeneralTypeIssues]
 app.config['SITE_TITLE'] = __("Hasgeek")
-#: Shortlink app at has.gy
+#: Short link app at has.gy
 shortlinkapp = Flask(__name__, static_folder=None, instance_relative_config=True)
-shortlinkapp.name = 'shortlink'
+shortlinkapp.name = 'shortlink'  # pyright: ignore[reportGeneralTypeIssues]
 #: Unsubscribe app at bye.li
 unsubscribeapp = Flask(__name__, static_folder=None, instance_relative_config=True)
-unsubscribeapp.name = 'unsubscribe'
+unsubscribeapp.name = 'unsubscribe'  # pyright: ignore[reportGeneralTypeIssues]
 
 all_apps = [app, shortlinkapp, unsubscribeapp]
 
@@ -79,7 +79,7 @@
     views,
     cli,
 )
-from .models import db, sa  # isort:skip  # pylint: disable=wrong-import-position
+from .models import db, sa_orm  # isort:skip
 
 # --- Configuration---------------------------------------------------------------------
 
@@ -89,12 +89,9 @@
 # present, it is loaded in debug and testing modes only
 for each_app in all_apps:
     coaster.app.init_app(
-        each_app, ['py', 'env'], env_prefix=['FLASK', f'APP_{each_app.name.upper()}']
+        each_app, ['env'], env_prefix=['FLASK', f'APP_{each_app.name.upper()}']
     )
 
-# Legacy additional config for the main app (pending deprecation)
-coaster.app.load_config_from_file(app, 'hasgeekapp.py')
-
 # Force specific config settings, overriding deployment config
 shortlinkapp.config['SERVER_NAME'] = app.config['SHORTLINK_DOMAIN']
 if app.config.get('UNSUBSCRIBE_DOMAIN'):
@@ -147,7 +144,12 @@
 geoip.geoip.init_app(app)
 
 # Baseframe is required for apps with UI ('funnel' theme is registered above)
-baseframe.init_app(app, requires=['funnel'], theme='funnel', error_handlers=False)
+baseframe.init_app(
+    app,
+    requires=['funnel'],
+    theme='funnel',  # type: ignore[arg-type]  # FIXME
+    error_handlers=False,
+)
 
 # Initialize available login providers from app config
 loginproviders.init_app(app)
@@ -160,7 +162,7 @@
 transports.init()
 
 # Register JS and CSS assets on both apps
-app.assets.register(  # type: ignore[attr-defined]
+app.assets.register(  # type: ignore[attr-defined]  # FIXME
     'js_fullcalendar',
     Bundle(
         assets.require(
@@ -176,7 +178,7 @@
         filters='rjsmin',
     ),
 )
-app.assets.register(  # type: ignore[attr-defined]
+app.assets.register(  # type: ignore[attr-defined]  # FIXME
     'css_fullcalendar',
     Bundle(
         assets.require('jquery.fullcalendar.css', 'spectrum.css'),
@@ -184,7 +186,7 @@
         filters='cssmin',
     ),
 )
-app.assets.register(  # type: ignore[attr-defined]
+app.assets.register(  # type: ignore[attr-defined]  # FIXME
     'js_schedules',
     Bundle(
         assets.require('schedules.js'),
@@ -195,17 +197,14 @@
 
 views.siteadmin.init_rq_dashboard()
 
-# --- Serve static files with Whitenoise -----------------------------------------------
+# --- Serve static files with WhiteNoise -----------------------------------------------
 
-app.wsgi_app = WhiteNoise(  # type: ignore[method-assign]
-    app.wsgi_app, root=app.static_folder, prefix=app.static_url_path
-)
-app.wsgi_app.add_files(  # type: ignore[attr-defined]
-    baseframe.static_folder, prefix=baseframe.static_url_path
-)
+_wn = WhiteNoise(app.wsgi_app, root=app.static_folder, prefix=app.static_url_path)
+_wn.add_files(baseframe.static_folder, prefix=baseframe.static_url_path)
+app.wsgi_app = _wn  # type: ignore[method-assign]
 
 # --- Init SQLAlchemy mappers ----------------------------------------------------------
 
 # Database model loading (from Funnel or extensions) is complete.
 # Configure database mappers now, before the process is forked for workers.
-sa.orm.configure_mappers()
+sa_orm.configure_mappers()
diff --git a/funnel/assets/js/schedule_view.js b/funnel/assets/js/schedule_view.js
index 538b82d94..63875eecd 100644
--- a/funnel/assets/js/schedule_view.js
+++ b/funnel/assets/js/schedule_view.js
@@ -276,8 +276,9 @@ const Schedule = {
         this.config.slotInterval
       );
       if (this.config.schedule[session.eventDay]) {
-        this.config.schedule[session.eventDay].sessions[session.startTime].showLabel =
-          true;
+        this.config.schedule[session.eventDay].sessions[
+          session.startTime
+        ].showLabel = true;
         this.config.schedule[session.eventDay].sessions[session.startTime].rooms[
           session.room_scoped_name
         ].talk = session;
diff --git a/funnel/assets/sass/components/_video.scss b/funnel/assets/sass/components/_video.scss
index 46b7a8dda..ea6dedf59 100644
--- a/funnel/assets/sass/components/_video.scss
+++ b/funnel/assets/sass/components/_video.scss
@@ -14,6 +14,50 @@
     left: 50%;
   }
 
+  .embed-video-wrapper__restricted {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    width: 100%;
+
+    .embed-video-wrapper__restricted__img {
+      width: 60%;
+      max-width: 130px;
+    }
+
+    .embed-video-wrapper__restricted__content {
+      margin-left: $mui-grid-padding;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .embed-video-wrapper__restricted {
+      flex-direction: column;
+      .embed-video-wrapper__restricted__img {
+        max-width: 160px;
+      }
+      .embed-video-wrapper__restricted__content {
+        margin-left: 0;
+        margin-top: $mui-grid-padding;
+        .embed-video-wrapper__restricted__content__text {
+          font-size: 18px;
+          font-weight: 600;
+        }
+      }
+    }
+  }
+
+  .embed-video-wrapper__bottom-note {
+    text-align: center;
+    position: absolute;
+    bottom: $mui-grid-padding;
+    left: 0;
+    right: 0;
+    font-style: italic;
+  }
+
   iframe {
     position: absolute;
     width: 100%;
diff --git a/funnel/assets/sass/pages/schedule.scss b/funnel/assets/sass/pages/schedule.scss
index 3d2e60d50..6ce6869fb 100644
--- a/funnel/assets/sass/pages/schedule.scss
+++ b/funnel/assets/sass/pages/schedule.scss
@@ -1,3 +1,4 @@
+@use 'sass:math';
 @import '../base/variable';
 @import '../components/draggablebox';
 @import '../components/collapsible';
@@ -43,7 +44,7 @@
 
           .schedule__row__column__content__description {
             clear: both;
-            padding-top: $mui-grid-padding/4;
+            padding-top: math.div($mui-grid-padding, 4);
             padding-bottom: $mui-grid-padding;
             word-break: break-word;
 
@@ -62,7 +63,7 @@
             h5 {
               font-size: 12px;
               margin-top: 0;
-              margin-bottom: $mui-grid-padding/4;
+              margin-bottom: math.div($mui-grid-padding, 4);
             }
           }
 
@@ -109,8 +110,8 @@
     .schedule__row--sticky {
       display: flex;
       overflow-x: auto;
-      position: sticky;
       position: -webkit-sticky;
+      position: sticky;
       top: 0; // header height in home page
       order: 1;
       z-index: 2;
@@ -131,7 +132,7 @@
         min-height: 50px;
         min-width: 60%;
         width: 100% !important;
-        padding: $mui-grid-padding/2;
+        padding: math.div($mui-grid-padding, 2);
       }
 
       .schedule__row__column--header.js-tab-active {
diff --git a/funnel/auth.py b/funnel/auth.py
new file mode 100644
index 000000000..d43f2e3d9
--- /dev/null
+++ b/funnel/auth.py
@@ -0,0 +1,41 @@
+"""Auth proxy."""
+
+from coaster.auth import (
+    CurrentAuth as CurrentAuthBase,
+    GetCurrentAuth,
+    add_auth_anchor,
+    add_auth_attribute,
+    request_has_auth,
+)
+
+from . import all_apps
+from .models import User
+
+__all__ = [
+    'CurrentAuth',
+    'add_auth_attribute',
+    'add_auth_anchor',
+    'current_auth',
+    'request_has_auth',
+]
+
+
+class CurrentAuth(CurrentAuthBase):
+    """CurrentAuth for Funnel."""
+
+    # These attrs are typed as not-optional because they're typically accessed in a view
+    # that is already gated with the `@requires_login` or related decorator, so they're
+    # guaranteed to be present within the view. However, this will require a type-ignore
+    # for any code that tests `if current_auth.actor`, so those will need a rewrite to
+    # `if current_auth`. When auth clients become supported actors, this may need some
+    # form of PEP 647 typeguard to identify the actor's exact type.
+
+    user: User
+    actor: User
+
+
+current_auth = GetCurrentAuth.proxy(CurrentAuth)
+
+# Install this proxy in all apps, overriding the proxy provided by coaster.app.init_app
+for _app in all_apps:
+    _app.jinja_env.globals['current_auth'] = current_auth
diff --git a/funnel/cli/geodata.py b/funnel/cli/geodata.py
index 978f03850..839d29b1b 100644
--- a/funnel/cli/geodata.py
+++ b/funnel/cli/geodata.py
@@ -167,7 +167,7 @@ def load_country_info(filename: str) -> None:
         GeoCountryInfo.query.all()  # Load everything into session cache
         for item in countryinfo:
             if item.geonameid:
-                ci = GeoCountryInfo.query.get(int(item.geonameid))
+                ci = db.session.get(GeoCountryInfo, int(item.geonameid))
                 if ci is None:
                     ci = GeoCountryInfo(geonameid=int(item.geonameid))
                     db.session.add(ci)
@@ -276,7 +276,7 @@ def load_geonames(filename: str) -> None:
 
     for item in rich.progress.track(geonames):
         if item.geonameid:
-            gn = GeoName.query.get(int(item.geonameid))
+            gn = db.session.get(GeoName, int(item.geonameid))
             if gn is None:
                 gn = GeoName(geonameid=int(item.geonameid))
                 db.session.add(gn)
@@ -335,7 +335,7 @@ def load_alt_names(filename: str) -> None:
 
     for item in rich.progress.track(altnames):
         if item.geonameid:
-            rec = GeoAltName.query.get(int(item.id))
+            rec = db.session.get(GeoAltName, int(item.id))
             if rec is None:
                 rec = GeoAltName(id=int(item.id))
                 db.session.add(rec)
@@ -368,7 +368,7 @@ def load_admin1_codes(filename: str) -> None:
     GeoAdmin1Code.query.all()  # Load all data into session cache for faster lookup
     for item in rich.progress.track(admincodes):
         if item.geonameid:
-            rec = GeoAdmin1Code.query.get(item.geonameid)
+            rec = db.session.get(GeoAdmin1Code, item.geonameid)
             if rec is None:
                 rec = GeoAdmin1Code(geonameid=int(item.geonameid))
                 db.session.add(rec)
@@ -397,7 +397,7 @@ def load_admin2_codes(filename: str) -> None:
     GeoAdmin2Code.query.all()  # Load all data into session cache for faster lookup
     for item in rich.progress.track(admincodes):
         if item.geonameid:
-            rec = GeoAdmin2Code.query.get(item.geonameid)
+            rec = db.session.get(GeoAdmin2Code, item.geonameid)
             if rec is None:
                 rec = GeoAdmin2Code(geonameid=int(item.geonameid))
                 db.session.add(rec)
diff --git a/funnel/cli/periodic/notification.py b/funnel/cli/periodic/notification.py
index 5d0c62315..c5454c7c7 100644
--- a/funnel/cli/periodic/notification.py
+++ b/funnel/cli/periodic/notification.py
@@ -5,7 +5,7 @@
 from datetime import timedelta
 
 from ... import models
-from ...models import db, sa
+from ...models import db, sa, sa_orm
 from ...views.notification import dispatch_notification
 from . import periodic
 
@@ -27,7 +27,7 @@ def project_starting_alert() -> None:
     # the prior hour.
 
     # Any eager-loading columns and relationships should be deferred with
-    # sa.orm.defer(column) and sa.orm.noload(relationship). There are none as of this
+    # sa_orm.defer(column) and sa_orm.noload(relationship). There are none as of this
     # commit.
     for project in (
         models.Project.starting_at(
@@ -35,7 +35,7 @@ def project_starting_alert() -> None:
             timedelta(minutes=5),
             timedelta(minutes=60),
         )
-        .options(sa.orm.load_only(models.Project.uuid))
+        .options(sa_orm.load_only(models.Project.uuid))
         .all()
     ):
         dispatch_notification(
diff --git a/funnel/cli/refresh/markdown.py b/funnel/cli/refresh/markdown.py
index 17e9d0086..544883b5e 100644
--- a/funnel/cli/refresh/markdown.py
+++ b/funnel/cli/refresh/markdown.py
@@ -9,16 +9,19 @@
 import rich.progress
 
 from ... import models
-from ...models import MarkdownModelUnion, db, sa
+from ...models import db, sa_orm
 from . import refresh
 
-_M = TypeVar('_M', bound=MarkdownModelUnion)
+_M = TypeVar('_M', bound=models.ModelIdProtocol)
 
 
 class MarkdownModel(Generic[_M]):
     """Holding class for a model that has markdown fields with custom configuration."""
 
+    #: Dict of ``{MarkdownModel().name: MarkdownModel()}``
     registry: ClassVar[dict[str, MarkdownModel]] = {}
+    #: Dict of ``{config_name: MarkdownModel()}``, where the fields on the model using
+    #: that config are enumerated in :attr:`config_fields`
     config_registry: ClassVar[dict[str, set[MarkdownModel]]] = {}
 
     def __init__(self, model: type[_M], fields: set[str]) -> None:
@@ -54,13 +57,13 @@ def reparse(self, config: str | None = None, obj: _M | None = None) -> None:
             iter_total = 1
         else:
             load_columns = (
-                [self.model.id]
+                [self.model.id_]
                 + [getattr(self.model, f'{field}_text'.lstrip('_')) for field in fields]
                 + [getattr(self.model, f'{field}_html'.lstrip('_')) for field in fields]
             )
             iter_list = (
-                self.model.query.order_by(self.model.id)
-                .options(sa.orm.load_only(*load_columns))
+                self.model.query.order_by(self.model.id_)
+                .options(sa_orm.load_only(*load_columns))
                 .yield_per(10)
             )
             iter_total = self.model.query.count()
diff --git a/funnel/devtest.py b/funnel/devtest.py
index ae00c228e..3a7622d68 100644
--- a/funnel/devtest.py
+++ b/funnel/devtest.py
@@ -1,4 +1,5 @@
 """Support for development and testing environments."""
+# pyright: reportGeneralTypeIssues=false
 
 from __future__ import annotations
 
@@ -13,11 +14,11 @@
 import weakref
 from collections.abc import Callable, Iterable
 from secrets import token_urlsafe
-from typing import Any, NamedTuple, Protocol
+from typing import Any, NamedTuple, Protocol, cast
 
 from flask import Flask
 
-from . import app as main_app, shortlinkapp, transports, unsubscribeapp
+from . import all_apps, app as main_app, transports
 from .models import db
 from .typing import ReturnView
 
@@ -29,7 +30,7 @@
 # Pytest `live_server` fixture used for end-to-end tests. Fork on macOS is not
 # compatible with the Objective C framework. If you have a framework Python build and
 # experience crashes, try setting the environment variable
-# OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+# `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES`
 mpcontext = multiprocessing.get_context('fork')
 
 # --- Development and testing app multiplexer ------------------------------------------
@@ -99,7 +100,7 @@ def __call__(self, environ: Any, start_response: Any) -> Iterable[bytes]:
         return use_app(environ, start_response)
 
 
-devtest_app = AppByHostWsgi(main_app, shortlinkapp, unsubscribeapp)
+devtest_app = AppByHostWsgi(*all_apps)
 
 # --- Background worker ----------------------------------------------------------------
 
@@ -131,7 +132,7 @@ class CapturedCalls(Protocol):
     sms: list[CapturedSms]
 
 
-def _signature_without_annotations(func) -> inspect.Signature:
+def _signature_without_annotations(func: Callable) -> inspect.Signature:
     """Generate a function signature without parameter type annotations."""
     sig = inspect.signature(func)
     return sig.replace(
@@ -142,7 +143,7 @@ def _signature_without_annotations(func) -> inspect.Signature:
     )
 
 
-def install_mock(func: Callable, mock: Callable) -> None:
+def install_mock(func: Any, mock: Any) -> None:
     """
     Patch all existing references to :attr:`func` with :attr:`mock`.
 
@@ -160,9 +161,9 @@ def install_mock(func: Callable, mock: Callable) -> None:
     # Use weakref to dereference func from local namespace
     func = weakref.ref(func)
     gc.collect()
-    refs = gc.get_referrers(func())  # type: ignore[misc]
+    refs = gc.get_referrers(func())
     # Recover func from the weakref so we can do an `is` match in referrers
-    func = func()  # type: ignore[misc]
+    func = func()
     for ref in refs:
         if isinstance(ref, dict):
             # We have a namespace dict. Iterate through contents to find the reference
@@ -170,6 +171,10 @@ def install_mock(func: Callable, mock: Callable) -> None:
             for key, value in ref.items():
                 if value is func:
                     ref[key] = mock
+        else:
+            raise RuntimeError(
+                f"Can't patch {func.__qualname__} in unknown reference type {ref!r}"
+            )
 
 
 def _prepare_subprocess(
@@ -197,7 +202,7 @@ def mock_email(
             subject: str,
             to: list[Any],
             content: str,
-            attachments=None,
+            attachments: Any = None,
             from_email: Any | None = None,
             headers: dict | None = None,
             base_url: str | None = None,
@@ -267,9 +272,9 @@ def __init__(
         self.mock_transports = mock_transports
 
         manager = mpcontext.Manager()
-        self.calls: CapturedCalls = manager.Namespace()
-        self.calls.email = manager.list()
-        self.calls.sms = manager.list()
+        self.calls = cast(CapturedCalls, manager.Namespace())
+        self.calls.email = cast(list[CapturedEmail], manager.list())
+        self.calls.sms = cast(list[CapturedSms], manager.list())
 
     def start(self) -> None:
         """Start worker in a separate process."""
@@ -307,7 +312,7 @@ def start(self) -> None:
                 raise RuntimeError(f"Server exited with code {self._process.exitcode}")
 
     def _is_ready(self) -> bool:
-        """Probe for readyness with a socket connection."""
+        """Probe for readiness with a socket connection."""
         if not self.probe_at:
             return False
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/funnel/extapi/__init__.py b/funnel/extapi/__init__.py
index 0fe6fde8d..999059c6a 100644
--- a/funnel/extapi/__init__.py
+++ b/funnel/extapi/__init__.py
@@ -1 +1,5 @@
-"""External API support."""
+"""External ticketing API support (pending merger and deprecation)."""
+
+from . import boxoffice, explara, typing
+
+__all__ = ['boxoffice', 'explara', 'typing']
diff --git a/funnel/extapi/boxoffice.py b/funnel/extapi/boxoffice.py
index 7906b966a..af9d713d9 100644
--- a/funnel/extapi/boxoffice.py
+++ b/funnel/extapi/boxoffice.py
@@ -8,6 +8,7 @@
 from flask import current_app
 
 from ..utils import extract_twitter_handle
+from .typing import ExtTicketsDict
 
 __all__ = ['Boxoffice']
 
@@ -15,22 +16,22 @@
 class Boxoffice:
     """Interface that enables data retrieval from Boxoffice."""
 
-    def __init__(self, access_token, base_url=None) -> None:
+    def __init__(self, access_token: str, base_url: str | None = None) -> None:
         self.access_token = access_token
         if not base_url:
             self.base_url = current_app.config['BOXOFFICE_SERVER']
         else:
             self.base_url = base_url
 
-    def get_orders(self, ic):
+    def get_orders(self, ic: str):  # TODO: Return type annotation
         url = urljoin(
             self.base_url,
             f'ic/{ic}/orders?access_token={self.access_token}',
         )
         return requests.get(url, timeout=30).json().get('orders')
 
-    def get_tickets(self, ic):
-        tickets = []
+    def get_tickets(self, ic: str) -> list[ExtTicketsDict]:
+        tickets: list[ExtTicketsDict] = []
         for order in self.get_orders(ic):
             for line_item in order.get('line_items'):
                 if line_item.get('assignee'):
diff --git a/funnel/extapi/explara.py b/funnel/extapi/explara.py
index 457fcfbac..6f02c020d 100644
--- a/funnel/extapi/explara.py
+++ b/funnel/extapi/explara.py
@@ -2,15 +2,33 @@
 
 from __future__ import annotations
 
+from typing import Any, TypedDict, cast
+
 import requests
 
 from ..utils import extract_twitter_handle
+from .typing import ExtTicketsDict
 
 __all__ = ['ExplaraAPI']
 
 
-def strip_or_empty(val):
-    return val.strip() if val else ''
+def strip_or_empty(val: Any) -> str:
+    return val.strip() if isinstance(val, str) else ''
+
+
+class ExplaraAttendeeDict(TypedDict, total=False):
+    name: str
+    email: str
+    Phone: str
+    phoneNo: str  # noqa: N815
+    ticketNo: str  # noqa: N815
+    ticketName: str  # noqa: N815
+    orderNo: str  # noqa: N815
+    status: str
+
+
+class ExplaraOrderDict(TypedDict):
+    attendee: list[ExplaraAttendeeDict]
 
 
 class ExplaraAPI:
@@ -20,15 +38,15 @@ class ExplaraAPI:
     Reference : https://developers.explara.com/api-document
     """
 
-    def __init__(self, access_token) -> None:
+    def __init__(self, access_token: str) -> None:
         self.access_token = access_token
         self.headers = {'Authorization': 'Bearer ' + self.access_token}
         self.base_url = 'https://www.explara.com/api/e/{0}'
 
-    def url_for(self, endpoint):
+    def url_for(self, endpoint: str) -> str:
         return self.base_url.format(endpoint)
 
-    def get_orders(self, explara_eventid):
+    def get_orders(self, explara_eventid: str) -> list[ExplaraOrderDict]:
         """
         Get the entire dump of orders for a given eventid in batches.
 
@@ -64,19 +82,19 @@ def get_orders(self, explara_eventid):
 
         return ticket_orders
 
-    def get_tickets(self, explara_eventid):
-        tickets = []
+    def get_tickets(self, explara_eventid: str) -> list[ExtTicketsDict]:
+        tickets: list[ExtTicketsDict] = []
         for order in self.get_orders(explara_eventid):
-            for attendee in order.get('attendee'):
+            for attendee in order['attendee']:
                 # cancelled tickets are in this list too, hence the check
                 if attendee.get('status') == 'attending':
-                    status = 'confirmed'
+                    status: str | None = 'confirmed'
                 elif attendee.get('status') in ['cancelled', 'lcancelled']:
                     status = 'cancelled'
                 else:
                     status = attendee.get('status')
                 # we sometimes get an empty array for details
-                details = attendee.get('details') or {}
+                details = cast(dict, attendee.get('details') or {})
                 tickets.append(
                     {
                         'fullname': strip_or_empty(attendee.get('name')),
diff --git a/funnel/extapi/typing.py b/funnel/extapi/typing.py
new file mode 100644
index 000000000..945b4621a
--- /dev/null
+++ b/funnel/extapi/typing.py
@@ -0,0 +1,19 @@
+"""Common types and data structures."""
+
+from typing import TypedDict
+
+__all__ = ['ExtTicketsDict']
+
+
+class ExtTicketsDict(TypedDict):
+    fullname: str
+    email: str
+    phone: str
+    twitter: str | None
+    job_title: str
+    company: str
+    city: str
+    ticket_no: str
+    ticket_type: str
+    order_no: str
+    status: str | None
diff --git a/funnel/forms/__init__.py b/funnel/forms/__init__.py
index ebca7544a..55a2c3cdf 100644
--- a/funnel/forms/__init__.py
+++ b/funnel/forms/__init__.py
@@ -1,21 +1,251 @@
 """Forms provide an interface between views and models, validating data before save."""
-# flake8: noqa
 
-from __future__ import annotations
+# --- Everything below this line is auto-generated using `make initpy` -----------------
 
-from .account import *
-from .auth_client import *
-from .comment import *
-from .helpers import *
-from .label import *
-from .login import *
-from .membership import *
-from .notification import *
-from .organization import *
-from .profile import *
-from .project import *
-from .proposal import *
-from .session import *
-from .sync_ticket import *
-from .update import *
-from .venue import *
+from . import (
+    account,
+    auth_client,
+    comment,
+    helpers,
+    label,
+    login,
+    membership,
+    notification,
+    organization,
+    profile,
+    project,
+    proposal,
+    session,
+    sync_ticket,
+    update,
+    venue,
+)
+from .account import (
+    AccountDeleteForm,
+    AccountForm,
+    EmailPrimaryForm,
+    ModeratorReportForm,
+    NewEmailAddressForm,
+    NewPhoneForm,
+    PasswordChangeForm,
+    PasswordCreateForm,
+    PasswordForm,
+    PasswordPolicyForm,
+    PasswordResetForm,
+    PasswordResetRequestForm,
+    PhonePrimaryForm,
+    UsernameAvailableForm,
+    pwned_password_validator,
+    supported_locales,
+    timezone_identifiers,
+)
+from .auth_client import (
+    AuthClientCredentialForm,
+    AuthClientForm,
+    AuthClientPermissionEditForm,
+    UserPermissionAssignForm,
+)
+from .comment import CommentForm, CommentsetSubscribeForm
+from .helpers import (
+    MSG_EMAIL_BLOCKED,
+    MSG_EMAIL_INVALID,
+    MSG_INCORRECT_OTP,
+    MSG_INCORRECT_PASSWORD,
+    MSG_NO_ACCOUNT,
+    MSG_NO_LOGIN_SESSION,
+    MSG_PHONE_BLOCKED,
+    MSG_PHONE_NO_SMS,
+    AccountSelectField,
+    EmailAddressAvailable,
+    PhoneNumberAvailable,
+    format_json,
+    image_url_validator,
+    nullable_json_filters,
+    nullable_strip_filters,
+    strip_filters,
+    tostr,
+    validate_and_convert_json,
+    video_url_list_validator,
+    video_url_validator,
+)
+from .label import LabelForm, LabelOptionForm
+from .login import (
+    EmailOtpForm,
+    LoginForm,
+    LoginPasswordResetException,
+    LoginPasswordWeakException,
+    LoginWithOtp,
+    LogoutForm,
+    OtpForm,
+    RegisterOtpForm,
+    RegisterWithOtp,
+)
+from .membership import (
+    OrganizationMembershipForm,
+    ProjectCrewMembershipForm,
+    ProjectCrewMembershipInviteForm,
+)
+from .notification import (
+    SetNotificationPreferenceForm,
+    UnsubscribeForm,
+    transport_labels,
+)
+from .organization import OrganizationForm, TeamForm
+from .profile import (
+    ProfileBannerForm,
+    ProfileForm,
+    ProfileLogoForm,
+    ProfileTransitionForm,
+)
+from .project import (
+    CfpForm,
+    ProjectBannerForm,
+    ProjectCfpTransitionForm,
+    ProjectFeaturedForm,
+    ProjectForm,
+    ProjectLivestreamForm,
+    ProjectNameForm,
+    ProjectRegisterForm,
+    ProjectSponsorForm,
+    ProjectTransitionForm,
+    RsvpTransitionForm,
+    SavedProjectForm,
+)
+from .proposal import (
+    ProposalFeaturedForm,
+    ProposalForm,
+    ProposalLabelsAdminForm,
+    ProposalLabelsForm,
+    ProposalMemberForm,
+    ProposalMoveForm,
+    ProposalTransitionForm,
+)
+from .session import SavedSessionForm, SessionForm
+from .sync_ticket import (
+    FORM_SCHEMA_PLACEHOLDER,
+    ProjectBoxofficeForm,
+    TicketClientForm,
+    TicketEventForm,
+    TicketParticipantBadgeForm,
+    TicketParticipantForm,
+    TicketTypeForm,
+)
+from .update import UpdateForm
+from .venue import VenueForm, VenuePrimaryForm, VenueRoomForm
+
+__all__ = [
+    "AccountDeleteForm",
+    "AccountForm",
+    "AccountSelectField",
+    "AuthClientCredentialForm",
+    "AuthClientForm",
+    "AuthClientPermissionEditForm",
+    "CfpForm",
+    "CommentForm",
+    "CommentsetSubscribeForm",
+    "EmailAddressAvailable",
+    "EmailOtpForm",
+    "EmailPrimaryForm",
+    "FORM_SCHEMA_PLACEHOLDER",
+    "LabelForm",
+    "LabelOptionForm",
+    "LoginForm",
+    "LoginPasswordResetException",
+    "LoginPasswordWeakException",
+    "LoginWithOtp",
+    "LogoutForm",
+    "MSG_EMAIL_BLOCKED",
+    "MSG_EMAIL_INVALID",
+    "MSG_INCORRECT_OTP",
+    "MSG_INCORRECT_PASSWORD",
+    "MSG_NO_ACCOUNT",
+    "MSG_NO_LOGIN_SESSION",
+    "MSG_PHONE_BLOCKED",
+    "MSG_PHONE_NO_SMS",
+    "ModeratorReportForm",
+    "NewEmailAddressForm",
+    "NewPhoneForm",
+    "OrganizationForm",
+    "OrganizationMembershipForm",
+    "OtpForm",
+    "PasswordChangeForm",
+    "PasswordCreateForm",
+    "PasswordForm",
+    "PasswordPolicyForm",
+    "PasswordResetForm",
+    "PasswordResetRequestForm",
+    "PhoneNumberAvailable",
+    "PhonePrimaryForm",
+    "ProfileBannerForm",
+    "ProfileForm",
+    "ProfileLogoForm",
+    "ProfileTransitionForm",
+    "ProjectBannerForm",
+    "ProjectBoxofficeForm",
+    "ProjectCfpTransitionForm",
+    "ProjectCrewMembershipForm",
+    "ProjectCrewMembershipInviteForm",
+    "ProjectFeaturedForm",
+    "ProjectForm",
+    "ProjectLivestreamForm",
+    "ProjectNameForm",
+    "ProjectRegisterForm",
+    "ProjectSponsorForm",
+    "ProjectTransitionForm",
+    "ProposalFeaturedForm",
+    "ProposalForm",
+    "ProposalLabelsAdminForm",
+    "ProposalLabelsForm",
+    "ProposalMemberForm",
+    "ProposalMoveForm",
+    "ProposalTransitionForm",
+    "RegisterOtpForm",
+    "RegisterWithOtp",
+    "RsvpTransitionForm",
+    "SavedProjectForm",
+    "SavedSessionForm",
+    "SessionForm",
+    "SetNotificationPreferenceForm",
+    "TeamForm",
+    "TicketClientForm",
+    "TicketEventForm",
+    "TicketParticipantBadgeForm",
+    "TicketParticipantForm",
+    "TicketTypeForm",
+    "UnsubscribeForm",
+    "UpdateForm",
+    "UserPermissionAssignForm",
+    "UsernameAvailableForm",
+    "VenueForm",
+    "VenuePrimaryForm",
+    "VenueRoomForm",
+    "account",
+    "auth_client",
+    "comment",
+    "format_json",
+    "helpers",
+    "image_url_validator",
+    "label",
+    "login",
+    "membership",
+    "notification",
+    "nullable_json_filters",
+    "nullable_strip_filters",
+    "organization",
+    "profile",
+    "project",
+    "proposal",
+    "pwned_password_validator",
+    "session",
+    "strip_filters",
+    "supported_locales",
+    "sync_ticket",
+    "timezone_identifiers",
+    "tostr",
+    "transport_labels",
+    "update",
+    "validate_and_convert_json",
+    "venue",
+    "video_url_list_validator",
+    "video_url_validator",
+]
diff --git a/funnel/forms/account.py b/funnel/forms/account.py
index 0060c8be5..8c1854e79 100644
--- a/funnel/forms/account.py
+++ b/funnel/forms/account.py
@@ -2,8 +2,9 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from hashlib import sha1
+from typing import Any
 
 import requests
 from flask import url_for
@@ -19,6 +20,7 @@
     PASSWORD_MIN_LENGTH,
     Account,
     Anchor,
+    User,
     check_password_strength,
     getuser,
 )
@@ -67,35 +69,39 @@ class PasswordStrengthValidator:
         " a mix of upper and lower case letters, numbers and symbols"
     )
 
-    def __init__(self, user_input_fields=(), message=None) -> None:
+    def __init__(
+        self, user_input_fields: Sequence[str] = (), message: str | None = None
+    ) -> None:
         self.user_input_fields = user_input_fields
         self.message = message or self.default_message
 
-    def __call__(self, form, field) -> None:
+    def __call__(self, form: forms.Form, field: forms.PasswordField) -> None:
         user_inputs = []
         for field_name in self.user_input_fields:
             user_inputs.append(getattr(form, field_name).data)
 
-        if hasattr(form, 'edit_user') and form.edit_user is not None:
-            if form.edit_user.username:
-                user_inputs.append(form.edit_user.username)
-            if form.edit_user.fullname:
-                user_inputs.append(form.edit_user.fullname)
+        if (edit_user := getattr(form, 'edit_user', None)) is not None:
+            if edit_user.username:
+                user_inputs.append(edit_user.username)
+            if edit_user.fullname:
+                user_inputs.append(edit_user.fullname)
 
-            for accountemail in form.edit_user.emails:
+            for accountemail in edit_user.emails:
                 user_inputs.append(str(accountemail))
-            for emailclaim in form.edit_user.emailclaims:
+            for emailclaim in edit_user.emailclaims:
                 user_inputs.append(str(emailclaim))
 
-            for accountphone in form.edit_user.phones:
+            for accountphone in edit_user.phones:
                 user_inputs.append(str(accountphone))
 
         tested_password = check_password_strength(
-            field.data, user_inputs=user_inputs if user_inputs else None
+            field.data or '', user_inputs=user_inputs if user_inputs else None
         )
         # Stick password strength into the form for logging in the view and possibly
         # rendering into UI
-        form.password_strength = tested_password.score
+        form.password_strength = (  # pyright: ignore[reportGeneralTypeIssues]
+            tested_password.score
+        )
         # No test failures? All good then
         if not tested_password.is_weak:
             return
@@ -109,8 +115,10 @@ def __call__(self, form, field) -> None:
         )
 
 
-def pwned_password_validator(_form, field) -> None:
+def pwned_password_validator(_form: Any, field: forms.PasswordField) -> None:
     """Validate password against the pwned password API."""
+    if field.data is None:
+        return
     phash = sha1(field.data.encode(), usedforsecurity=False).hexdigest().upper()
     prefix, suffix = phash[:5], phash[5:]
 
@@ -158,7 +166,7 @@ class PasswordForm(forms.Form):
     """Form to validate a user's password, for password-gated sudo actions."""
 
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
 
     password = forms.PasswordField(
         __("Password"),
@@ -181,7 +189,7 @@ class PasswordPolicyForm(forms.Form):
 
     __expects__ = ('edit_user',)
     __returns__ = ('password_strength', 'is_weak', 'warning', 'suggestions')
-    edit_user: Account
+    edit_user: User
     password_strength: int | None = None
     is_weak: bool | None = None
     warning: str | None = None
@@ -196,7 +204,7 @@ class PasswordPolicyForm(forms.Form):
     )
 
     def validate_password(self, field: forms.Field) -> None:
-        """Test password strength and save resuls (no errors raised)."""
+        """Test password strength and save results (no errors raised)."""
         user_inputs = []
 
         if self.edit_user:
@@ -252,7 +260,7 @@ class PasswordCreateForm(forms.Form):
 
     __returns__ = ('password_strength',)
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
     password_strength: int | None = None
 
     password = forms.PasswordField(
@@ -282,6 +290,7 @@ class PasswordResetForm(forms.Form):
 
     __returns__ = ('password_strength',)
     password_strength: int | None = None
+    edit_user: User
 
     # TODO: This form has been deprecated with OTP-based reset as that doesn't need
     # username and now uses :class:`PasswordCreateForm`. This form is retained in the
@@ -334,7 +343,7 @@ class PasswordChangeForm(forms.Form):
 
     __returns__ = ('password_strength',)
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
     password_strength: int | None = None
 
     old_password = forms.PasswordField(
@@ -473,7 +482,7 @@ class UsernameAvailableForm(forms.Form):
     """Form to check for whether a username is available to use."""
 
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
 
     username = forms.StringField(
         __("Username"),
@@ -501,7 +510,7 @@ class EnableNotificationsDescriptionProtoMixin:
 
     enable_notifications: forms.Field
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Change the description to include a link."""
         self.enable_notifications.description = Markup(
             _(
@@ -519,7 +528,7 @@ class NewEmailAddressForm(
     """Form to add a new email address to an account."""
 
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
 
     email = forms.EmailField(
         __("Email address"),
@@ -566,7 +575,7 @@ class NewPhoneForm(EnableNotificationsDescriptionProtoMixin, forms.RecaptchaForm
     """Form to add a new mobile number (SMS-capable) to an account."""
 
     __expects__ = ('edit_user',)
-    edit_user: Account
+    edit_user: User
 
     phone = forms.TelField(
         __("Phone number"),
@@ -613,7 +622,7 @@ class ModeratorReportForm(forms.Form):
         __("Report type"), coerce=int, validators=[forms.validators.InputRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.report_type.choices = [
             (idx, report_type.title)
diff --git a/funnel/forms/auth_client.py b/funnel/forms/auth_client.py
index bc2b5db87..7a5597ae3 100644
--- a/funnel/forms/auth_client.py
+++ b/funnel/forms/auth_client.py
@@ -12,6 +12,7 @@
     AuthClient,
     AuthClientCredential,
     AuthClientPermissions,
+    User,
     valid_name,
 )
 from .helpers import strip_filters
@@ -29,7 +30,8 @@ class AuthClientForm(forms.Form):
     """Register a new OAuth client application."""
 
     __returns__ = ('account',)
-    account: Account | None = None
+    edit_user: User
+    account: Account
 
     title = forms.StringField(
         __("Application title"),
@@ -127,7 +129,7 @@ def _urls_match(self, url1: str, url2: str) -> bool:
     def validate_redirect_uri(self, field: forms.Field) -> None:
         """Validate redirect URI points to the website for confidential clients."""
         if self.confidential.data and not self._urls_match(
-            self.website.data, field.data
+            self.website.data or '', field.data
         ):
             raise forms.validators.ValidationError(
                 _("The scheme, domain and port must match that of the website URL")
diff --git a/funnel/forms/helpers.py b/funnel/forms/helpers.py
index cbebf8c30..d789aafb0 100644
--- a/funnel/forms/helpers.py
+++ b/funnel/forms/helpers.py
@@ -9,9 +9,9 @@
 from flask import flash
 
 from baseframe import _, __, forms
-from coaster.auth import current_auth
 
 from .. import app
+from ..auth import current_auth
 from ..models import (
     Account,
     AccountEmailClaim,
@@ -40,7 +40,7 @@
 class AccountSelectField(forms.AutocompleteField):
     """Render an autocomplete field for selecting an account."""
 
-    data: Account | None  # type: ignore[assignment]
+    data: Account | None  # type: ignore[assignment]  # FIXME
     widget = forms.Select2Widget()
     multiple = False
     widget_autocomplete = True
@@ -48,7 +48,7 @@ class AccountSelectField(forms.AutocompleteField):
     def _value(self) -> str:
         """Return value for HTML rendering."""
         if self.data is not None:
-            return self.data.name
+            return self.data.name or ''
         return ''
 
     def process_formdata(self, valuelist: Sequence[str]) -> None:
@@ -83,9 +83,7 @@ def __init__(self, purpose: Literal['use', 'claim', 'register']) -> None:
 
     def __call__(self, form: forms.Form, field: forms.Field) -> None:
         # Get actor (from form, or current_auth.actor)
-        actor: User | None = None
-        if hasattr(form, 'edit_user'):
-            actor = form.edit_user
+        actor: User | None = getattr(form, 'edit_user', None)
         if actor is None:
             actor = current_auth.actor
 
@@ -174,9 +172,7 @@ def __init__(self, purpose: Literal['use', 'claim', 'register']) -> None:
 
     def __call__(self, form: forms.Form, field: forms.Field) -> None:
         # Get actor (from existing obj, or current_auth.actor)
-        actor: User | None = None
-        if hasattr(form, 'edit_user'):
-            actor = form.edit_user
+        actor: User | None = getattr(form, 'edit_user', None)
         if actor is None:
             actor = current_auth.actor
 
@@ -235,9 +231,7 @@ def image_url_validator() -> forms.validators.ValidUrl:
     """Customise ValidUrl for hosted image URL validation."""
     return forms.validators.ValidUrl(
         allowed_schemes=lambda: app.config.get('IMAGE_URL_SCHEMES', ('https',)),
-        allowed_domains=lambda: app.config.get(  # type: ignore[arg-type, return-value]
-            'IMAGE_URL_DOMAINS'
-        ),
+        allowed_domains=lambda: app.config.get('IMAGE_URL_DOMAINS'),
         message_schemes=__("A https:// URL is required"),
         message_domains=__("Images must be hosted at images.hasgeek.com"),
     )
diff --git a/funnel/forms/login.py b/funnel/forms/login.py
index a4111157d..4d5aa2646 100644
--- a/funnel/forms/login.py
+++ b/funnel/forms/login.py
@@ -9,9 +9,7 @@
 from ..models import (
     PASSWORD_MAX_LENGTH,
     Account,
-    AccountEmail,
-    AccountEmailClaim,
-    AccountPhone,
+    Anchor,
     EmailAddress,
     EmailAddressBlockedError,
     LoginSession,
@@ -74,11 +72,11 @@ class PasswordlessLoginIntercept:
 
     message = __("Password is required")
 
-    def __call__(self, form, field) -> None:
+    def __call__(self, form: LoginForm, field: forms.PasswordField) -> None:
         if not field.data:
             # Use getattr for when :meth:`LoginForm.validate_username` is skipped
             if getattr(form, 'anchor', None) is not None:
-                # If user has an anchor, we can allow login to proceed passwordless
+                # If user has an anchor, we can allow login to proceed password-less
                 # using an OTP or email link
                 raise LoginWithOtp()
             if (
@@ -123,7 +121,7 @@ class LoginForm(forms.RecaptchaForm):
 
     __returns__ = ('user', 'anchor', 'weak_password', 'new_email', 'new_phone')
     user: Account | None = None
-    anchor: AccountEmail | AccountEmailClaim | AccountPhone | None = None
+    anchor: Anchor | None = None
     weak_password: bool | None = None
     new_email: str | None = None
     new_phone: str | None = None
@@ -195,7 +193,7 @@ def validate_password(self, field: forms.Field) -> None:
         """Validate password if provided."""
         # If there is already an error in the password field, don't bother validating.
         # This will be a `Length` validation error, but that one unfortunately does not
-        # raise `StopValidation`. If the length is off, we can end rightaway.
+        # raise `StopValidation`. If the length is off, we can end right away.
         if field.errors:
             return
 
@@ -244,7 +242,7 @@ def validate_password(self, field: forms.Field) -> None:
         # supports both outcomes.
 
         # `check_password_strength(password).is_weak` is a bool
-        self.weak_password: bool = check_password_strength(field.data).is_weak
+        self.weak_password = check_password_strength(field.data).is_weak
 
 
 @Account.forms('logout')
@@ -299,8 +297,7 @@ def validate_otp(self, field: forms.Field) -> None:
 class EmailOtpForm(OtpForm):
     """Verify an OTP sent to email."""
 
-    def set_queries(self) -> None:
-        super().set_queries()
+    def __post_init__(self) -> None:
         self.otp.description = _("One-time password sent to your email address")
 
 
diff --git a/funnel/forms/membership.py b/funnel/forms/membership.py
index 7acd78465..e740e94a8 100644
--- a/funnel/forms/membership.py
+++ b/funnel/forms/membership.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from baseframe import _, __, forms
 from coaster.utils import getbool
 
@@ -72,7 +74,7 @@ class ProjectCrewMembershipForm(forms.Form):
         filters=nullable_strip_filters,
     )
 
-    def validate(self, *args, **kwargs) -> bool:
+    def validate(self, *args: Any, **kwargs: Any) -> bool:
         """Validate form."""
         is_valid = super().validate(*args, **kwargs)
         if not any([self.is_editor.data, self.is_promoter.data, self.is_usher.data]):
diff --git a/funnel/forms/notification.py b/funnel/forms/notification.py
index bc8342fde..b5746074a 100644
--- a/funnel/forms/notification.py
+++ b/funnel/forms/notification.py
@@ -101,18 +101,6 @@ class TransportLabels:
         disabled_main=__("Disabled all WhatsApp notifications"),
         disabled=__("Disabled this WhatsApp notification"),
     ),
-    'signal': TransportLabels(
-        title=__("Signal"),
-        requirement=__("To enable, add your Signal number"),
-        requirement_action=lambda: url_for('add_phone'),
-        unsubscribe_form=__("Notify me on Signal (beta)"),
-        unsubscribe_description=__("Uncheck this to disable all Signal notifications"),
-        switch=__("Signal notifications"),
-        enabled_main=__("Enabled selected Signal notifications"),
-        enabled=__("Enabled this Signal notification"),
-        disabled_main=__("Disabled all Signal notifications"),
-        disabled=__("Disabled this Signal notification"),
-    ),
 }
 
 
@@ -155,7 +143,7 @@ class UnsubscribeForm(forms.Form):
         __("Unsubscribe token type"), validators=[forms.validators.DataRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         # Populate choices with all notification types that the user has a preference
         # row for.
@@ -177,11 +165,11 @@ def set_queries(self) -> None:
             and nvalue.allow_transport(self.transport)
         ]  # Sorted by definition order. Usable until we introduce grouping
 
-    def get_main(self, obj) -> bool:
+    def get_main(self, obj: Account) -> bool:
         """Get main preferences switch (global enable/disable)."""
         return obj.main_notification_preferences.by_transport(self.transport)
 
-    def get_types(self, obj) -> list[str]:
+    def get_types(self, obj: Account) -> list[str]:
         """Get status for each notification type for the selected transport."""
         # Populate data with all notification types for which the user has the
         # current transport enabled
@@ -191,16 +179,16 @@ def get_types(self, obj) -> list[str]:
             if user_prefs.by_transport(self.transport)
         ]
 
-    def set_main(self, obj) -> None:
+    def set_main(self, obj: Account) -> None:
         """Set main preferences switch (global enable/disable)."""
         obj.main_notification_preferences.set_transport(self.transport, self.main.data)
 
-    def set_types(self, obj) -> None:
+    def set_types(self, obj: Account) -> None:
         """Set status for each notification type for the selected transport."""
         # self.types.data will only contain the enabled preferences. Therefore, iterate
         # through all choices and toggle true or false based on whether it's in the
         # enabled list. This uses dict access instead of .get because the rows are known
-        # to exist (set_queries loaded from this source).
+        # to exist (`__post_init__` loaded from this source).
         for ntype, _title in self.types.choices:
             obj.notification_preferences[ntype].set_transport(
                 self.transport, ntype in self.types.data
@@ -217,7 +205,7 @@ class SetNotificationPreferenceForm(forms.Form):
     )
     enabled = forms.BooleanField(__("Enable this transport"))
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         # The main switch is special-cased with an empty string for notification type
         self.notification_type.choices = [('', __("Main switch"))] + [
@@ -229,7 +217,7 @@ def set_queries(self) -> None:
             if is_available
         ]
 
-    def status_message(self):
+    def status_message(self) -> str:
         """Render a success or error message."""
         if self.errors:
             # Flatten errors into a single string because typically this will only
diff --git a/funnel/forms/organization.py b/funnel/forms/organization.py
index 077b96454..ee6f712ae 100644
--- a/funnel/forms/organization.py
+++ b/funnel/forms/organization.py
@@ -9,7 +9,7 @@
 
 from baseframe import _, __, forms
 
-from ..models import Account, Team
+from ..models import Account, Team, User
 
 __all__ = ['OrganizationForm', 'TeamForm']
 
@@ -19,7 +19,7 @@ class OrganizationForm(forms.Form):
     """Form for an organization's name and title."""
 
     __expects__: Iterable[str] = ('edit_user',)
-    edit_user: Account
+    edit_user: User
     edit_obj: Account | None
 
     title = forms.StringField(
diff --git a/funnel/forms/profile.py b/funnel/forms/profile.py
index 046c656cd..dc0815141 100644
--- a/funnel/forms/profile.py
+++ b/funnel/forms/profile.py
@@ -58,7 +58,7 @@ class ProfileForm(OrganizationForm):
         filters=nullable_strip_filters,
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.logo_url.profile = self.account.name or self.account.buid
 
@@ -89,7 +89,7 @@ class ProfileTransitionForm(forms.Form):
         __("Account visibility"), validators=[forms.validators.DataRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.transition.choices = list(
             self.edit_obj.profile_state.transitions().items()
@@ -117,7 +117,7 @@ class ProfileLogoForm(forms.Form):
         filters=nullable_strip_filters,
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.logo_url.widget_type = 'modal'
         self.logo_url.profile = self.account.name or self.account.buid
@@ -144,7 +144,7 @@ class ProfileBannerForm(forms.Form):
         filters=nullable_strip_filters,
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.banner_image_url.widget_type = 'modal'
         self.banner_image_url.profile = self.account.name or self.account.buid
diff --git a/funnel/forms/project.py b/funnel/forms/project.py
index e015947f5..51af407be 100644
--- a/funnel/forms/project.py
+++ b/funnel/forms/project.py
@@ -126,7 +126,7 @@ def validate_location(self, field: forms.Field) -> None:
                 __("Quotes are not necessary in the location name")
             )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         self.bg_image.profile = self.account.name or self.account.buid
         if self.edit_obj is not None and self.edit_obj.schedule_start_at:
             # Don't allow user to directly manipulate timestamps when it's done via
@@ -186,7 +186,7 @@ class ProjectNameForm(forms.Form):
     """Form to change the URL name of a project."""
 
     # TODO: Add validators for `account` and unique name here instead of delegating to
-    # the view. Also add `set_queries` method to change ``name.prefix``
+    # the view. Also add `__post_init__` method to change ``name.prefix``
 
     name = forms.AnnotatedTextField(
         __("Custom URL"),
@@ -197,7 +197,11 @@ class ProjectNameForm(forms.Form):
         ),
         validators=[
             forms.validators.DataRequired(),
-            forms.validators.Length(max=Project.__name_length__),
+            forms.validators.Length(
+                max=Project.__name_length__
+                if Project.__name_length__ is not None
+                else -1
+            ),
             forms.validators.ValidName(
                 __(
                     "This URL contains unsupported characters. It can contain lowercase"
@@ -232,7 +236,7 @@ class ProjectBannerForm(forms.Form):
         filters=nullable_strip_filters,
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.bg_image.widget_type = 'modal'
         self.bg_image.profile = self.account.name or self.account.buid
@@ -276,7 +280,7 @@ class ProjectTransitionForm(forms.Form):
         __("Status"), validators=[forms.validators.DataRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.transition.choices = list(self.edit_obj.state.transitions().items())
 
@@ -345,7 +349,7 @@ class RsvpTransitionForm(forms.Form):
         __("Status"), validators=[forms.validators.DataRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         # Usually you need to use an instance's state.transitions to find
         # all the valid transitions for the current state of the instance.
@@ -354,7 +358,7 @@ def set_queries(self) -> None:
         # options in the form even without an Rsvp instance.
         self.transition.choices = [
             (transition_name, getattr(Rsvp, transition_name))
-            for transition_name in Rsvp.state.statemanager.transitions
+            for transition_name in Rsvp.state.transitions
         ]
 
 
diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index a7e677ff5..deb243220 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -125,7 +125,7 @@ class ProposalLabelsForm(forms.Form):
     edit_parent: Project
     formlabels = forms.FormField(forms.Form, __("Labels"))
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.formlabels.form = proposal_label_form(
             project=self.edit_parent, proposal=self.edit_obj
@@ -139,7 +139,7 @@ class ProposalLabelsAdminForm(forms.Form):
     edit_parent: Project
     formlabels = forms.FormField(forms.Form, __("Labels"))
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.formlabels.form = proposal_label_admin_form(
             project=self.edit_parent, proposal=self.edit_obj
@@ -175,7 +175,7 @@ class ProposalForm(forms.Form):
     )
     formlabels = forms.FormField(forms.Form, __("Labels"))
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         label_form = proposal_label_form(
             project=self.edit_parent, proposal=self.edit_obj
@@ -229,7 +229,7 @@ class ProposalTransitionForm(forms.Form):
         __("Status"), validators=[forms.validators.DataRequired()]
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         # value: transition method name
         # label: transition object itself
@@ -251,6 +251,6 @@ class ProposalMoveForm(forms.Form):
         get_label='title',
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.target.query = self.user.projects_as_editor
diff --git a/funnel/forms/sync_ticket.py b/funnel/forms/sync_ticket.py
index 4a7445ffa..f4f5a03b4 100644
--- a/funnel/forms/sync_ticket.py
+++ b/funnel/forms/sync_ticket.py
@@ -3,16 +3,17 @@
 from __future__ import annotations
 
 import json
+from typing import Any
 
 from markupsafe import Markup
 
 from baseframe import __, forms
 
 from ..models import (
-    PROJECT_RSVP_STATE,
     Account,
     AccountEmail,
     Project,
+    ProjectRsvpStateEnum,
     TicketClient,
     TicketEvent,
     TicketParticipant,
@@ -71,8 +72,8 @@ class ProjectBoxofficeForm(forms.Form):
     )
     rsvp_state = forms.RadioField(
         __("Registrations"),
-        choices=PROJECT_RSVP_STATE.items(),
-        default=PROJECT_RSVP_STATE.NONE,
+        choices=[(int(member.value), member.title) for member in ProjectRsvpStateEnum],
+        default=int(ProjectRsvpStateEnum.NONE),
     )
     is_subscription = forms.BooleanField(
         __("Paid tickets are for a subscription"),
@@ -94,7 +95,7 @@ class ProjectBoxofficeForm(forms.Form):
         validators=[forms.validators.Optional(), validate_and_convert_json],
     )
 
-    def set_queries(self):
+    def __post_init__(self) -> None:
         """Set form schema description."""
         self.register_form_schema.description = Markup(
             '<p>{description}</p><pre><code>{schema}</code></pre>'
@@ -214,11 +215,11 @@ class TicketParticipantForm(forms.Form):
         validators=[forms.validators.DataRequired("Select at least one event")],
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.ticket_events.query = self.edit_parent.ticket_events
 
-    def validate(self, *args, **kwargs) -> bool:
+    def validate(self, *args: Any, **kwargs: Any) -> bool:
         """Validate form."""
         result = super().validate(*args, **kwargs)
         if self.email.data is None:
diff --git a/funnel/forms/venue.py b/funnel/forms/venue.py
index b43cc44ff..8df27ce76 100644
--- a/funnel/forms/venue.py
+++ b/funnel/forms/venue.py
@@ -68,7 +68,7 @@ class VenueForm(forms.Form):
         validators=[forms.validators.Optional(), forms.validators.ValidCoordinates()],
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         pycountry_locale = gettext.translation(
             'iso3166-2', pycountry.LOCALES_DIR, languages=[str(get_locale()), 'en']
@@ -124,6 +124,6 @@ class VenuePrimaryForm(forms.Form):
         render_kw={'autocorrect': 'off', 'autocapitalize': 'off'},
     )
 
-    def set_queries(self) -> None:
+    def __post_init__(self) -> None:
         """Prepare form for use."""
         self.venue.query = self.edit_parent.venues
diff --git a/funnel/loginproviders/__init__.py b/funnel/loginproviders/__init__.py
index afd0f0eeb..2f8c5277d 100644
--- a/funnel/loginproviders/__init__.py
+++ b/funnel/loginproviders/__init__.py
@@ -1,11 +1,26 @@
 """Login provider implementations."""
-# flake8: noqa
 
-from __future__ import annotations
+# --- Everything below this line is auto-generated using `make initpy` -----------------
 
-from .github import *
-from .google import *
-from .init_app import *
-from .linkedin import *
-from .twitter import *
-from .zoom import *
+from . import github, google, helpers, linkedin, twitter, zoom
+from .github import GitHubProvider
+from .google import GoogleProvider
+from .helpers import init_app
+from .linkedin import LinkedInProvider
+from .twitter import TwitterProvider
+from .zoom import ZoomProvider
+
+__all__ = [
+    "GitHubProvider",
+    "GoogleProvider",
+    "LinkedInProvider",
+    "TwitterProvider",
+    "ZoomProvider",
+    "github",
+    "google",
+    "helpers",
+    "init_app",
+    "linkedin",
+    "twitter",
+    "zoom",
+]
diff --git a/funnel/loginproviders/github.py b/funnel/loginproviders/github.py
index b16257523..b070909dc 100644
--- a/funnel/loginproviders/github.py
+++ b/funnel/loginproviders/github.py
@@ -10,6 +10,7 @@
 from baseframe import _
 
 from ..registry import LoginCallbackError, LoginProvider, LoginProviderData
+from ..typing import ReturnView
 
 __all__ = ['GitHubProvider']
 
@@ -21,7 +22,7 @@ class GitHubProvider(LoginProvider):
     user_info_url = 'https://api.github.com/user'
     user_emails_url = 'https://api.github.com/user/emails'
 
-    def do(self, callback_url):
+    def do(self, callback_url: str) -> ReturnView:
         return redirect(
             furl(self.auth_url)
             .add(
diff --git a/funnel/loginproviders/google.py b/funnel/loginproviders/google.py
index 48d030c01..5de7eb1d9 100644
--- a/funnel/loginproviders/google.py
+++ b/funnel/loginproviders/google.py
@@ -10,6 +10,7 @@
 from baseframe import _
 
 from ..registry import LoginCallbackError, LoginProvider, LoginProviderData
+from ..typing import ReturnView
 
 __all__ = ['GoogleProvider']
 
@@ -17,7 +18,7 @@
 class GoogleProvider(LoginProvider):
     info_url = 'https://www.googleapis.com/oauth2/v2/userinfo'
 
-    def flow(self, callback_url: str):
+    def flow(self, callback_url: str) -> client.OAuth2WebServerFlow:
         return client.OAuth2WebServerFlow(
             client_id=self.key,
             client_secret=self.secret,
@@ -25,7 +26,7 @@ def flow(self, callback_url: str):
             redirect_uri=callback_url,
         )
 
-    def do(self, callback_url: str):
+    def do(self, callback_url: str) -> ReturnView:
         session['oauth_callback'] = callback_url
         return redirect(self.flow(callback_url).step1_get_authorize_url())
 
diff --git a/funnel/loginproviders/init_app.py b/funnel/loginproviders/helpers.py
similarity index 97%
rename from funnel/loginproviders/init_app.py
rename to funnel/loginproviders/helpers.py
index 7dcb7717f..2217f1480 100644
--- a/funnel/loginproviders/init_app.py
+++ b/funnel/loginproviders/helpers.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from flask import Flask
+
 from baseframe import __
 
 from ..registry import login_registry
@@ -12,7 +14,7 @@
 from .zoom import ZoomProvider
 
 
-def init_app(app):
+def init_app(app: Flask) -> None:
     # Register some login providers
     if app.config.get('OAUTH_GOOGLE_KEY') and app.config.get('OAUTH_GOOGLE_SECRET'):
         login_registry['google'] = GoogleProvider(
diff --git a/funnel/loginproviders/linkedin.py b/funnel/loginproviders/linkedin.py
index 9920ca266..48bd4e1bd 100644
--- a/funnel/loginproviders/linkedin.py
+++ b/funnel/loginproviders/linkedin.py
@@ -12,6 +12,7 @@
 from baseframe import _
 
 from ..registry import LoginCallbackError, LoginProvider, LoginProviderData
+from ..typing import ReturnView
 
 __all__ = ['LinkedInProvider']
 
@@ -28,7 +29,7 @@ class LinkedInProvider(LoginProvider):
         'q=members&projection=(elements*(handle~))'
     )
 
-    def do(self, callback_url):
+    def do(self, callback_url: str) -> ReturnView:
         session['oauth_state'] = token_urlsafe()
         session['oauth_callback'] = callback_url
         return redirect(
diff --git a/funnel/loginproviders/twitter.py b/funnel/loginproviders/twitter.py
index 243d99714..a8b77ddf7 100644
--- a/funnel/loginproviders/twitter.py
+++ b/funnel/loginproviders/twitter.py
@@ -13,6 +13,7 @@
     LoginProvider,
     LoginProviderData,
 )
+from ..typing import ReturnView
 
 __all__ = ['TwitterProvider']
 
@@ -20,13 +21,13 @@
 class TwitterProvider(LoginProvider):
     at_username = True
 
-    def do(self, callback_url):
+    def do(self, callback_url: str) -> ReturnView:
         auth = tweepy.OAuthHandler(self.key, self.secret, callback_url)
 
         try:
             redirect_url = auth.get_authorization_url()
             return redirect(redirect_url)
-        except tweepy.errors.TweepyException as exc:
+        except tweepy.TweepyException as exc:
             raise LoginInitError(
                 _("Twitter had a temporary problem. Try again?")
             ) from exc
@@ -54,7 +55,7 @@ def callback(self) -> LoginProviderData:
             twuser = api.verify_credentials(
                 include_entities='false', skip_status='true', include_email='true'
             )
-        except tweepy.errors.TweepyException as exc:
+        except tweepy.TweepyException as exc:
             raise LoginCallbackError(
                 _("Twitter had an intermittent problem. Try again?")
             ) from exc
diff --git a/funnel/loginproviders/zoom.py b/funnel/loginproviders/zoom.py
index 9478548e9..8be72b3e6 100644
--- a/funnel/loginproviders/zoom.py
+++ b/funnel/loginproviders/zoom.py
@@ -12,6 +12,7 @@
 from baseframe import _
 
 from ..registry import LoginCallbackError, LoginProvider, LoginProviderData
+from ..typing import ReturnView
 
 __all__ = ['ZoomProvider']
 
@@ -22,7 +23,7 @@ class ZoomProvider(LoginProvider):
     token_url = 'https://zoom.us/oauth/token?grant_type=authorization_code'  # nosec
     user_info_url = 'https://api.zoom.us/v2/users/me'  # nosec
 
-    def do(self, callback_url):
+    def do(self, callback_url: str) -> ReturnView:
         session['oauth_callback'] = callback_url
         return redirect(
             furl(self.auth_url)
diff --git a/funnel/models/__init__.py b/funnel/models/__init__.py
index eb243c69d..dd9160679 100644
--- a/funnel/models/__init__.py
+++ b/funnel/models/__init__.py
@@ -1,97 +1,251 @@
 """Provide configuration for models and import all into a common `models` namespace."""
-# flake8: noqa
-# pylint: disable=unused-import
+# pyright: reportUnsupportedDunderAll=false
 
-from __future__ import annotations
+# The second half of this file is dynamically generated. Run `make initpy` to
+# regenerate. Since lazy_loader is opaque to static type checkers, there's an overriding
+# `__init__.pyi` file that is also autogenerated. Pylint does not process the .pyi file,
+# so some tests cause false positives and must be disabled (see `pyproject.toml`)
 
-import sqlalchemy as sa
-from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy.dialects import postgresql
-from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm import DeclarativeBase, Mapped, declarative_mixin, declared_attr
-from sqlalchemy_utils import LocaleType, TimezoneType, TSVectorType
+__protected__ = ['types']
 
-from coaster.sqlalchemy import (
-    BaseIdNameMixin,
-    BaseMixin,
-    BaseNameMixin,
-    BaseScopedIdMixin,
-    BaseScopedIdNameMixin,
-    BaseScopedNameMixin,
-    CoordinatesMixin,
-    DynamicMapped,
-    ModelBase,
-    NoIdMixin,
-    Query,
-    QueryProperty,
-    RegistryMixin,
-    RoleMixin,
-    TimestampMixin,
-    UrlType,
-    UuidMixin,
-    backref,
-    relationship,
-    with_roles,
-)
+# --- Everything below this line is auto-generated using `make initpy` -----------------
 
+import lazy_loader
 
-class Model(ModelBase, DeclarativeBase):
-    """Base for all models."""
+__getattr__, __dir__, __all__ = lazy_loader.attach_stub(__name__, __file__)
 
-    __with_timezone__ = True
-
-
-class GeonameModel(ModelBase, DeclarativeBase):
-    """Base for geoname models."""
-
-    __bind_key__ = 'geoname'
-    __with_timezone__ = True
-
-
-# This must be set _before_ any of the models using db.Model are imported
-TimestampMixin.__with_timezone__ = True
-
-db = SQLAlchemy(query_class=Query, metadata=Model.metadata)  # type: ignore[arg-type]
-Model.init_flask_sqlalchemy(db)
-GeonameModel.init_flask_sqlalchemy(db)
-
-# Some of these imports are order sensitive due to circular dependencies
-# All of them have to be imported after TimestampMixin is patched
-
-# pylint: disable=wrong-import-position
-from . import types  # isort:skip
-from .helpers import *  # isort:skip
-from .account import *  # isort:skip
-from .user_signals import *  # isort:skip
-from .login_session import *  # isort:skip
-from .email_address import *  # isort:skip
-from .phone_number import *  # isort:skip
-from .auth_client import *  # isort:skip
-from .utils import *  # isort:skip
-from .comment import *  # isort:skip
-from .draft import *  # isort:skip
-from .sync_ticket import *  # isort:skip
-from .contact_exchange import *  # isort:skip
-from .label import *  # isort:skip
-from .project import *  # isort:skip
-from .update import *  # isort:skip
-from .proposal import *  # isort:skip
-from .rsvp import *  # isort:skip
-from .saved import *  # isort:skip
-from .session import *  # isort:skip
-from .shortlink import *  # isort:skip
-from .venue import *  # isort:skip
-from .video_mixin import *  # isort:skip
-from .mailer import *  # isort:skip
-from .membership_mixin import *  # isort:skip
-from .account_membership import *  # isort:skip
-from .project_membership import *  # isort:skip
-from .sponsor_membership import *  # isort:skip
-from .proposal_membership import *  # isort:skip
-from .site_membership import *  # isort:skip
-from .moderation import *  # isort:skip
-from .commentset_membership import *  # isort:skip
-from .geoname import *  # isort:skip
-from .typing import *  # isort:skip
-from .notification import *  # isort:skip
-from .notification_types import *  # isort:skip
+__all__ = [
+    "ACCOUNT_STATE",
+    "Account",
+    "AccountAndAnchor",
+    "AccountEmail",
+    "AccountEmailClaim",
+    "AccountExternalId",
+    "AccountMembership",
+    "AccountOldId",
+    "AccountPasswordNotification",
+    "AccountPhone",
+    "Anchor",
+    "AuthClient",
+    "AuthClientCredential",
+    "AuthClientPermissions",
+    "AuthClientTeamPermissions",
+    "AuthCode",
+    "AuthToken",
+    "BaseIdNameMixin",
+    "BaseMixin",
+    "BaseNameMixin",
+    "BaseScopedIdMixin",
+    "BaseScopedIdNameMixin",
+    "BaseScopedNameMixin",
+    "Comment",
+    "CommentModeratorReport",
+    "CommentReplyNotification",
+    "CommentReportReceivedNotification",
+    "Commentset",
+    "CommentsetMembership",
+    "ContactExchange",
+    "CoordinatesMixin",
+    "Draft",
+    "DuckTypeAccount",
+    "DynamicMapped",
+    "EMAIL_DELIVERY_STATE",
+    "EmailAddress",
+    "EmailAddressBlockedError",
+    "EmailAddressError",
+    "EmailAddressInUseError",
+    "EmailAddressMixin",
+    "GeoAdmin1Code",
+    "GeoAdmin2Code",
+    "GeoAltName",
+    "GeoCountryInfo",
+    "GeoName",
+    "GeonameModel",
+    "ImgeeFurl",
+    "ImgeeType",
+    "IncompleteUserMigrationError",
+    "IntTitle",
+    "LOGIN_SESSION_VALIDITY_PERIOD",
+    "Label",
+    "LocaleType",
+    "LoginSession",
+    "LoginSessionError",
+    "LoginSessionExpiredError",
+    "LoginSessionInactiveUserError",
+    "LoginSessionRevokedError",
+    "MODERATOR_REPORT_TYPE",
+    "Mailer",
+    "MailerDraft",
+    "MailerRecipient",
+    "MailerState",
+    "Mapped",
+    "MarkdownCompositeBase",
+    "MarkdownCompositeBasic",
+    "MarkdownCompositeDocument",
+    "MarkdownCompositeInline",
+    "MembershipError",
+    "MembershipRecordTypeEnum",
+    "MembershipRecordTypeError",
+    "MembershipRevokedError",
+    "Model",
+    "ModelBase",
+    "ModelIdProtocol",
+    "ModelProtocol",
+    "ModelRoleProtocol",
+    "ModelSearchProtocol",
+    "ModelTimestampProtocol",
+    "ModelUrlProtocol",
+    "ModelUuidProtocol",
+    "NewCommentNotification",
+    "NewUpdateNotification",
+    "NoIdMixin",
+    "Notification",
+    "NotificationFor",
+    "NotificationPreferences",
+    "NotificationRecipient",
+    "NotificationType",
+    "OptionalEmailAddressMixin",
+    "OptionalPhoneNumberMixin",
+    "Organization",
+    "OrganizationAdminMembershipNotification",
+    "OrganizationAdminMembershipRevokedNotification",
+    "PASSWORD_MAX_LENGTH",
+    "PASSWORD_MIN_LENGTH",
+    "PROPOSAL_STATE",
+    "PhoneNumber",
+    "PhoneNumberBlockedError",
+    "PhoneNumberError",
+    "PhoneNumberInUseError",
+    "PhoneNumberInvalidError",
+    "PhoneNumberMixin",
+    "Placeholder",
+    "PreviewNotification",
+    "Project",
+    "ProjectCrewMembershipNotification",
+    "ProjectCrewMembershipRevokedNotification",
+    "ProjectLocation",
+    "ProjectMembership",
+    "ProjectRedirect",
+    "ProjectRsvpStateEnum",
+    "ProjectSponsorMembership",
+    "ProjectStartingNotification",
+    "Proposal",
+    "ProposalLabelProxy",
+    "ProposalLabelProxyWrapper",
+    "ProposalMembership",
+    "ProposalReceivedNotification",
+    "ProposalSponsorMembership",
+    "ProposalSubmittedNotification",
+    "ProposalSuuidRedirect",
+    "Query",
+    "QueryProperty",
+    "RESERVED_NAMES",
+    "RSVP_STATUS",
+    "RegistrationCancellationNotification",
+    "RegistrationConfirmationNotification",
+    "RegistryMixin",
+    "ReorderMixin",
+    "RoleMixin",
+    "Rsvp",
+    "RsvpStateEnum",
+    "SavedProject",
+    "SavedSession",
+    "Session",
+    "Shortlink",
+    "SiteMembership",
+    "SmsMessage",
+    "SmsStatusEnum",
+    "SyncTicket",
+    "TSVectorType",
+    "Team",
+    "TicketClient",
+    "TicketEvent",
+    "TicketEventParticipant",
+    "TicketParticipant",
+    "TicketType",
+    "TimestampMixin",
+    "TimezoneType",
+    "Update",
+    "UrlType",
+    "User",
+    "UuidMixin",
+    "Venue",
+    "VenueRoom",
+    "VideoError",
+    "VideoMixin",
+    "account",
+    "account_membership",
+    "add_search_trigger",
+    "add_to_class",
+    "auth_client",
+    "auth_client_login_session",
+    "backref",
+    "base",
+    "canonical_phone_number",
+    "check_password_strength",
+    "comment",
+    "commentset_membership",
+    "contact_exchange",
+    "db",
+    "declarative_mixin",
+    "declared_attr",
+    "deleted_account",
+    "draft",
+    "email_address",
+    "geoname",
+    "getextid",
+    "getuser",
+    "helpers",
+    "hybrid_property",
+    "label",
+    "login_session",
+    "mailer",
+    "membership_mixin",
+    "merge_accounts",
+    "moderation",
+    "notification",
+    "notification_categories",
+    "notification_type_registry",
+    "notification_types",
+    "notification_web_types",
+    "parse_phone_number",
+    "parse_video_url",
+    "phone_blake2b160_hash",
+    "phone_number",
+    "postgresql",
+    "profanity",
+    "project",
+    "project_child_role_map",
+    "project_child_role_set",
+    "project_membership",
+    "proposal",
+    "proposal_membership",
+    "quote_autocomplete_like",
+    "quote_autocomplete_tsquery",
+    "relationship",
+    "removed_account",
+    "reorder_mixin",
+    "rsvp",
+    "sa",
+    "sa_exc",
+    "sa_orm",
+    "saved",
+    "session",
+    "shortlink",
+    "site_membership",
+    "sponsor_membership",
+    "sync_ticket",
+    "types",
+    "typing",
+    "unknown_account",
+    "update",
+    "user_signals",
+    "utils",
+    "valid_account_name",
+    "valid_name",
+    "validate_phone_number",
+    "venue",
+    "video_mixin",
+    "visual_field_delimiter",
+    "with_roles",
+]
diff --git a/funnel/models/__init__.pyi b/funnel/models/__init__.pyi
new file mode 100644
index 000000000..ea0833f14
--- /dev/null
+++ b/funnel/models/__init__.pyi
@@ -0,0 +1,476 @@
+from . import (
+    account,
+    account_membership,
+    auth_client,
+    base,
+    comment,
+    commentset_membership,
+    contact_exchange,
+    draft,
+    email_address,
+    geoname,
+    helpers,
+    label,
+    login_session,
+    mailer,
+    membership_mixin,
+    moderation,
+    notification,
+    notification_types,
+    phone_number,
+    project,
+    project_membership,
+    proposal,
+    proposal_membership,
+    reorder_mixin,
+    rsvp,
+    saved,
+    session,
+    shortlink,
+    site_membership,
+    sponsor_membership,
+    sync_ticket,
+    types,
+    typing,
+    update,
+    user_signals,
+    utils,
+    venue,
+    video_mixin,
+)
+from .account import (
+    ACCOUNT_STATE,
+    Account,
+    AccountEmail,
+    AccountEmailClaim,
+    AccountExternalId,
+    AccountOldId,
+    AccountPhone,
+    Anchor,
+    DuckTypeAccount,
+    Organization,
+    Placeholder,
+    Team,
+    User,
+    deleted_account,
+    removed_account,
+    unknown_account,
+)
+from .account_membership import AccountMembership
+from .auth_client import (
+    AuthClient,
+    AuthClientCredential,
+    AuthClientPermissions,
+    AuthClientTeamPermissions,
+    AuthCode,
+    AuthToken,
+)
+from .base import (
+    BaseIdNameMixin,
+    BaseMixin,
+    BaseNameMixin,
+    BaseScopedIdMixin,
+    BaseScopedIdNameMixin,
+    BaseScopedNameMixin,
+    CoordinatesMixin,
+    DynamicMapped,
+    GeonameModel,
+    LocaleType,
+    Mapped,
+    Model,
+    ModelBase,
+    NoIdMixin,
+    Query,
+    QueryProperty,
+    RegistryMixin,
+    RoleMixin,
+    TimestampMixin,
+    TimezoneType,
+    TSVectorType,
+    UrlType,
+    UuidMixin,
+    backref,
+    db,
+    declarative_mixin,
+    declared_attr,
+    hybrid_property,
+    postgresql,
+    relationship,
+    sa,
+    sa_exc,
+    sa_orm,
+    with_roles,
+)
+from .comment import Comment, Commentset
+from .commentset_membership import CommentsetMembership
+from .contact_exchange import ContactExchange
+from .draft import Draft
+from .email_address import (
+    EMAIL_DELIVERY_STATE,
+    EmailAddress,
+    EmailAddressBlockedError,
+    EmailAddressError,
+    EmailAddressInUseError,
+    EmailAddressMixin,
+    OptionalEmailAddressMixin,
+)
+from .geoname import GeoAdmin1Code, GeoAdmin2Code, GeoAltName, GeoCountryInfo, GeoName
+from .helpers import (
+    PASSWORD_MAX_LENGTH,
+    PASSWORD_MIN_LENGTH,
+    RESERVED_NAMES,
+    ImgeeFurl,
+    ImgeeType,
+    IntTitle,
+    MarkdownCompositeBase,
+    MarkdownCompositeBasic,
+    MarkdownCompositeDocument,
+    MarkdownCompositeInline,
+    add_search_trigger,
+    add_to_class,
+    check_password_strength,
+    profanity,
+    quote_autocomplete_like,
+    quote_autocomplete_tsquery,
+    valid_account_name,
+    valid_name,
+    visual_field_delimiter,
+)
+from .label import Label, ProposalLabelProxy, ProposalLabelProxyWrapper
+from .login_session import (
+    LOGIN_SESSION_VALIDITY_PERIOD,
+    LoginSession,
+    LoginSessionError,
+    LoginSessionExpiredError,
+    LoginSessionInactiveUserError,
+    LoginSessionRevokedError,
+    auth_client_login_session,
+)
+from .mailer import Mailer, MailerDraft, MailerRecipient, MailerState
+from .membership_mixin import (
+    MembershipError,
+    MembershipRecordTypeEnum,
+    MembershipRecordTypeError,
+    MembershipRevokedError,
+)
+from .moderation import MODERATOR_REPORT_TYPE, CommentModeratorReport
+from .notification import (
+    Notification,
+    NotificationFor,
+    NotificationPreferences,
+    NotificationRecipient,
+    NotificationType,
+    PreviewNotification,
+    SmsMessage,
+    SmsStatusEnum,
+    notification_categories,
+    notification_type_registry,
+    notification_web_types,
+)
+from .notification_types import (
+    AccountPasswordNotification,
+    CommentReplyNotification,
+    CommentReportReceivedNotification,
+    NewCommentNotification,
+    NewUpdateNotification,
+    OrganizationAdminMembershipNotification,
+    OrganizationAdminMembershipRevokedNotification,
+    ProjectCrewMembershipNotification,
+    ProjectCrewMembershipRevokedNotification,
+    ProjectStartingNotification,
+    ProposalReceivedNotification,
+    ProposalSubmittedNotification,
+    RegistrationCancellationNotification,
+    RegistrationConfirmationNotification,
+)
+from .phone_number import (
+    OptionalPhoneNumberMixin,
+    PhoneNumber,
+    PhoneNumberBlockedError,
+    PhoneNumberError,
+    PhoneNumberInUseError,
+    PhoneNumberInvalidError,
+    PhoneNumberMixin,
+    canonical_phone_number,
+    parse_phone_number,
+    phone_blake2b160_hash,
+    validate_phone_number,
+)
+from .project import Project, ProjectLocation, ProjectRedirect, ProjectRsvpStateEnum
+from .project_membership import (
+    ProjectMembership,
+    project_child_role_map,
+    project_child_role_set,
+)
+from .proposal import PROPOSAL_STATE, Proposal, ProposalSuuidRedirect
+from .proposal_membership import ProposalMembership
+from .reorder_mixin import ReorderMixin
+from .rsvp import RSVP_STATUS, Rsvp, RsvpStateEnum
+from .saved import SavedProject, SavedSession
+from .session import Session
+from .shortlink import Shortlink
+from .site_membership import SiteMembership
+from .sponsor_membership import ProjectSponsorMembership, ProposalSponsorMembership
+from .sync_ticket import (
+    SyncTicket,
+    TicketClient,
+    TicketEvent,
+    TicketEventParticipant,
+    TicketParticipant,
+    TicketType,
+)
+from .typing import (
+    ModelIdProtocol,
+    ModelProtocol,
+    ModelRoleProtocol,
+    ModelSearchProtocol,
+    ModelTimestampProtocol,
+    ModelUrlProtocol,
+    ModelUuidProtocol,
+)
+from .update import Update
+from .utils import (
+    AccountAndAnchor,
+    IncompleteUserMigrationError,
+    getextid,
+    getuser,
+    merge_accounts,
+)
+from .venue import Venue, VenueRoom
+from .video_mixin import VideoError, VideoMixin, parse_video_url
+
+__all__ = [
+    "ACCOUNT_STATE",
+    "Account",
+    "AccountAndAnchor",
+    "AccountEmail",
+    "AccountEmailClaim",
+    "AccountExternalId",
+    "AccountMembership",
+    "AccountOldId",
+    "AccountPasswordNotification",
+    "AccountPhone",
+    "Anchor",
+    "AuthClient",
+    "AuthClientCredential",
+    "AuthClientPermissions",
+    "AuthClientTeamPermissions",
+    "AuthCode",
+    "AuthToken",
+    "BaseIdNameMixin",
+    "BaseMixin",
+    "BaseNameMixin",
+    "BaseScopedIdMixin",
+    "BaseScopedIdNameMixin",
+    "BaseScopedNameMixin",
+    "Comment",
+    "CommentModeratorReport",
+    "CommentReplyNotification",
+    "CommentReportReceivedNotification",
+    "Commentset",
+    "CommentsetMembership",
+    "ContactExchange",
+    "CoordinatesMixin",
+    "Draft",
+    "DuckTypeAccount",
+    "DynamicMapped",
+    "EMAIL_DELIVERY_STATE",
+    "EmailAddress",
+    "EmailAddressBlockedError",
+    "EmailAddressError",
+    "EmailAddressInUseError",
+    "EmailAddressMixin",
+    "GeoAdmin1Code",
+    "GeoAdmin2Code",
+    "GeoAltName",
+    "GeoCountryInfo",
+    "GeoName",
+    "GeonameModel",
+    "ImgeeFurl",
+    "ImgeeType",
+    "IncompleteUserMigrationError",
+    "IntTitle",
+    "LOGIN_SESSION_VALIDITY_PERIOD",
+    "Label",
+    "LocaleType",
+    "LoginSession",
+    "LoginSessionError",
+    "LoginSessionExpiredError",
+    "LoginSessionInactiveUserError",
+    "LoginSessionRevokedError",
+    "MODERATOR_REPORT_TYPE",
+    "Mailer",
+    "MailerDraft",
+    "MailerRecipient",
+    "MailerState",
+    "Mapped",
+    "MarkdownCompositeBase",
+    "MarkdownCompositeBasic",
+    "MarkdownCompositeDocument",
+    "MarkdownCompositeInline",
+    "MembershipError",
+    "MembershipRecordTypeEnum",
+    "MembershipRecordTypeError",
+    "MembershipRevokedError",
+    "Model",
+    "ModelBase",
+    "ModelIdProtocol",
+    "ModelProtocol",
+    "ModelRoleProtocol",
+    "ModelSearchProtocol",
+    "ModelTimestampProtocol",
+    "ModelUrlProtocol",
+    "ModelUuidProtocol",
+    "NewCommentNotification",
+    "NewUpdateNotification",
+    "NoIdMixin",
+    "Notification",
+    "NotificationFor",
+    "NotificationPreferences",
+    "NotificationRecipient",
+    "NotificationType",
+    "OptionalEmailAddressMixin",
+    "OptionalPhoneNumberMixin",
+    "Organization",
+    "OrganizationAdminMembershipNotification",
+    "OrganizationAdminMembershipRevokedNotification",
+    "PASSWORD_MAX_LENGTH",
+    "PASSWORD_MIN_LENGTH",
+    "PROPOSAL_STATE",
+    "PhoneNumber",
+    "PhoneNumberBlockedError",
+    "PhoneNumberError",
+    "PhoneNumberInUseError",
+    "PhoneNumberInvalidError",
+    "PhoneNumberMixin",
+    "Placeholder",
+    "PreviewNotification",
+    "Project",
+    "ProjectCrewMembershipNotification",
+    "ProjectCrewMembershipRevokedNotification",
+    "ProjectLocation",
+    "ProjectMembership",
+    "ProjectRedirect",
+    "ProjectRsvpStateEnum",
+    "ProjectSponsorMembership",
+    "ProjectStartingNotification",
+    "Proposal",
+    "ProposalLabelProxy",
+    "ProposalLabelProxyWrapper",
+    "ProposalMembership",
+    "ProposalReceivedNotification",
+    "ProposalSponsorMembership",
+    "ProposalSubmittedNotification",
+    "ProposalSuuidRedirect",
+    "Query",
+    "QueryProperty",
+    "RESERVED_NAMES",
+    "RSVP_STATUS",
+    "RegistrationCancellationNotification",
+    "RegistrationConfirmationNotification",
+    "RegistryMixin",
+    "ReorderMixin",
+    "RoleMixin",
+    "Rsvp",
+    "RsvpStateEnum",
+    "SavedProject",
+    "SavedSession",
+    "Session",
+    "Shortlink",
+    "SiteMembership",
+    "SmsMessage",
+    "SmsStatusEnum",
+    "SyncTicket",
+    "TSVectorType",
+    "Team",
+    "TicketClient",
+    "TicketEvent",
+    "TicketEventParticipant",
+    "TicketParticipant",
+    "TicketType",
+    "TimestampMixin",
+    "TimezoneType",
+    "Update",
+    "UrlType",
+    "User",
+    "UuidMixin",
+    "Venue",
+    "VenueRoom",
+    "VideoError",
+    "VideoMixin",
+    "account",
+    "account_membership",
+    "add_search_trigger",
+    "add_to_class",
+    "auth_client",
+    "auth_client_login_session",
+    "backref",
+    "base",
+    "canonical_phone_number",
+    "check_password_strength",
+    "comment",
+    "commentset_membership",
+    "contact_exchange",
+    "db",
+    "declarative_mixin",
+    "declared_attr",
+    "deleted_account",
+    "draft",
+    "email_address",
+    "geoname",
+    "getextid",
+    "getuser",
+    "helpers",
+    "hybrid_property",
+    "label",
+    "login_session",
+    "mailer",
+    "membership_mixin",
+    "merge_accounts",
+    "moderation",
+    "notification",
+    "notification_categories",
+    "notification_type_registry",
+    "notification_types",
+    "notification_web_types",
+    "parse_phone_number",
+    "parse_video_url",
+    "phone_blake2b160_hash",
+    "phone_number",
+    "postgresql",
+    "profanity",
+    "project",
+    "project_child_role_map",
+    "project_child_role_set",
+    "project_membership",
+    "proposal",
+    "proposal_membership",
+    "quote_autocomplete_like",
+    "quote_autocomplete_tsquery",
+    "relationship",
+    "removed_account",
+    "reorder_mixin",
+    "rsvp",
+    "sa",
+    "sa_exc",
+    "sa_orm",
+    "saved",
+    "session",
+    "shortlink",
+    "site_membership",
+    "sponsor_membership",
+    "sync_ticket",
+    "types",
+    "typing",
+    "unknown_account",
+    "update",
+    "user_signals",
+    "utils",
+    "valid_account_name",
+    "valid_name",
+    "validate_phone_number",
+    "venue",
+    "video_mixin",
+    "visual_field_delimiter",
+    "with_roles",
+]
diff --git a/funnel/models/account.py b/funnel/models/account.py
index 4c7e40466..e3aa70c32 100644
--- a/funnel/models/account.py
+++ b/funnel/models/account.py
@@ -1,12 +1,23 @@
 """Account model with subtypes, and account-linked personal data models."""
+# pylint: disable=unnecessary-lambda,invalid-unary-operand-type
+# pyright: reportGeneralTypeIssues=false
 
 from __future__ import annotations
 
 import hashlib
 import itertools
-from collections.abc import Iterable, Iterator
-from datetime import datetime, timedelta
-from typing import ClassVar, Literal, cast, overload
+from collections.abc import Iterable, Iterator, Sequence
+from datetime import datetime
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    ClassVar,
+    Literal,
+    Self,
+    TypeAlias,
+    cast,
+    overload,
+)
 from uuid import UUID
 
 import phonenumbers
@@ -22,6 +33,7 @@
 
 from baseframe import __
 from coaster.sqlalchemy import (
+    DynamicAssociationProxy,
     LazyRoleSet,
     RoleMixin,
     StateManager,
@@ -34,7 +46,7 @@
 from coaster.utils import LabeledEnum, newsecret, require_one_of, utcnow
 
 from ..typing import OptionalMigratedTables
-from . import (
+from .base import (
     BaseMixin,
     DynamicMapped,
     LocaleType,
@@ -45,11 +57,12 @@
     TSVectorType,
     UrlType,
     UuidMixin,
-    backref,
     db,
     hybrid_property,
     relationship,
     sa,
+    sa_exc,
+    sa_orm,
 )
 from .email_address import EmailAddress, EmailAddressMixin
 from .helpers import (
@@ -66,6 +79,7 @@
 
 __all__ = [
     'ACCOUNT_STATE',
+    'Account',
     'deleted_account',
     'removed_account',
     'unknown_account',
@@ -123,7 +137,38 @@ def __eq__(self, other: object) -> sa.ColumnElement[bool]:  # type: ignore[overr
             return sa.false()
 
 
-class Account(UuidMixin, BaseMixin, Model):
+# --- Tables ---------------------------------------------------------------------------
+
+team_membership = sa.Table(
+    'team_membership',
+    Model.metadata,
+    sa.Column(
+        'account_id',
+        sa.Integer,
+        sa.ForeignKey('account.id'),
+        nullable=False,
+        primary_key=True,
+    ),
+    sa.Column(
+        'team_id',
+        sa.Integer,
+        sa.ForeignKey('team.id'),
+        nullable=False,
+        primary_key=True,
+    ),
+    sa.Column(
+        'created_at',
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        default=sa.func.utcnow(),
+    ),
+)
+
+
+# --- Models ---------------------------------------------------------------------------
+
+
+class Account(UuidMixin, BaseMixin[int, 'Account'], Model):
     """Account model."""
 
     __tablename__ = 'account'
@@ -142,17 +187,17 @@ class Account(UuidMixin, BaseMixin, Model):
 
     reserved_names: ClassVar[set[str]] = RESERVED_NAMES
 
-    type_: Mapped[str] = sa.orm.mapped_column('type', sa.CHAR(1), nullable=False)
+    type_: Mapped[str] = sa_orm.mapped_column('type', sa.CHAR(1), nullable=False)
 
     #: Join date for users and organizations (skipped for placeholders)
-    joined_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    joined_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: The optional "username", used in the URL stub, with a unique constraint on the
     #: lowercase value (defined in __table_args__ below)
     name: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(
+        sa_orm.mapped_column(
             sa.Unicode(__name_length__),
             sa.CheckConstraint("name <> ''"),
             nullable=True,
@@ -162,80 +207,76 @@ class Account(UuidMixin, BaseMixin, Model):
 
     #: The account's title (user's fullname)
     title: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(__title_length__), default='', nullable=False),
+        sa_orm.mapped_column(sa.Unicode(__title_length__), default='', nullable=False),
         read={'all'},
     )
     #: Alias title as user's fullname
-    fullname: Mapped[str] = sa.orm.synonym('title')
+    fullname: Mapped[str] = sa_orm.synonym('title')
     #: Alias name as user's username
-    username: Mapped[str] = sa.orm.synonym('name')
+    username: Mapped[str | None] = sa_orm.synonym('name')
 
     #: Argon2 or Bcrypt hash of the user's password
-    pw_hash: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode, nullable=True)
+    pw_hash: Mapped[str | None] = sa_orm.mapped_column()
     #: Timestamp for when the user's password last changed
-    pw_set_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    pw_set_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Expiry date for the password (to prompt user to reset it)
-    pw_expires_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    pw_expires_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: User's preferred/last known timezone
     timezone: Mapped[BaseTzInfo | None] = with_roles(
-        sa.orm.mapped_column(TimezoneType(backend='pytz'), nullable=True),
+        sa_orm.mapped_column(TimezoneType(backend='pytz'), nullable=True),
         read={'owner'},
     )
     #: Update timezone automatically from browser activity
-    auto_timezone: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=True, nullable=False
-    )
+    auto_timezone: Mapped[bool] = sa_orm.mapped_column(default=True)
     #: User's preferred/last known locale
     locale: Mapped[Locale | None] = with_roles(
-        sa.orm.mapped_column(LocaleType, nullable=True), read={'owner'}
+        sa_orm.mapped_column(LocaleType, nullable=True), read={'owner'}
     )
     #: Update locale automatically from browser activity
-    auto_locale: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=True, nullable=False
-    )
+    auto_locale: Mapped[bool] = sa_orm.mapped_column(default=True)
     #: User's state code (active, suspended, merged, deleted)
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
         sa.SmallInteger,
-        StateManager.check_constraint('state', ACCOUNT_STATE),
+        StateManager.check_constraint('state', ACCOUNT_STATE, sa.SmallInteger),
         nullable=False,
         default=ACCOUNT_STATE.ACTIVE,
     )
     #: Account state manager
-    state = StateManager('_state', ACCOUNT_STATE, doc="Account state")
+    state = StateManager['Account']('_state', ACCOUNT_STATE, doc="Account state")
     #: Other accounts that were merged into this account
     old_accounts: AssociationProxy[list[Account]] = association_proxy(
         'oldids', 'old_account'
     )
 
-    _profile_state: Mapped[int] = sa.orm.mapped_column(
+    _profile_state: Mapped[int] = sa_orm.mapped_column(
         'profile_state',
         sa.SmallInteger,
-        StateManager.check_constraint('profile_state', PROFILE_STATE),
+        StateManager.check_constraint('profile_state', PROFILE_STATE, sa.SmallInteger),
         nullable=False,
         default=PROFILE_STATE.AUTO,
     )
-    profile_state = StateManager(
+    profile_state = StateManager['Account'](
         '_profile_state', PROFILE_STATE, doc="Current state of the account profile"
     )
 
-    tagline: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, sa.CheckConstraint("tagline <> ''"), nullable=True
+    tagline: Mapped[str | None] = sa_orm.mapped_column(
+        sa.CheckConstraint("tagline <> ''")
     )
     description, description_text, description_html = MarkdownCompositeDocument.create(
         'description', default='', nullable=False
     )
-    website: Mapped[furl | None] = sa.orm.mapped_column(
+    website: Mapped[furl | None] = sa_orm.mapped_column(
         UrlType, sa.CheckConstraint("website <> ''"), nullable=True
     )
-    logo_url: Mapped[furl | None] = sa.orm.mapped_column(
+    logo_url: Mapped[furl | None] = sa_orm.mapped_column(
         ImgeeType, sa.CheckConstraint("logo_url <> ''"), nullable=True
     )
-    banner_image_url: Mapped[furl | None] = sa.orm.mapped_column(
+    banner_image_url: Mapped[furl | None] = sa_orm.mapped_column(
         ImgeeType, sa.CheckConstraint("banner_image_url <> ''"), nullable=True
     )
 
@@ -244,22 +285,20 @@ class Account(UuidMixin, BaseMixin, Model):
 
     #: Protected accounts cannot be deleted
     is_protected: Mapped[bool] = with_roles(
-        immutable(sa.orm.mapped_column(sa.Boolean, default=False, nullable=False)),
+        immutable(sa_orm.mapped_column(default=False)),
         read={'owner', 'admin'},
     )
     #: Verified accounts get listed on the home page and are not considered throwaway
     #: accounts for spam control. There are no other privileges at this time
     is_verified: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, default=False, nullable=False, index=True),
+        sa_orm.mapped_column(default=False, index=True),
         read={'all'},
     )
 
     #: Revision number maintained by SQLAlchemy, starting at 1
-    revisionid: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=False), read={'all'}
-    )
+    revisionid: Mapped[int] = with_roles(sa_orm.mapped_column(), read={'all'})
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'title',
             'name',
@@ -284,7 +323,7 @@ class Account(UuidMixin, BaseMixin, Model):
         deferred=True,
     )
 
-    name_vector: Mapped[str] = sa.orm.mapped_column(
+    name_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'title',
             'name',
@@ -295,6 +334,577 @@ class Account(UuidMixin, BaseMixin, Model):
         deferred=True,
     )
 
+    # --- Backrefs
+
+    # account.py:
+    oldid: Mapped[AccountOldId] = relationship(
+        primaryjoin=lambda: sa_orm.foreign(AccountOldId.id) == Account.uuid,
+        uselist=False,
+        back_populates='old_account',
+    )
+    oldids: Mapped[list[AccountOldId]] = relationship(
+        foreign_keys=lambda: AccountOldId.account_id, back_populates='account'
+    )
+    teams: Mapped[list[Team]] = relationship(
+        foreign_keys=lambda: Team.account_id,
+        order_by=lambda: sa.func.lower(Team.title),
+        back_populates='account',
+    )
+    member_teams: Mapped[list[Team]] = relationship(
+        secondary='team_membership', back_populates='users'
+    )
+    emails: Mapped[list[AccountEmail]] = relationship(back_populates='account')
+    emailclaims: Mapped[list[AccountEmailClaim]] = relationship(
+        back_populates='account'
+    )
+    phones: Mapped[list[AccountPhone]] = relationship(back_populates='account')
+    externalids: Mapped[list[AccountExternalId]] = relationship(
+        back_populates='account'
+    )
+
+    # account_membership.py
+    memberships: DynamicMapped[AccountMembership] = relationship(
+        foreign_keys=lambda: AccountMembership.account_id,
+        lazy='dynamic',
+        passive_deletes=True,
+        back_populates='account',
+    )
+    active_admin_memberships: DynamicMapped[AccountMembership] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                sa_orm.remote(AccountMembership.account_id) == Account.id,
+                AccountMembership.is_active,
+            ),
+            order_by=lambda: AccountMembership.granted_at.asc(),
+            viewonly=True,
+        ),
+        grants_via={'member': {'admin', 'owner'}},
+    )
+
+    active_owner_memberships: DynamicMapped[AccountMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.account_id) == Account.id,
+            AccountMembership.is_active,
+            AccountMembership.is_owner.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    active_invitations: DynamicMapped[AccountMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.account_id) == Account.id,
+            AccountMembership.is_invite,
+            AccountMembership.revoked_at.is_(None),
+        ),
+        viewonly=True,
+    )
+
+    owner_users = with_roles(
+        DynamicAssociationProxy['Account']('active_owner_memberships', 'member'),
+        read={'all'},
+    )
+    admin_users = with_roles(
+        DynamicAssociationProxy['Account']('active_admin_memberships', 'member'),
+        read={'all'},
+    )
+
+    organization_admin_memberships: DynamicMapped[AccountMembership] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: AccountMembership.member_id,
+        viewonly=True,
+    )
+
+    noninvite_organization_admin_memberships: DynamicMapped[
+        AccountMembership
+    ] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: AccountMembership.member_id,
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.member_id) == Account.id,
+            ~AccountMembership.is_invite,
+        ),
+        viewonly=True,
+    )
+
+    active_organization_admin_memberships: DynamicMapped[
+        AccountMembership
+    ] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: AccountMembership.member_id,
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.member_id) == Account.id,
+            AccountMembership.is_active,
+        ),
+        viewonly=True,
+    )
+
+    active_organization_owner_memberships: DynamicMapped[
+        AccountMembership
+    ] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: AccountMembership.member_id,
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.member_id) == Account.id,
+            AccountMembership.is_active,
+            AccountMembership.is_owner.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    active_organization_invitations: DynamicMapped[AccountMembership] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: AccountMembership.member_id,
+        primaryjoin=lambda: sa.and_(
+            sa_orm.remote(AccountMembership.member_id) == Account.id,
+            AccountMembership.is_invite,
+            AccountMembership.revoked_at.is_(None),
+        ),
+        viewonly=True,
+    )
+
+    organizations_as_owner = DynamicAssociationProxy['Account'](
+        'active_organization_owner_memberships', 'account'
+    )
+
+    organizations_as_admin = DynamicAssociationProxy['Account'](
+        'active_organization_admin_memberships', 'account'
+    )
+
+    # auth_client.py
+    clients: Mapped[AuthClient] = relationship(back_populates='account')
+    authtokens: DynamicMapped[AuthToken] = relationship(
+        lazy='dynamic', back_populates='account'
+    )
+    client_permissions: Mapped[list[AuthClientPermissions]] = relationship(
+        back_populates='account'
+    )
+
+    # comment.py
+    comments: DynamicMapped[Comment] = relationship(
+        lazy='dynamic', back_populates='_posted_by'
+    )
+    # commentset_membership.py
+    active_commentset_memberships: DynamicMapped[CommentsetMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin='''and_(
+            CommentsetMembership.member_id == Account.id,
+            CommentsetMembership.is_active,
+        )''',
+        viewonly=True,
+    )
+    subscribed_commentsets = DynamicAssociationProxy['Commentset'](
+        'active_commentset_memberships', 'commentset'
+    )
+
+    # contact_exchange.py
+    scanned_contacts: DynamicMapped[ContactExchange] = relationship(
+        lazy='dynamic',
+        order_by='ContactExchange.scanned_at.desc()',
+        passive_deletes=True,
+        back_populates='account',
+    )
+
+    # login_session.py
+    all_login_sessions: DynamicMapped[LoginSession] = relationship(
+        lazy='dynamic', back_populates='account'
+    )
+    active_login_sessions: DynamicMapped[LoginSession] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            LoginSession.account_id == Account.id,
+            LoginSession.accessed_at > sa.func.utcnow() - LOGIN_SESSION_VALIDITY_PERIOD,
+            LoginSession.revoked_at.is_(None),
+        ),
+        order_by=lambda: LoginSession.accessed_at.desc(),
+        viewonly=True,
+    )
+
+    # mailer.py
+    mailers: Mapped[list[Mailer]] = relationship(
+        back_populates='user', order_by=lambda: Mailer.updated_at.desc()
+    )
+
+    # moderation.py
+    moderator_reports: DynamicMapped[CommentModeratorReport] = relationship(
+        lazy='dynamic', back_populates='reported_by'
+    )
+
+    # notification.py
+    all_notifications: DynamicMapped[NotificationRecipient] = with_roles(
+        relationship(
+            lazy='dynamic',
+            order_by=lambda: NotificationRecipient.created_at.desc(),
+            viewonly=True,
+        ),
+        read={'owner'},
+    )
+
+    notification_preferences: Mapped[dict[str, NotificationPreferences]] = relationship(
+        collection_class=sa_orm.attribute_keyed_dict('notification_type'),
+        back_populates='account',
+    )
+
+    # This relationship is wrapped in a property that creates it on first access
+    _main_notification_preferences: Mapped[NotificationPreferences] = relationship(
+        primaryjoin=lambda: sa.and_(
+            NotificationPreferences.account_id == Account.id,
+            NotificationPreferences.notification_type == '',
+        ),
+        uselist=False,
+        viewonly=True,
+    )
+
+    @cached_property
+    def main_notification_preferences(self) -> NotificationPreferences:
+        """Return user's main notification preferences, toggling transports on/off."""
+        if not self._main_notification_preferences:
+            main = NotificationPreferences(
+                notification_type='',
+                account=self,
+                by_email=True,
+                by_sms=True,
+                by_webpush=False,
+                by_telegram=False,
+                by_whatsapp=False,
+            )
+            db.session.add(main)
+            return main
+        return self._main_notification_preferences
+
+    # project_membership.py
+    projects_as_crew_memberships: DynamicMapped[ProjectMembership] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: ProjectMembership.member_id,
+        viewonly=True,
+    )
+
+    # This is used to determine if it is safe to purge the subject's database record
+    projects_as_crew_noninvite_memberships: DynamicMapped[
+        ProjectMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.member_id == Account.id,
+            ~ProjectMembership.is_invite,
+        ),
+        viewonly=True,
+    )
+    projects_as_crew_active_memberships: DynamicMapped[
+        ProjectMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.member_id == Account.id,
+            ProjectMembership.is_active,
+        ),
+        viewonly=True,
+    )
+
+    projects_as_crew = DynamicAssociationProxy['Project'](
+        'projects_as_crew_active_memberships', 'project'
+    )
+
+    projects_as_editor_active_memberships: DynamicMapped[
+        ProjectMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.member_id == Account.id,
+            ProjectMembership.is_active,
+            ProjectMembership.is_editor.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    projects_as_editor = DynamicAssociationProxy['Project'](
+        'projects_as_editor_active_memberships', 'project'
+    )
+
+    # project.py
+    projects: DynamicMapped[Project] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: Project.account_id,
+        back_populates='account',
+    )
+    project_redirects: DynamicMapped[ProjectRedirect] = relationship(
+        lazy='dynamic', back_populates='account'
+    )
+
+    listed_projects: DynamicMapped[Project] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            Account.id == Project.account_id,
+            Project.state.PUBLISHED,
+        ),
+        viewonly=True,
+    )
+    draft_projects: DynamicMapped[Project] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            Account.id == Project.account_id,
+            sa.or_(Project.state.DRAFT, Project.cfp_state.DRAFT),
+        ),
+        viewonly=True,
+    )
+    projects_by_name: Mapped[dict[str, Project]] = with_roles(
+        relationship(
+            foreign_keys=lambda: Project.account_id,
+            collection_class=sa_orm.attribute_keyed_dict('name'),
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+
+    # proposal_membership.py
+    all_proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: ProposalMembership.member_id,
+        viewonly=True,
+    )
+
+    noninvite_proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProposalMembership.member_id == Account.id,
+            ~ProposalMembership.is_invite,
+        ),
+        viewonly=True,
+    )
+
+    proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProposalMembership.member_id == Account.id,
+            ProposalMembership.is_active,
+        ),
+        viewonly=True,
+    )
+
+    # This is a User property of the proposals the user account is a collaborator in
+    proposals = DynamicAssociationProxy['Proposal']('proposal_memberships', 'proposal')
+
+    @property
+    def public_proposal_memberships(self) -> Query[ProposalMembership]:
+        """Query for all proposal memberships to proposals that are public."""
+        return (
+            self.proposal_memberships.join(Proposal, ProposalMembership.proposal)
+            .join(Project, Proposal.project)
+            .filter(
+                ProposalMembership.is_uncredited.is_(False),
+                # TODO: Include proposal state filter (pending proposal workflow fix)
+            )
+        )
+
+    public_proposals = DynamicAssociationProxy['Proposal'](
+        'public_proposal_memberships', 'proposal'
+    )
+
+    # proposal.py
+    created_proposals: DynamicMapped[Proposal] = relationship(
+        lazy='dynamic', back_populates='created_by'
+    )
+
+    # rsvp.py
+    rsvps: DynamicMapped[Rsvp] = relationship(
+        lazy='dynamic', back_populates='participant'
+    )
+
+    @property
+    def rsvp_followers(self) -> Query[Account]:
+        """All users with an active RSVP in a project."""
+        return (
+            Account.query.filter(Account.state.ACTIVE)
+            .join(Rsvp, Rsvp.participant_id == Account.id)
+            .join(Project, Rsvp.project_id == Project.id)
+            .filter(Rsvp.state.YES, Project.state.PUBLISHED, Project.account == self)
+        )
+
+    with_roles(rsvp_followers, grants={'follower'})
+
+    # saved.py
+    saved_projects: DynamicMapped[SavedProject] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='account'
+    )
+    saved_sessions: DynamicMapped[SavedSession] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='account'
+    )
+
+    def saved_sessions_in(self, project: Project) -> Query[SavedSession]:
+        return self.saved_sessions.join(Session).filter(Session.project == project)
+
+    # site_membership.py
+    # Singular, as only one can be active
+    active_site_membership: Mapped[SiteMembership] = relationship(
+        lazy='select',
+        primaryjoin=lambda: sa.and_(
+            SiteMembership.member_id == Account.id, SiteMembership.is_active
+        ),
+        viewonly=True,
+        uselist=False,
+    )
+
+    @cached_property
+    def is_comment_moderator(self) -> bool:
+        """Test if this user is a comment moderator."""
+        return (
+            self.active_site_membership is not None
+            and self.active_site_membership.is_comment_moderator
+        )
+
+    @cached_property
+    def is_user_moderator(self) -> bool:
+        """Test if this user is an account moderator."""
+        return (
+            self.active_site_membership is not None
+            and self.active_site_membership.is_user_moderator
+        )
+
+    @cached_property
+    def is_site_editor(self) -> bool:
+        """Test if this user is a site editor."""
+        return (
+            self.active_site_membership is not None
+            and self.active_site_membership.is_site_editor
+        )
+
+    @cached_property
+    def is_sysadmin(self) -> bool:
+        """Test if this user is a sysadmin."""
+        return (
+            self.active_site_membership is not None
+            and self.active_site_membership.is_sysadmin
+        )
+
+    # site_admin means user has one or more of above roles
+    @cached_property
+    def is_site_admin(self) -> bool:
+        """Test if this user has any site-level admin rights."""
+        return self.active_site_membership is not None
+
+    # sponsor_membership.py
+    noninvite_project_sponsor_memberships: DynamicMapped[
+        ProjectSponsorMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectSponsorMembership.member_id == Account.id,
+            ~ProjectSponsorMembership.is_invite,
+        ),
+        order_by=lambda: ProjectSponsorMembership.granted_at.desc(),
+        viewonly=True,
+    )
+
+    project_sponsor_memberships: DynamicMapped[ProjectSponsorMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectSponsorMembership.member_id == Account.id,
+            ProjectSponsorMembership.is_active,
+        ),
+        order_by=lambda: ProjectSponsorMembership.granted_at.desc(),
+        viewonly=True,
+    )
+
+    project_sponsor_membership_invites: DynamicMapped[
+        ProjectSponsorMembership
+    ] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                ProjectSponsorMembership.member_id == Account.id,
+                ProjectSponsorMembership.is_invite,
+                ProjectSponsorMembership.revoked_at.is_(None),
+            ),
+            order_by=lambda: ProjectSponsorMembership.granted_at.desc(),
+            viewonly=True,
+        ),
+        read={'admin'},
+    )
+
+    noninvite_proposal_sponsor_memberships: DynamicMapped[
+        ProposalSponsorMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProposalSponsorMembership.member_id == Account.id,
+            ~ProposalSponsorMembership.is_invite,
+        ),
+        order_by=lambda: ProposalSponsorMembership.granted_at.desc(),
+        viewonly=True,
+    )
+
+    proposal_sponsor_memberships: DynamicMapped[
+        ProposalSponsorMembership
+    ] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProposalSponsorMembership.member_id == Account.id,
+            ProposalSponsorMembership.is_active,
+        ),
+        order_by=lambda: ProposalSponsorMembership.granted_at.desc(),
+        viewonly=True,
+    )
+
+    proposal_sponsor_membership_invites: DynamicMapped[
+        ProposalSponsorMembership
+    ] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                ProposalSponsorMembership.member_id == Account.id,
+                ProposalSponsorMembership.is_invite,
+                ProposalSponsorMembership.revoked_at.is_(None),
+            ),
+            order_by=lambda: ProposalSponsorMembership.granted_at.desc(),
+            viewonly=True,
+        ),
+        read={'admin'},
+    )
+
+    sponsored_projects = DynamicAssociationProxy['Project'](
+        'project_sponsor_memberships', 'project'
+    )
+
+    sponsored_proposals = DynamicAssociationProxy['Project'](
+        'proposal_sponsor_memberships', 'proposal'
+    )
+
+    # sync_ticket.py:
+    ticket_participants: Mapped[list[TicketParticipant]] = relationship(
+        back_populates='participant'
+    )
+
+    @property
+    def ticket_followers(self) -> Query[Account]:
+        """All users with a ticket in a project."""
+        return (
+            Account.query.filter(Account.state.ACTIVE)
+            .join(TicketParticipant, TicketParticipant.participant_id == Account.id)
+            .join(Project, TicketParticipant.project_id == Project.id)
+            .filter(Project.state.PUBLISHED, Project.account == self)
+        )
+
+    with_roles(ticket_followers, grants={'follower'})
+
+    # update.py
+    created_updates: DynamicMapped[Update] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: Update.created_by_id,
+        back_populates='created_by',
+    )
+    published_updates: DynamicMapped[Update] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: Update.published_by_id,
+        back_populates='published_by',
+    )
+    deleted_updates: DynamicMapped[Update] = relationship(
+        lazy='dynamic',
+        foreign_keys=lambda: Update.deleted_by_id,
+        back_populates='deleted_by',
+    )
+
     __table_args__ = (
         sa.Index(
             'ix_account_name_lower',
@@ -380,6 +990,7 @@ class Account(UuidMixin, BaseMixin, Model):
             'is_verified',
         },
     }
+    __json_datasets__ = ('primary', 'related')
 
     profile_state.add_conditional_state(
         'ACTIVE_AND_PUBLIC',
@@ -388,9 +999,9 @@ class Account(UuidMixin, BaseMixin, Model):
     )
 
     @classmethod
-    def _defercols(cls) -> list[sa.orm.interfaces.LoaderOption]:
+    def _defercols(cls) -> list[sa_orm.interfaces.LoaderOption]:
         """Return columns that are typically deferred when loading a user."""
-        defer = sa.orm.defer
+        defer = sa_orm.defer
         return [
             defer(cls.created_at),
             defer(cls.updated_at),
@@ -405,8 +1016,10 @@ def type_filter(cls) -> sa.ColumnElement[bool]:
         """Return filter for the subclass's type."""
         return cls.type_ == cls.__mapper_args__.get('polymorphic_identity')
 
-    primary_email: Mapped[AccountEmail | None] = relationship()
-    primary_phone: Mapped[AccountPhone | None] = relationship()
+    if TYPE_CHECKING:
+        # These are added via add_primary_relationship
+        primary_email: Mapped[AccountEmail | None] = relationship()
+        primary_phone: Mapped[AccountPhone | None] = relationship()
 
     def __repr__(self) -> str:
         if self.name:
@@ -420,7 +1033,7 @@ def __str__(self) -> str:
     def __format__(self, format_spec: str) -> str:
         if not format_spec:
             return self.pickername
-        return self.pickername.__format__(format_spec)
+        return format(self.pickername, format_spec)
 
     @property
     def pickername(self) -> str:
@@ -432,7 +1045,7 @@ def pickername(self) -> str:
     with_roles(pickername, read={'all'})
 
     def roles_for(
-        self, actor: Account | None = None, anchors: Iterable = ()
+        self, actor: Account | None = None, anchors: Sequence = ()
     ) -> LazyRoleSet:
         """Identify roles for the given actor."""
         roles = super().roles_for(actor, anchors)
@@ -463,7 +1076,7 @@ def merged_account(self) -> Account:
             return cast(AccountOldId, AccountOldId.get(self.uuid)).account
         return self
 
-    def _set_password(self, password: str | None):
+    def _set_password(self, password: str | None) -> None:
         """Set a password (write-only property)."""
         if password is None:
             self.pw_hash = None
@@ -472,7 +1085,7 @@ def _set_password(self, password: str | None):
             # Also see :meth:`password_is` for transparent upgrade
         self.pw_set_at = sa.func.utcnow()
         # Expire passwords after one year. TODO: make this configurable
-        self.pw_expires_at = self.pw_set_at + timedelta(days=365)
+        self.pw_expires_at = sa.func.utcnow() + sa.cast('1 year', sa.Interval)
 
     #: Write-only property (passwords cannot be read back in plain text)
     password = property(fset=_set_password, doc=_set_password.__doc__)
@@ -509,14 +1122,11 @@ def add_email(
     ) -> AccountEmail:
         """Add an email address (assumed to be verified)."""
         accountemail = AccountEmail(account=self, email=email, private=private)
-        accountemail = cast(
-            AccountEmail,
-            failsafe_add(
-                db.session,
-                accountemail,
-                account=self,
-                email_address=accountemail.email_address,
-            ),
+        accountemail = failsafe_add(
+            db.session,
+            accountemail,
+            account=self,
+            email_address=accountemail.email_address,
         )
         if primary:
             self.primary_email = accountemail
@@ -566,14 +1176,11 @@ def add_phone(
     ) -> AccountPhone:
         """Add a phone number (assumed to be verified)."""
         accountphone = AccountPhone(account=self, phone=phone, private=private)
-        accountphone = cast(
-            AccountPhone,
-            failsafe_add(
-                db.session,
-                accountphone,
-                account=self,
-                phone_number=accountphone.phone_number,
-            ),
+        accountphone = failsafe_add(
+            db.session,
+            accountphone,
+            account=self,
+            phone_number=accountphone.phone_number,
         )
         if primary:
             self.primary_phone = accountphone
@@ -652,13 +1259,13 @@ def has_any_memberships(self) -> bool:
     @with_roles(call={'owner'})
     def has_transport_email(self) -> bool:
         """User has an email transport address."""
-        return self.state.ACTIVE and bool(self.email)
+        return bool(self.state.ACTIVE) and bool(self.email)
 
     @with_roles(call={'owner'})
     def has_transport_sms(self) -> bool:
         """User has an SMS transport address."""
         return (
-            self.state.ACTIVE
+            bool(self.state.ACTIVE)
             and self.phone != ''
             and self.phone.phone_number.has_sms is not False
         )
@@ -677,7 +1284,7 @@ def has_transport_telegram(self) -> bool:  # TODO  # pragma: no cover
     def has_transport_whatsapp(self) -> bool:
         """User has a WhatsApp transport address."""
         return (
-            self.state.ACTIVE
+            bool(self.state.ACTIVE)
             and self.phone != ''
             and self.phone.phone_number.has_wa is not False
         )
@@ -705,30 +1312,24 @@ def transport_for_sms(self, context: Model | None = None) -> AccountPhone | None
     @with_roles(call={'owner'})
     def transport_for_webpush(
         self, context: Model | None = None
-    ):  # TODO  # pragma: no cover
+    ) -> None:  # TODO  # pragma: no cover
         """Return user's preferred webpush transport address within a context."""
         return None
 
     @with_roles(call={'owner'})
     def transport_for_telegram(
         self, context: Model | None = None
-    ):  # TODO  # pragma: no cover
+    ) -> None:  # TODO  # pragma: no cover
         """Return user's preferred Telegram transport address within a context."""
         return None
 
     @with_roles(call={'owner'})
-    def transport_for_whatsapp(self, context: Model | None = None):
+    def transport_for_whatsapp(
+        self, context: Model | None = None
+    ) -> AccountPhone | None:
         """Return user's preferred WhatsApp transport address within a context."""
         # TODO: Per-account/project customization is a future option
-        if self.state.ACTIVE and self.phone != '' and self.phone.phone_number.allow_wa:
-            return self.phone
-        return None
-
-    @with_roles(call={'owner'})
-    def transport_for_signal(self, context: Model | None = None):
-        """Return user's preferred Signal transport address within a context."""
-        # TODO: Per-account/project customization is a future option
-        if self.state.ACTIVE and self.phone != '' and self.phone.phone_number.allow_sm:
+        if self.state.ACTIVE and self.phone != '' and self.phone.phone_number.has_wa:
             return self.phone
         return None
 
@@ -805,38 +1406,44 @@ def organizations_as_owner_ids(self) -> list[int]:
         ]
 
     @state.transition(state.ACTIVE, state.MERGED)
-    def mark_merged_into(self, other_account):
+    def mark_merged_into(self, other_account: Account) -> None:
         """Mark account as merged into another account."""
         db.session.add(AccountOldId(id=self.uuid, account=other_account))
 
     @state.transition(state.ACTIVE, state.SUSPENDED)
-    def mark_suspended(self):
+    def mark_suspended(self) -> None:
         """Mark account as suspended on support or moderator request."""
 
     @state.transition(state.SUSPENDED, state.ACTIVE)
-    def mark_active(self):
+    def mark_active(self) -> None:
         """Restore a suspended account to active state."""
 
     @state.transition(state.ACTIVE, state.DELETED)
-    def do_delete(self):
+    def do_delete(self) -> None:
         """Delete account."""
         # 0: Safety check
         if not self.is_safe_to_delete():
             raise ValueError("Account cannot be deleted")
 
         # 1. Delete contact information
-        for contact_source in (
-            self.emails,
-            self.emailclaims,
-            self.phones,
-            self.externalids,
+        for contact_source in cast(
+            list,
+            (
+                self.emails,
+                self.emailclaims,
+                self.phones,
+                self.externalids,
+            ),
         ):
             for contact in contact_source:
                 db.session.delete(contact)
 
         # 2. Revoke all active memberships
         for membership in self.active_memberships():
-            membership = membership.freeze_member_attribution(self)
+            if callable(
+                freeze := getattr(membership, 'freeze_member_attribution', None)
+            ):
+                membership = freeze(self)
             if membership.revoke_on_member_delete:
                 membership.revoke(actor=self)
         # TODO: freeze fullname in unrevoked memberships (pending title column there)
@@ -850,8 +1457,8 @@ def do_delete(self):
         self.member_teams.clear()
 
         # 4. Revoke auth tokens
-        self.revoke_all_auth_tokens()  # Defined in auth_client.py
-        self.revoke_all_auth_client_permissions()  # Same place
+        AuthToken.revoke_all_for(self)
+        AuthClientPermissions.revoke_all_for(self)
 
         # 5. Revoke all active login sessions
         for login_session in self.active_login_sessions:
@@ -906,7 +1513,7 @@ def uuid_zbase32(self) -> str:
     @classmethod
     def _uuid_zbase32_comparator(cls) -> ZBase32Comparator:
         """Return SQL comparator for :prop:`uuid_zbase32`."""
-        return ZBase32Comparator(cls.uuid)
+        return ZBase32Comparator(cls.uuid)  # type: ignore[arg-type]
 
     @classmethod
     def name_is(cls, name: str) -> ColumnElement:
@@ -917,7 +1524,7 @@ def name_is(cls, name: str) -> ColumnElement:
 
     @classmethod
     def name_in(cls, names: Iterable[str]) -> ColumnElement:
-        """Generate query flter to check if name is among candidates."""
+        """Generate query filter to check if name is among candidates."""
         return sa.func.lower(cls.name).in_(
             [name.lower().replace('-', '_') for name in names]
         )
@@ -1039,7 +1646,7 @@ def all_public(cls) -> Query:
         return query
 
     @classmethod
-    def autocomplete(cls, prefix: str) -> list[Account]:
+    def autocomplete(cls, prefix: str) -> list[Self]:
         """
         Return accounts whose names begin with the prefix, for autocomplete UI.
 
@@ -1125,7 +1732,7 @@ def autocomplete(cls, prefix: str) -> list[Account]:
             # No '@' in the query, so do a regular autocomplete
             try:
                 users = base_users.all()
-            except sa.exc.ProgrammingError:
+            except sa_exc.ProgrammingError:
                 # This can happen because the tsquery from prefix turned out to be ':*'
                 users = []
         return users
@@ -1156,7 +1763,7 @@ def validate_name_candidate(cls, name: str) -> str | None:
         # will add a filter condition on subclasses to restrict the query to that type.
         existing = (
             Account.query.filter(sa.func.lower(Account.name) == sa.func.lower(name))
-            .options(sa.orm.load_only(cls.id, cls.uuid, cls.type_))
+            .options(sa_orm.load_only(cls.id, cls.uuid, cls.type_))
             .one_or_none()
         )
         if existing is not None:
@@ -1179,7 +1786,7 @@ def is_available_name(cls, name: str) -> bool:
         """Test if the candidate name is available for use as an Account name."""
         return cls.validate_name_candidate(name) is None
 
-    @sa.orm.validates('name')
+    @sa_orm.validates('name')
     def _validate_name(self, key: str, value: str | None) -> str | None:
         """Validate the value of Account.name."""
         if value is None:
@@ -1200,8 +1807,8 @@ def _validate_name(self, key: str, value: str | None) -> str | None:
         # to the db and catch IntegrityError.
         return value
 
-    @sa.orm.validates('logo_url', 'banner_image_url')
-    def _validate_nullable(self, key: str, value: str | None):
+    @sa_orm.validates('logo_url', 'banner_image_url')
+    def _validate_nullable(self, key: str, value: str | None) -> str | None:
         """Convert blank values into None."""
         return value if value else None
 
@@ -1215,38 +1822,96 @@ def organization_links(self) -> list:
         """Return list of organizations affiliated with this user (deprecated)."""
         return []
 
+    # Project methods
+
+    def draft_projects_for(self, user: Account | None) -> list[Project]:
+        if user is not None:
+            return [
+                membership.project
+                for membership in user.projects_as_crew_active_memberships.join(
+                    Project
+                ).filter(
+                    # Project is attached to this account
+                    Project.account_id == self.id,
+                    # Project is in draft state OR has a draft call for proposals
+                    sa.or_(Project.state.DRAFT, Project.cfp_state.DRAFT),
+                )
+            ]
+        return []
+
+    def unscheduled_projects_for(self, user: Account | None) -> list[Project]:
+        if user is not None:
+            return [
+                membership.project
+                for membership in user.projects_as_crew_active_memberships.join(
+                    Project
+                ).filter(
+                    # Project is attached to this account
+                    Project.account_id == self.id,
+                    # Project is in draft state OR has a draft call for proposals
+                    sa.or_(Project.state.PUBLISHED_WITHOUT_SESSIONS),
+                )
+            ]
+        return []
+
+    @with_roles(read={'all'}, datasets={'primary', 'without_parent', 'related'})
+    @cached_property
+    def published_project_count(self) -> int:
+        return (
+            self.listed_projects.filter(Project.state.PUBLISHED).order_by(None).count()
+        )
+
+    @with_roles(grants_via={None: {'participant': 'member'}})
+    @cached_property
+    def membership_project(self) -> Project | None:
+        """Return a project that has memberships flag enabled (temporary)."""
+        return self.projects.filter(
+            Project.boxoffice_data.op('@>')({'has_membership': True})
+        ).first()
+
     # Make :attr:`type_` available under the name `type`, but declare this at the very
     # end of the class to avoid conflicts with the Python `type` global that is
     # used for type-hinting
-    type: Mapped[str] = sa.orm.synonym('type_')  # noqa: A003
+    type: Mapped[str] = sa_orm.synonym('type_')  # noqa: A003
 
 
+Account.__active_membership_attrs__.add('active_organization_admin_memberships')
+Account.__noninvite_membership_attrs__.add('noninvite_organization_admin_memberships')
+Account.__active_membership_attrs__.add('projects_as_crew_active_memberships')
+Account.__noninvite_membership_attrs__.add('projects_as_crew_noninvite_memberships')
+Account.__active_membership_attrs__.add('proposal_memberships')
+Account.__noninvite_membership_attrs__.add('noninvite_proposal_memberships')
+Account.__active_membership_attrs__.update(
+    {'project_sponsor_memberships', 'proposal_sponsor_memberships'}
+)
+Account.__noninvite_membership_attrs__.update(
+    {'noninvite_project_sponsor_memberships', 'noninvite_proposal_sponsor_memberships'}
+)
+
 auto_init_default(Account._state)  # pylint: disable=protected-access
 auto_init_default(Account._profile_state)  # pylint: disable=protected-access
 add_search_trigger(Account, 'search_vector')
 add_search_trigger(Account, 'name_vector')
 
 
-class AccountOldId(UuidMixin, BaseMixin[UUID], Model):
+class AccountOldId(UuidMixin, BaseMixin[UUID, Account], Model):
     """Record of an older UUID for an account, after account merger."""
 
     __tablename__ = 'account_oldid'
 
     #: Old account, if still present
     old_account: Mapped[Account] = relationship(
-        Account,
-        primaryjoin='foreign(AccountOldId.id) == remote(Account.uuid)',
-        backref=backref('oldid', uselist=False),
+        foreign_keys=lambda: AccountOldId.id,
+        primaryjoin=lambda: AccountOldId.id == Account.uuid,
+        back_populates='oldid',
     )
     #: User id of new user
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
     #: New account
     account: Mapped[Account] = relationship(
-        Account,
-        foreign_keys=[account_id],
-        backref=backref('oldids', cascade='all'),
+        foreign_keys=[account_id], back_populates='oldids'
     )
 
     def __repr__(self) -> str:
@@ -1265,7 +1930,7 @@ class User(Account):
     __mapper_args__ = {'polymorphic_identity': 'U'}
     is_user_profile = True
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         if self.joined_at is None:
             self.joined_at = sa.func.utcnow()
@@ -1275,8 +1940,9 @@ def __init__(self, **kwargs) -> None:
 Account.userid = Account.uuid_b64
 
 
+# TODO: Make an Actor Protocol as the base for both -- maybe placing that in Coaster
 class DuckTypeAccount(RoleMixin):
-    """User singleton constructor. Ducktypes a regular user object."""
+    """User singleton constructor. Duck types a regular user object."""
 
     id: None = None  # noqa: A003
     created_at: None = None
@@ -1337,9 +2003,9 @@ def __str__(self) -> str:
     def __format__(self, format_spec: str) -> str:
         if not format_spec:
             return self.pickername
-        return self.pickername.__format__(format_spec)
+        return format(self.pickername, format_spec)
 
-    def url_for(self, *args, **kwargs) -> Literal['']:
+    def url_for(self, *args: Any, **kwargs: Any) -> Literal['']:
         """Return blank URL for anything to do with this user."""
         return ''
 
@@ -1351,31 +2017,6 @@ def url_for(self, *args, **kwargs) -> Literal['']:
 
 # --- Organizations and teams -------------------------------------------------
 
-team_membership = sa.Table(
-    'team_membership',
-    Model.metadata,
-    sa.Column(
-        'account_id',
-        sa.Integer,
-        sa.ForeignKey('account.id'),
-        nullable=False,
-        primary_key=True,
-    ),
-    sa.Column(
-        'team_id',
-        sa.Integer,
-        sa.ForeignKey('team.id'),
-        nullable=False,
-        primary_key=True,
-    ),
-    sa.Column(
-        'created_at',
-        sa.TIMESTAMP(timezone=True),
-        nullable=False,
-        default=sa.func.utcnow(),
-    ),
-)
-
 
 class Organization(Account):
     """An organization of one or more users with distinct roles."""
@@ -1383,7 +2024,7 @@ class Organization(Account):
     __mapper_args__ = {'polymorphic_identity': 'O'}
     is_organization_profile = True
 
-    def __init__(self, owner: User, **kwargs) -> None:
+    def __init__(self, owner: User, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         if self.joined_at is None:
             self.joined_at = sa.func.utcnow()
@@ -1399,7 +2040,7 @@ def people(self) -> Query[Account]:
             Account.query.join(team_membership)
             .join(Team)
             .filter(Team.account == self, Team.is_public.is_(True))
-            .options(sa.orm.joinedload(Account.member_teams))
+            .options(sa_orm.joinedload(Account.member_teams))
             .order_by(sa.func.lower(Account.title))
         )
 
@@ -1411,36 +2052,35 @@ class Placeholder(Account):
     is_placeholder_profile = True
 
 
-class Team(UuidMixin, BaseMixin, Model):
+class Team(UuidMixin, BaseMixin[int, Account], Model):
     """A team of users within an organization."""
 
     __tablename__ = 'team'
     __title_length__ = 250
     #: Displayed name
-    title: Mapped[str] = sa.orm.mapped_column(
+    title: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(__title_length__), nullable=False
     )
     #: Organization
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False, index=True
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False, index=True
     )
     account: Mapped[Account] = with_roles(
-        relationship(
-            Account,
-            foreign_keys=[account_id],
-            backref=backref('teams', order_by=sa.func.lower(title), cascade='all'),
-        ),
+        relationship(foreign_keys=[account_id], back_populates='teams'),
         grants_via={None: {'owner': 'owner', 'admin': 'admin'}},
     )
     users: DynamicMapped[Account] = with_roles(
         relationship(
-            Account, secondary=team_membership, lazy='dynamic', backref='member_teams'
+            secondary=team_membership, lazy='dynamic', back_populates='member_teams'
         ),
         grants={'member'},
     )
 
-    is_public: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
+    is_public: Mapped[bool] = sa_orm.mapped_column(default=False)
+
+    # --- Backrefs
+    client_permissions: Mapped[list[AuthClientTeamPermissions]] = relationship(
+        back_populates='team'
     )
 
     def __repr__(self) -> str:
@@ -1476,7 +2116,7 @@ def get(cls, buid: str, with_parent: bool = False) -> Team | None:
         :param str buid: Buid of the team
         """
         if with_parent:
-            query = cls.query.options(sa.orm.joinedload(cls.account))
+            query = cls.query.options(sa_orm.joinedload(cls.account))
         else:
             query = cls.query
         return query.filter_by(buid=buid).one_or_none()
@@ -1485,29 +2125,21 @@ def get(cls, buid: str, with_parent: bool = False) -> Team | None:
 # --- Account email/phone and misc
 
 
-class AccountEmail(EmailAddressMixin, BaseMixin, Model):
+class AccountEmail(EmailAddressMixin, BaseMixin[int, Account], Model):
     """An email address linked to an account."""
 
     __tablename__ = 'account_email'
-    __email_optional__ = False
     __email_unique__ = True
     __email_is_exclusive__ = True
     __email_for__ = 'account'
 
-    # Tell mypy that these are not optional
-    email_address: Mapped[EmailAddress]  # type: ignore[assignment]
-
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
-    account: Mapped[Account] = relationship(
-        Account, backref=backref('emails', cascade='all')
-    )
-    user: Mapped[Account] = sa.orm.synonym('account')
+    account: Mapped[Account] = relationship(back_populates='emails')
+    user: Mapped[Account] = sa_orm.synonym('account')
 
-    private: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    private: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     __datasets__ = {
         'primary': {'member', 'email', 'private', 'type'},
@@ -1515,7 +2147,7 @@ class AccountEmail(EmailAddressMixin, BaseMixin, Model):
         'related': {'email', 'private', 'type'},
     }
 
-    def __init__(self, account: Account, **kwargs) -> None:
+    def __init__(self, *, account: Account, **kwargs: Any) -> None:
         email = kwargs.pop('email', None)
         if email:
             kwargs['email_address'] = EmailAddress.add_for(account, email)
@@ -1666,32 +2298,24 @@ def migrate_account(
         return [cls.__table__.name, user_email_primary_table.name]
 
 
-class AccountEmailClaim(EmailAddressMixin, BaseMixin, Model):
+class AccountEmailClaim(EmailAddressMixin, BaseMixin[int, Account], Model):
     """Claimed but unverified email address for a user."""
 
     __tablename__ = 'account_email_claim'
-    __email_optional__ = False
     __email_unique__ = False
     __email_for__ = 'account'
     __email_is_exclusive__ = False
 
-    # Tell mypy that these are not optional
-    email_address: Mapped[EmailAddress]  # type: ignore[assignment]
-
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
-    )
-    account: Mapped[Account] = relationship(
-        Account, backref=backref('emailclaims', cascade='all')
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
-    user: Mapped[Account] = sa.orm.synonym('account')
-    verification_code: Mapped[str] = sa.orm.mapped_column(
-        sa.String(44), nullable=False, default=newsecret
+    account: Mapped[Account] = relationship(back_populates='emailclaims')
+    user: Mapped[Account] = sa_orm.synonym('account')
+    verification_code: Mapped[str] = sa_orm.mapped_column(
+        sa.String(44), nullable=False, insert_default=newsecret, default=None
     )
 
-    private: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    private: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     __table_args__ = (sa.UniqueConstraint('account_id', 'email_address_id'),)
 
@@ -1701,10 +2325,8 @@ class AccountEmailClaim(EmailAddressMixin, BaseMixin, Model):
         'related': {'email', 'private', 'type'},
     }
 
-    def __init__(self, account: Account, **kwargs) -> None:
-        email = kwargs.pop('email', None)
-        if email:
-            kwargs['email_address'] = EmailAddress.add_for(account, email)
+    def __init__(self, *, account: Account, email: str, **kwargs: Any) -> None:
+        kwargs['email_address'] = EmailAddress.add_for(account, email)
         super().__init__(account=account, **kwargs)
         self.blake2b = hashlib.blake2b(
             self.email.lower().encode(), digest_size=16
@@ -1845,7 +2467,7 @@ def get_by(
         )
 
     @classmethod
-    def all(cls, email: str) -> Query[AccountEmailClaim]:  # noqa: A003
+    def all(cls, email: str) -> Query[Self]:  # noqa: A003
         """
         Return all instances with the matching email address.
 
@@ -1860,26 +2482,21 @@ def all(cls, email: str) -> Query[AccountEmailClaim]:  # noqa: A003
 auto_init_default(AccountEmailClaim.verification_code)
 
 
-class AccountPhone(PhoneNumberMixin, BaseMixin, Model):
+class AccountPhone(PhoneNumberMixin, BaseMixin[int, Account], Model):
     """A phone number linked to an account."""
 
     __tablename__ = 'account_phone'
-    __phone_optional__ = False
     __phone_unique__ = True
     __phone_is_exclusive__ = True
     __phone_for__ = 'account'
 
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None
     )
-    account: Mapped[Account] = relationship(
-        Account, backref=backref('phones', cascade='all')
-    )
-    user: Mapped[Account] = sa.orm.synonym('account')
+    account: Mapped[Account] = relationship(back_populates='phones')
+    user: Mapped[Account] = sa_orm.synonym('account')
 
-    private: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    private: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     __datasets__ = {
         'primary': {'member', 'phone', 'private', 'type'},
@@ -1887,7 +2504,7 @@ class AccountPhone(PhoneNumberMixin, BaseMixin, Model):
         'related': {'phone', 'private', 'type'},
     }
 
-    def __init__(self, account, **kwargs) -> None:
+    def __init__(self, *, account: Account, **kwargs: Any) -> None:
         phone = kwargs.pop('phone', None)
         if phone:
             kwargs['phone_number'] = PhoneNumber.add_for(account, phone)
@@ -1902,8 +2519,8 @@ def __str__(self) -> str:
         return self.phone or ''
 
     @cached_property
-    def parsed(self) -> phonenumbers.PhoneNumber:
-        """Return parsed phone number using libphonenumbers."""
+    def parsed(self) -> phonenumbers.PhoneNumber | None:
+        """Return parsed phone number using libphonenumber."""
         return self.phone_number.parsed
 
     @cached_property
@@ -2051,65 +2668,59 @@ def migrate_account(
         return [cls.__table__.name, user_phone_primary_table.name]
 
 
-class AccountExternalId(BaseMixin, Model):
+class AccountExternalId(BaseMixin[int, Account], Model):
     """An external connected account for a user."""
 
     __tablename__ = 'account_externalid'
     __at_username_services__: ClassVar[list[str]] = []
     #: Foreign key to user table
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None
     )
     #: User that this connected account belongs to
-    account: Mapped[Account] = relationship(
-        Account, backref=backref('externalids', cascade='all')
-    )
-    user: Mapped[Account] = sa.orm.synonym('account')
+    account: Mapped[Account] = relationship(back_populates='externalids')
+    user: Mapped[Account] = sa_orm.synonym('account')
     #: Identity of the external service (in app's login provider registry)
     # FIXME: change to sa.Unicode
-    service: Mapped[str] = sa.orm.mapped_column(sa.UnicodeText, nullable=False)
+    service: Mapped[str] = sa_orm.mapped_column(sa.UnicodeText, nullable=False)
     #: Unique user id as per external service, used for identifying related accounts
     # FIXME: change to sa.Unicode
-    userid: Mapped[str] = sa.orm.mapped_column(
+    userid: Mapped[str] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=False
     )  # Unique id (or obsolete OpenID)
     #: Optional public-facing username on the external service
-    # FIXME: change to sa.Unicode
-    username: Mapped[str | None] = sa.orm.mapped_column(
-        sa.UnicodeText, nullable=True
-    )  # LinkedIn once used full URLs
+    # FIXME: change to sa.Unicode. LinkedIn once used full URLs
+    username: Mapped[str | None] = sa_orm.mapped_column(sa.UnicodeText, nullable=True)
     #: OAuth or OAuth2 access token
     # FIXME: change to sa.Unicode
-    oauth_token: Mapped[str | None] = sa.orm.mapped_column(
+    oauth_token: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
     #: Optional token secret (not used in OAuth2, used by Twitter with OAuth1a)
     # FIXME: change to sa.Unicode
-    oauth_token_secret: Mapped[str | None] = sa.orm.mapped_column(
+    oauth_token_secret: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
     #: OAuth token type (typically 'bearer')
     # FIXME: change to sa.Unicode
-    oauth_token_type: Mapped[str | None] = sa.orm.mapped_column(
+    oauth_token_type: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
     #: OAuth2 refresh token
     # FIXME: change to sa.Unicode
-    oauth_refresh_token: Mapped[str | None] = sa.orm.mapped_column(
+    oauth_refresh_token: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
     #: OAuth2 token expiry in seconds, as sent by service provider
-    oauth_expires_in: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, nullable=True
-    )
+    oauth_expires_in: Mapped[int | None] = sa_orm.mapped_column()
     #: OAuth2 token expiry timestamp, estimate from created_at + oauth_expires_in
-    oauth_expires_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    oauth_expires_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
 
     #: Timestamp of when this connected account was last (re-)authorised by the user
-    last_used_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), default=sa.func.utcnow(), nullable=False
+    last_used_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True), insert_default=sa.func.utcnow(), default=None
     )
 
     __table_args__ = (
@@ -2177,9 +2788,32 @@ def get(
 )
 
 #: Anchor type
-Anchor = AccountEmail | AccountEmailClaim | AccountPhone | EmailAddress | PhoneNumber
+Anchor: TypeAlias = (
+    AccountEmail | AccountEmailClaim | AccountPhone | EmailAddress | PhoneNumber
+)
 
 # Tail imports
-# pylint: disable=wrong-import-position
-from .membership_mixin import ImmutableMembershipMixin  # isort: skip
-from .account_membership import AccountMembership  # isort:skip
+from .account_membership import AccountMembership
+from .auth_client import AuthClient, AuthClientPermissions, AuthToken
+from .login_session import LOGIN_SESSION_VALIDITY_PERIOD, LoginSession
+from .mailer import Mailer
+from .membership_mixin import ImmutableMembershipMixin
+from .notification import NotificationPreferences, NotificationRecipient
+from .project import Project, ProjectRedirect
+from .project_membership import ProjectMembership
+from .proposal import Proposal
+from .proposal_membership import ProposalMembership
+from .rsvp import Rsvp
+from .saved import SavedProject, SavedSession
+from .session import Session
+from .site_membership import SiteMembership
+from .sponsor_membership import ProjectSponsorMembership, ProposalSponsorMembership
+from .sync_ticket import TicketParticipant
+from .update import Update
+
+if TYPE_CHECKING:
+    from .auth_client import AuthClientTeamPermissions
+    from .comment import Comment, Commentset  # noqa: F401
+    from .commentset_membership import CommentsetMembership
+    from .contact_exchange import ContactExchange
+    from .moderation import CommentModeratorReport
diff --git a/funnel/models/account_membership.py b/funnel/models/account_membership.py
index 23faa8be8..f1aefb8b7 100644
--- a/funnel/models/account_membership.py
+++ b/funnel/models/account_membership.py
@@ -4,17 +4,16 @@
 
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import DynamicAssociationProxy, immutable, with_roles
+from coaster.sqlalchemy import immutable, with_roles
 
-from . import DynamicMapped, Mapped, Model, backref, relationship, sa
 from .account import Account
-from .helpers import reopen
-from .membership_mixin import ImmutableUserMembershipMixin
+from .base import Mapped, Model, relationship, sa, sa_orm
+from .membership_mixin import ImmutableMembershipMixin
 
 __all__ = ['AccountMembership']
 
 
-class AccountMembership(ImmutableUserMembershipMixin, Model):
+class AccountMembership(ImmutableMembershipMixin, Model):
     """
     An account can be a member of another account as an owner, admin or follower.
 
@@ -51,7 +50,7 @@ class AccountMembership(ImmutableUserMembershipMixin, Model):
         'account_admin': {
             'read': {
                 'record_type',
-                'record_type_label',
+                'record_type_enum',
                 'granted_at',
                 'granted_by',
                 'revoked_at',
@@ -78,29 +77,21 @@ class AccountMembership(ImmutableUserMembershipMixin, Model):
     }
 
     #: Organization that this membership is being granted on
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
+    account_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('account.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
     )
     account: Mapped[Account] = with_roles(
-        relationship(
-            Account,
-            foreign_keys=[account_id],
-            backref=backref(
-                'memberships', lazy='dynamic', cascade='all', passive_deletes=True
-            ),
-        ),
+        relationship(foreign_keys=[account_id], back_populates='memberships'),
         grants_via={None: {'admin': 'account_admin', 'owner': 'account_owner'}},
     )
-    parent_id: Mapped[int] = sa.orm.synonym('account_id')
+    parent_id: Mapped[int] = sa_orm.synonym('account_id')
     parent_id_column = 'account_id'
-    parent: Mapped[Account] = sa.orm.synonym('account')
+    parent: Mapped[Account] = sa_orm.synonym('account')
 
     # Organization roles:
-    is_owner: Mapped[bool] = immutable(
-        sa.orm.mapped_column(sa.Boolean, nullable=False, default=False)
-    )
+    is_owner: Mapped[bool] = immutable(sa_orm.mapped_column(default=False))
 
     @cached_property
     def offered_roles(self) -> set[str]:
@@ -109,128 +100,3 @@ def offered_roles(self) -> set[str]:
         if self.is_owner:
             roles.add('owner')
         return roles
-
-
-# Add active membership relationships to Account
-@reopen(Account)
-class __Account:
-    active_admin_memberships: DynamicMapped[AccountMembership] = with_roles(
-        relationship(
-            AccountMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                sa.orm.remote(AccountMembership.account_id) == Account.id,
-                AccountMembership.is_active,
-            ),
-            order_by=AccountMembership.granted_at.asc(),
-            viewonly=True,
-        ),
-        grants_via={'member': {'admin', 'owner'}},
-    )
-
-    active_owner_memberships: DynamicMapped[AccountMembership] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.account_id) == Account.id,
-            AccountMembership.is_active,
-            AccountMembership.is_owner.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    active_invitations: DynamicMapped[AccountMembership] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.account_id) == Account.id,
-            AccountMembership.is_invite,
-            AccountMembership.revoked_at.is_(None),
-        ),
-        viewonly=True,
-    )
-
-    owner_users = with_roles(
-        DynamicAssociationProxy[Account]('active_owner_memberships', 'member'),
-        read={'all'},
-    )
-    admin_users = with_roles(
-        DynamicAssociationProxy[Account]('active_admin_memberships', 'member'),
-        read={'all'},
-    )
-
-    # pylint: disable=invalid-unary-operand-type
-    organization_admin_memberships: DynamicMapped[AccountMembership] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        foreign_keys=[AccountMembership.member_id],  # type: ignore[has-type]
-        viewonly=True,
-    )
-
-    noninvite_organization_admin_memberships: DynamicMapped[
-        AccountMembership
-    ] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        foreign_keys=[AccountMembership.member_id],
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.member_id)  # type: ignore[has-type]
-            == Account.id,
-            ~AccountMembership.is_invite,
-        ),
-        viewonly=True,
-    )
-
-    active_organization_admin_memberships: DynamicMapped[
-        AccountMembership
-    ] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        foreign_keys=[AccountMembership.member_id],
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.member_id)  # type: ignore[has-type]
-            == Account.id,
-            AccountMembership.is_active,
-        ),
-        viewonly=True,
-    )
-
-    active_organization_owner_memberships: DynamicMapped[
-        AccountMembership
-    ] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        foreign_keys=[AccountMembership.member_id],
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.member_id)  # type: ignore[has-type]
-            == Account.id,
-            AccountMembership.is_active,
-            AccountMembership.is_owner.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    active_organization_invitations: DynamicMapped[AccountMembership] = relationship(
-        AccountMembership,
-        lazy='dynamic',
-        foreign_keys=[AccountMembership.member_id],
-        primaryjoin=sa.and_(
-            sa.orm.remote(AccountMembership.member_id)  # type: ignore[has-type]
-            == Account.id,
-            AccountMembership.is_invite,
-            AccountMembership.revoked_at.is_(None),
-        ),
-        viewonly=True,
-    )
-
-    organizations_as_owner = DynamicAssociationProxy(
-        'active_organization_owner_memberships', 'account'
-    )
-
-    organizations_as_admin = DynamicAssociationProxy(
-        'active_organization_admin_memberships', 'account'
-    )
-
-
-Account.__active_membership_attrs__.add('active_organization_admin_memberships')
-Account.__noninvite_membership_attrs__.add('noninvite_organization_admin_memberships')
diff --git a/funnel/models/auth_client.py b/funnel/models/auth_client.py
index 8c1dc8b40..1496b5539 100644
--- a/funnel/models/auth_client.py
+++ b/funnel/models/auth_client.py
@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import urllib.parse
-from collections.abc import Iterable, Sequence
+from collections.abc import Collection, Sequence
 from datetime import datetime, timedelta
 from hashlib import blake2b, sha256
-from typing import cast, overload
+from typing import Any, Self, cast, overload
 
 from sqlalchemy.orm import attribute_keyed_dict, load_only
 from sqlalchemy.orm.query import Query as QueryBaseClass
@@ -16,22 +16,21 @@
 from coaster.sqlalchemy import with_roles
 from coaster.utils import buid as make_buid, newsecret, require_one_of, utcnow
 
-from . import (
+from .account import Account, Team
+from .base import (
     BaseMixin,
     DynamicMapped,
     Mapped,
     Model,
     Query,
     UuidMixin,
-    backref,
     db,
     declarative_mixin,
     declared_attr,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account, Team
-from .helpers import reopen
 from .login_session import LoginSession, auth_client_login_session
 
 __all__ = [
@@ -54,19 +53,19 @@ class ScopeMixin:
     @classmethod
     def _scope(cls) -> Mapped[str]:
         """Database column for storing scopes as a space-separated string."""
-        return sa.orm.mapped_column(
+        return sa_orm.mapped_column(
             'scope', sa.UnicodeText, nullable=cls.__scope_null_allowed__
         )
 
     @property
-    def scope(self) -> Iterable[str]:
+    def scope(self) -> Collection[str]:
         """Represent scope column as a container of strings."""
         if not self._scope:
             return ()
         return tuple(sorted(self._scope.split()))
 
     @scope.setter
-    def scope(self, value: str | Iterable | None) -> None:
+    def scope(self, value: str | Collection | None) -> None:
         if value is None:
             if self.__scope_null_allowed__:
                 self._scope = None
@@ -78,69 +77,63 @@ def scope(self, value: str | Iterable | None) -> None:
         if not self._scope and self.__scope_null_allowed__:
             self._scope = None
 
-    def add_scope(self, additional: str | Iterable) -> None:
+    def add_scope(self, additional: str | Collection) -> None:
         """Add additional items to the scope."""
         if isinstance(additional, str):
             additional = [additional]
         self.scope = set(self.scope).union(set(additional))
 
 
-class AuthClient(ScopeMixin, UuidMixin, BaseMixin, Model):
+class AuthClient(ScopeMixin, UuidMixin, BaseMixin[int, Account], Model):
     """OAuth client application."""
 
     __tablename__ = 'auth_client'
     __scope_null_allowed__ = True
     #: Account that owns this client
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True
-    )
-    account: Mapped[Account | None] = with_roles(
-        relationship(
-            Account,
-            foreign_keys=[account_id],
-            backref=backref('clients', cascade='all'),
-        ),
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
+    )
+    account: Mapped[Account] = with_roles(
+        relationship(back_populates='clients'),
         read={'all'},
         write={'owner'},
         grants_via={None: {'owner': 'owner', 'admin': 'admin'}},
     )
     #: Human-readable title
     title: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(250), nullable=False),
+        sa_orm.mapped_column(sa.Unicode(250), nullable=False),
         read={'all'},
         write={'owner'},
     )
     #: Long description
     description: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.UnicodeText, nullable=False, default=''),
+        sa_orm.mapped_column(sa.UnicodeText, nullable=False, default=''),
         read={'all'},
         write={'owner'},
     )
     #: Confidential or public client? Public has no secret key
     confidential: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), read={'all'}, write={'owner'}
+        sa_orm.mapped_column(), read={'all'}, write={'owner'}
     )
     #: Website
     website: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.UnicodeText, nullable=False),  # FIXME: Use UrlType
+        sa_orm.mapped_column(sa.UnicodeText, nullable=False),  # FIXME: Use UrlType
         read={'all'},
         write={'owner'},
     )
     #: Redirect URIs (one or more)
-    _redirect_uris: Mapped[str | None] = sa.orm.mapped_column(
+    _redirect_uris: Mapped[str | None] = sa_orm.mapped_column(
         'redirect_uri', sa.UnicodeText, nullable=True, default=''
     )
     #: Back-end notification URI (TODO: deprecated, needs better architecture)
     notification_uri: Mapped[str | None] = with_roles(  # FIXME: Use UrlType
-        sa.orm.mapped_column(sa.UnicodeText, nullable=True, default=''), rw={'owner'}
+        sa_orm.mapped_column(sa.UnicodeText, nullable=True, default=''), rw={'owner'}
     )
     #: Active flag
-    active: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=True
-    )
+    active: Mapped[bool] = sa_orm.mapped_column(default=True)
     #: Allow anyone to login to this app?
     allow_any_login: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False, default=True),
+        sa_orm.mapped_column(default=True),
         read={'all'},
         write={'owner'},
     )
@@ -151,14 +144,30 @@ class AuthClient(ScopeMixin, UuidMixin, BaseMixin, Model):
     #: However, resources in the scope column (via ScopeMixin) are granted for
     #: any arbitrary user without explicit user authorization.
     trusted: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False, default=False), read={'all'}
+        sa_orm.mapped_column(default=False), read={'all'}
     )
 
+    # --- Backrefs
+
     login_sessions: DynamicMapped[LoginSession] = relationship(
-        LoginSession,
         lazy='dynamic',
         secondary=auth_client_login_session,
-        backref=backref('auth_clients', lazy='dynamic'),
+        back_populates='auth_clients',
+    )
+    credentials: Mapped[dict[str, AuthClientCredential]] = relationship(
+        collection_class=attribute_keyed_dict('name'), back_populates='auth_client'
+    )
+    authcodes: DynamicMapped[AuthCode] = relationship(
+        lazy='dynamic', back_populates='auth_client'
+    )
+    authtokens: DynamicMapped[AuthToken] = relationship(
+        lazy='dynamic', back_populates='auth_client'
+    )
+    account_permissions: Mapped[list[AuthClientPermissions]] = relationship(
+        back_populates='auth_client'
+    )
+    team_permissions: Mapped[list[AuthClientTeamPermissions]] = relationship(
+        back_populates='auth_client'
     )
 
     __roles__ = {
@@ -178,12 +187,12 @@ def secret_is(self, candidate: str, name: str) -> bool:
         return credential.secret_is(candidate)
 
     @property
-    def redirect_uris(self) -> Iterable[str]:
+    def redirect_uris(self) -> Sequence[str]:
         """Return redirect URIs as a sequence."""
         return tuple(self._redirect_uris.split()) if self._redirect_uris else ()
 
     @redirect_uris.setter
-    def redirect_uris(self, value: Iterable) -> None:
+    def redirect_uris(self, value: Sequence[str]) -> None:
         """Set redirect URIs from a sequence, storing internally as lines of text."""
         self._redirect_uris = '\r\n'.join(value)
 
@@ -192,8 +201,7 @@ def redirect_uris(self, value: Iterable) -> None:
     @property
     def redirect_uri(self) -> str | None:
         """Return the first redirect URI, if present."""
-        uris = self.redirect_uris  # Assign to local var to avoid splitting twice
-        if uris:
+        if uris := self.redirect_uris:
             return uris[0]
         return None
 
@@ -203,7 +211,7 @@ def host_matches(self, url: str) -> bool:
         if netloc:
             return netloc in (
                 urllib.parse.urlsplit(r).netloc
-                for r in (self.redirect_uris + (self.website,))
+                for r in (tuple(self.redirect_uris) + (self.website,))
             )
         return False
 
@@ -216,7 +224,7 @@ def authtoken_for(
         self, account: Account | None, login_session: LoginSession | None = None
     ) -> AuthToken | None:
         """
-        Return the authtoken for this account and client.
+        Return the auth token for this account and client.
 
         Only works for confidential clients.
         """
@@ -252,7 +260,7 @@ def get(cls, buid: str) -> AuthClient | None:
         return cls.query.filter(cls.buid == buid, cls.active.is_(True)).one_or_none()
 
     @classmethod
-    def all_for(cls, account: Account | None) -> Query[AuthClient]:
+    def all_for(cls, account: Account | None) -> Query[Self]:
         """Return all clients, optionally all clients owned by the specified account."""
         if account is None:
             return cls.query.order_by(cls.title)
@@ -264,7 +272,7 @@ def all_for(cls, account: Account | None) -> Query[AuthClient]:
         ).order_by(cls.title)
 
 
-class AuthClientCredential(BaseMixin, Model):
+class AuthClientCredential(BaseMixin[int, Account], Model):
     """
     AuthClient key and secret hash.
 
@@ -284,33 +292,30 @@ class AuthClientCredential(BaseMixin, Model):
     """
 
     __tablename__ = 'auth_client_credential'
-    auth_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('auth_client.id'), nullable=False
+    auth_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('auth_client.id'), default=None, nullable=False
     )
     auth_client: Mapped[AuthClient] = with_roles(
-        relationship(
-            AuthClient,
-            backref=backref(
-                'credentials',
-                cascade='all, delete-orphan',
-                collection_class=attribute_keyed_dict('name'),
-            ),
-        ),
+        relationship(back_populates='credentials'),
         grants_via={None: {'owner'}},
     )
 
     #: OAuth client key
-    name: Mapped[str] = sa.orm.mapped_column(
-        sa.String(22), nullable=False, unique=True, default=make_buid
+    name: Mapped[str] = sa_orm.mapped_column(
+        sa.String(22),
+        insert_default=make_buid,
+        default=None,
+        nullable=False,
+        unique=True,
     )
     #: User description for this credential
-    title: Mapped[str] = sa.orm.mapped_column(
+    title: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(250), nullable=False, default=''
     )
     #: OAuth client secret, hashed
-    secret_hash: Mapped[str] = sa.orm.mapped_column(sa.Unicode, nullable=False)
+    secret_hash: Mapped[str] = sa_orm.mapped_column()
     #: When was this credential last used for an API call?
-    accessed_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    accessed_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
@@ -367,31 +372,27 @@ def new(cls, auth_client: AuthClient) -> tuple[AuthClientCredential, str]:
         return cred, secret
 
 
-class AuthCode(ScopeMixin, BaseMixin, Model):
+class AuthCode(ScopeMixin, BaseMixin[int, Account], Model):
     """Short-lived authorization tokens."""
 
     __tablename__ = 'auth_code'
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
-    account: Mapped[Account] = relationship(Account, foreign_keys=[account_id])
-    auth_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('auth_client.id'), nullable=False
+    account: Mapped[Account] = relationship(foreign_keys=[account_id])
+    auth_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('auth_client.id'), default=None, nullable=False
     )
-    auth_client: Mapped[AuthClient] = relationship(
-        AuthClient,
-        foreign_keys=[auth_client_id],
-        backref=backref('authcodes', cascade='all'),
+    auth_client: Mapped[AuthClient] = relationship(back_populates='authcodes')
+    login_session_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('login_session.id'), default=None, nullable=True
     )
-    login_session_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('login_session.id'), nullable=True
+    login_session: Mapped[LoginSession | None] = relationship()
+    code: Mapped[str] = sa_orm.mapped_column(
+        sa.String(44), insert_default=newsecret, default=None, nullable=False
     )
-    login_session: Mapped[LoginSession | None] = relationship(LoginSession)
-    code: Mapped[str] = sa.orm.mapped_column(
-        sa.String(44), default=newsecret, nullable=False
-    )
-    redirect_uri: Mapped[str] = sa.orm.mapped_column(sa.UnicodeText, nullable=False)
-    used: Mapped[bool] = sa.orm.mapped_column(sa.Boolean, default=False, nullable=False)
+    redirect_uri: Mapped[str] = sa_orm.mapped_column(sa.UnicodeText, nullable=False)
+    used: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     def is_valid(self) -> bool:
         """Test if this auth code is still valid."""
@@ -400,7 +401,7 @@ def is_valid(self) -> bool:
         return not self.used and self.created_at >= utcnow() - timedelta(minutes=3)
 
     @classmethod
-    def all_for(cls, account: Account) -> Query[AuthCode]:
+    def all_for(cls, account: Account) -> Query[Self]:
         """Return all auth codes for the specified account."""
         return cls.query.filter(cls.account == account)
 
@@ -412,58 +413,56 @@ def get_for_client(cls, auth_client: AuthClient, code: str) -> AuthCode | None:
         ).one_or_none()
 
 
-class AuthToken(ScopeMixin, BaseMixin, Model):
+class AuthToken(ScopeMixin, BaseMixin[int, Account], Model):
     """Access tokens for access to data."""
 
     __tablename__ = 'auth_token'
     # Account id is null for client-only tokens and public clients as the account is
     # identified via login_session.account there
-    account_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True
-    )
-    account: Mapped[Account | None] = relationship(
-        Account,
-        backref=backref('authtokens', lazy='dynamic', cascade='all'),
+    account_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=True
     )
+    account: Mapped[Account | None] = relationship(back_populates='authtokens')
     #: The session in which this token was issued, null for confidential clients
-    login_session_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('login_session.id'), nullable=True
+    login_session_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('login_session.id'), default=None, nullable=True
     )
     login_session: Mapped[LoginSession | None] = with_roles(
-        relationship(LoginSession, backref=backref('authtokens', lazy='dynamic')),
+        relationship(back_populates='authtokens'),
         read={'owner'},
     )
-    #: The client this authtoken is for
-    auth_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('auth_client.id'), nullable=False, index=True
+    #: The client this auth token is for
+    auth_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('auth_client.id'), default=None, nullable=False, index=True
     )
     auth_client: Mapped[AuthClient] = with_roles(
-        relationship(
-            AuthClient,
-            backref=backref('authtokens', lazy='dynamic', cascade='all'),
-        ),
+        relationship(back_populates='authtokens'),
         read={'owner'},
     )
     #: The token
-    token: Mapped[str] = sa.orm.mapped_column(
-        sa.String(22), default=make_buid, nullable=False, unique=True
+    token: Mapped[str] = sa_orm.mapped_column(
+        sa.String(22),
+        insert_default=make_buid,
+        default=None,
+        nullable=False,
+        unique=True,
     )
     #: The token's type, 'bearer', 'mac' or a URL
-    token_type: Mapped[str] = sa.orm.mapped_column(
+    token_type: Mapped[str] = sa_orm.mapped_column(
         sa.String(250), default='bearer', nullable=False
     )
     #: Token secret for 'mac' type
-    secret: Mapped[str | None] = sa.orm.mapped_column(sa.String(44), nullable=True)
+    secret: Mapped[str | None] = sa_orm.mapped_column(sa.String(44), nullable=True)
     #: Secret's algorithm (for 'mac' type)
-    algorithm: Mapped[str | None] = sa.orm.mapped_column(sa.String(20), nullable=True)
+    algorithm: Mapped[str | None] = sa_orm.mapped_column(sa.String(20), nullable=True)
     #: Token's validity period in seconds, 0 = unlimited
-    validity: Mapped[int] = sa.orm.mapped_column(sa.Integer, nullable=False, default=0)
+    validity: Mapped[int] = sa_orm.mapped_column(sa.Integer, nullable=False, default=0)
     #: Refresh token, to obtain a new token
-    refresh_token: Mapped[str | None] = sa.orm.mapped_column(
+    refresh_token: Mapped[str | None] = sa_orm.mapped_column(
         sa.String(22), nullable=True, unique=True
     )
 
-    # Only one authtoken per user and client. Add to scope as needed
+    # Only one auth token per user and client. Add to scope as needed
     __table_args__ = (
         sa.UniqueConstraint('account_id', 'auth_client_id'),
         sa.UniqueConstraint('login_session_id', 'auth_client_id'),
@@ -476,7 +475,7 @@ class AuthToken(ScopeMixin, BaseMixin, Model):
         }
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.token = make_buid()
         if self.effective_user:
@@ -520,7 +519,7 @@ def refresh(self) -> None:
             self.token = make_buid()
             self.secret = newsecret()
 
-    @sa.orm.validates('algorithm')
+    @sa_orm.validates('algorithm')
     def _validate_algorithm(self, _key: str, value: str | None) -> str | None:
         """Set mac token algorithm to one of supported values."""
         if value is None:
@@ -539,6 +538,11 @@ def is_valid(self) -> bool:
             return False
         return True
 
+    @classmethod
+    def revoke_all_for(cls, account: Account) -> None:
+        """Revoke all auth tokens directly linked to the account."""
+        cls.all_for(account).delete(synchronize_session=False)
+
     @classmethod
     def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         """Migrate one account's data to another when merging accounts."""
@@ -601,7 +605,7 @@ def get_for(
         ).one_or_none()
 
     @classmethod
-    def all(cls, accounts: Query | Sequence[Account]) -> list[AuthToken]:  # noqa: A003
+    def all(cls, accounts: Query | Collection[Account]) -> list[Self]:  # noqa: A003
         """Return all AuthToken for the specified accounts."""
         query = cls.query.join(AuthClient)
         if isinstance(accounts, QueryBaseClass):
@@ -627,41 +631,33 @@ def all(cls, accounts: Query | Sequence[Account]) -> list[AuthToken]:  # noqa: A
         return []
 
     @classmethod
-    def all_for(cls, account: Account) -> Query[AuthToken]:
+    def all_for(cls, account: Account) -> Query[Self]:
         """Get all AuthTokens for a specified account (direct only)."""
         return cls.query.filter(cls.account == account)
 
 
 # This model's name is in plural because it defines multiple permissions within each
 # instance
-class AuthClientPermissions(BaseMixin, Model):
+class AuthClientPermissions(BaseMixin[int, Account], Model):
     """Permissions assigned to an account on a client app."""
 
     __tablename__ = 'auth_client_permissions'
     __tablename__ = 'auth_client_permissions'
     #: User account that has these permissions
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
-    )
-    account: Mapped[Account] = relationship(
-        Account,
-        foreign_keys=[account_id],
-        backref=backref('client_permissions', cascade='all'),
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
+    account: Mapped[Account] = relationship(back_populates='client_permissions')
     #: AuthClient app they are assigned on
-    auth_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('auth_client.id'), nullable=False, index=True
+    auth_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('auth_client.id'), default=None, nullable=False, index=True
     )
     auth_client: Mapped[AuthClient] = with_roles(
-        relationship(
-            AuthClient,
-            foreign_keys=[auth_client_id],
-            backref=backref('account_permissions', cascade='all'),
-        ),
+        relationship(back_populates='account_permissions'),
         grants_via={None: {'owner'}},
     )
     #: The permissions as a string of tokens
-    access_permissions: Mapped[str] = sa.orm.mapped_column(
+    access_permissions: Mapped[str] = sa_orm.mapped_column(
         'permissions', sa.UnicodeText, default='', nullable=False
     )
 
@@ -674,6 +670,11 @@ def pickername(self) -> str:
         """Return label string for identification of the subject account."""
         return self.account.pickername
 
+    @classmethod
+    def revoke_all_for(cls, account: Account) -> None:
+        """Revoke all permissions on client apps assigned to account."""
+        cls.all_for(account).delete(synchronize_session=False)
+
     @classmethod
     def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         """Migrate one account's data to another when merging accounts."""
@@ -702,45 +703,37 @@ def get(
         ).one_or_none()
 
     @classmethod
-    def all_for(cls, account: Account) -> Query[AuthClientPermissions]:
+    def all_for(cls, account: Account) -> Query[Self]:
         """Get all permissions assigned to account for various clients."""
         return cls.query.filter(cls.account == account)
 
     @classmethod
-    def all_forclient(cls, auth_client: AuthClient) -> Query[AuthClientPermissions]:
+    def all_forclient(cls, auth_client: AuthClient) -> Query[Self]:
         """Get all permissions assigned on the specified auth client."""
         return cls.query.filter(cls.auth_client == auth_client)
 
 
 # This model's name is in plural because it defines multiple permissions within each
 # instance
-class AuthClientTeamPermissions(BaseMixin, Model):
+class AuthClientTeamPermissions(BaseMixin[int, Account], Model):
     """Permissions assigned to a team on a client app."""
 
     __tablename__ = 'auth_client_team_permissions'
     #: Team which has these permissions
-    team_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('team.id'), nullable=False
-    )
-    team: Mapped[Team] = relationship(
-        Team,
-        foreign_keys=[team_id],
-        backref=backref('client_permissions', cascade='all'),
+    team_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('team.id'), default=None, nullable=False
     )
+    team: Mapped[Team] = relationship(back_populates='client_permissions')
     #: AuthClient app they are assigned on
-    auth_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('auth_client.id'), nullable=False, index=True
+    auth_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('auth_client.id'), default=None, nullable=False, index=True
     )
     auth_client: Mapped[AuthClient] = with_roles(
-        relationship(
-            AuthClient,
-            foreign_keys=[auth_client_id],
-            backref=backref('team_permissions', cascade='all'),
-        ),
+        relationship(back_populates='team_permissions'),
         grants_via={None: {'owner'}},
     )
     #: The permissions as a string of tokens
-    access_permissions: Mapped[str] = sa.orm.mapped_column(
+    access_permissions: Mapped[str] = sa_orm.mapped_column(
         'permissions', sa.UnicodeText, default='', nullable=False
     )
 
@@ -763,9 +756,7 @@ def get(
         ).one_or_none()
 
     @classmethod
-    def all_for(
-        cls, auth_client: AuthClient, account: Account
-    ) -> Query[AuthClientTeamPermissions]:
+    def all_for(cls, auth_client: AuthClient, account: Account) -> Query[Self]:
         """Get all permissions for the specified account via their teams."""
         return cls.query.filter(
             cls.auth_client == auth_client,
@@ -773,19 +764,6 @@ def all_for(
         )
 
     @classmethod
-    def all_forclient(cls, auth_client: AuthClient) -> Query[AuthClientTeamPermissions]:
+    def all_forclient(cls, auth_client: AuthClient) -> Query[Self]:
         """Get all permissions assigned on the specified auth client."""
         return cls.query.filter(cls.auth_client == auth_client)
-
-
-@reopen(Account)
-class __Account:
-    def revoke_all_auth_tokens(self) -> None:
-        """Revoke all auth tokens directly linked to the account."""
-        AuthToken.all_for(cast(Account, self)).delete(synchronize_session=False)
-
-    def revoke_all_auth_client_permissions(self) -> None:
-        """Revoke all permissions on client apps assigned to account."""
-        AuthClientPermissions.all_for(cast(Account, self)).delete(
-            synchronize_session=False
-        )
diff --git a/funnel/models/base.py b/funnel/models/base.py
new file mode 100644
index 000000000..e94e1348d
--- /dev/null
+++ b/funnel/models/base.py
@@ -0,0 +1,102 @@
+"""Model base class and shared imports."""
+
+from __future__ import annotations
+
+from typing import ClassVar
+
+import sqlalchemy as sa
+import sqlalchemy.exc as sa_exc
+import sqlalchemy.orm as sa_orm
+from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import Table
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import DeclarativeBase, Mapped, declarative_mixin, declared_attr
+from sqlalchemy_utils import LocaleType, TimezoneType, TSVectorType
+
+from coaster.sqlalchemy import (
+    BaseIdNameMixin,
+    BaseMixin,
+    BaseNameMixin,
+    BaseScopedIdMixin,
+    BaseScopedIdNameMixin,
+    BaseScopedNameMixin,
+    CoordinatesMixin,
+    DynamicMapped,
+    ModelBase,
+    NoIdMixin,
+    Query,
+    QueryProperty,
+    RegistryMixin,
+    RoleMixin,
+    TimestampMixin,
+    UrlType,
+    UuidMixin,
+    backref,
+    relationship,
+    with_roles,
+)
+
+
+class Model(ModelBase, DeclarativeBase):
+    """Base for all models."""
+
+    __table__: ClassVar[Table]
+    __with_timezone__ = True
+
+
+class GeonameModel(ModelBase, DeclarativeBase):
+    """Base for geoname models."""
+
+    __table__: ClassVar[Table]
+    __bind_key__ = 'geoname'
+    __with_timezone__ = True
+
+
+# This must be set _before_ any of the models using db.Model are imported
+TimestampMixin.__with_timezone__ = True
+
+db: SQLAlchemy = SQLAlchemy(
+    query_class=Query,  # type: ignore[arg-type]
+    metadata=Model.metadata,
+)
+Model.init_flask_sqlalchemy(db)
+GeonameModel.init_flask_sqlalchemy(db)
+
+
+__all__ = [
+    'backref',
+    'BaseIdNameMixin',
+    'BaseMixin',
+    'BaseNameMixin',
+    'BaseScopedIdMixin',
+    'BaseScopedIdNameMixin',
+    'BaseScopedNameMixin',
+    'CoordinatesMixin',
+    'db',
+    'declarative_mixin',
+    'declared_attr',
+    'DynamicMapped',
+    'GeonameModel',
+    'hybrid_property',
+    'LocaleType',
+    'Mapped',
+    'Model',
+    'ModelBase',
+    'NoIdMixin',
+    'postgresql',
+    'Query',
+    'QueryProperty',
+    'RegistryMixin',
+    'relationship',
+    'RoleMixin',
+    'sa_exc',
+    'sa_orm',
+    'sa',
+    'TimestampMixin',
+    'TimezoneType',
+    'TSVectorType',
+    'UrlType',
+    'UuidMixin',
+    'with_roles',
+]
diff --git a/funnel/models/comment.py b/funnel/models/comment.py
index 87d11a475..06ddb4791 100644
--- a/funnel/models/comment.py
+++ b/funnel/models/comment.py
@@ -12,32 +12,27 @@
 from coaster.sqlalchemy import LazyRoleSet, RoleAccessProxy, StateManager, with_roles
 from coaster.utils import LabeledEnum
 
-from . import (
+from .account import (
+    Account,
+    DuckTypeAccount,
+    deleted_account,
+    removed_account,
+    unknown_account,
+)
+from .base import (
     BaseMixin,
     DynamicMapped,
     Mapped,
     Model,
     TSVectorType,
     UuidMixin,
-    backref,
     db,
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import (
-    Account,
-    DuckTypeAccount,
-    deleted_account,
-    removed_account,
-    unknown_account,
-)
-from .helpers import (
-    MarkdownCompositeBasic,
-    MessageComposite,
-    add_search_trigger,
-    reopen,
-)
+from .helpers import MarkdownCompositeBasic, MessageComposite, add_search_trigger
 
 __all__ = ['Comment', 'Commentset']
 
@@ -86,37 +81,82 @@ class SET_TYPE:  # noqa: N801
 # --- Models ---------------------------------------------------------------------------
 
 
-class Commentset(UuidMixin, BaseMixin, Model):
+class Commentset(UuidMixin, BaseMixin[int, Account], Model):
     __tablename__ = 'commentset'
     #: Commentset state code
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
         sa.SmallInteger,
-        StateManager.check_constraint('state', COMMENTSET_STATE),
+        StateManager.check_constraint('state', COMMENTSET_STATE, sa.SmallInteger),
         nullable=False,
         default=COMMENTSET_STATE.OPEN,
     )
     #: Commentset state manager
-    state = StateManager('_state', COMMENTSET_STATE, doc="Commentset state")
+    state = StateManager['Commentset'](
+        '_state', COMMENTSET_STATE, doc="Commentset state"
+    )
     #: Type of parent object
     settype: Mapped[int | None] = with_roles(
-        sa.orm.mapped_column('type', sa.Integer, nullable=True),
+        sa_orm.mapped_column('type', nullable=True),
         read={'all'},
         datasets={'primary'},
     )
     #: Count of comments, stored to avoid count(*) queries
     count: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, default=0, nullable=False),
+        sa_orm.mapped_column(default=0, nullable=False),
         read={'all'},
         datasets={'primary'},
     )
     #: Timestamp of last comment, for ordering.
     last_comment_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
         read={'all'},
         datasets={'primary'},
     )
 
+    comments: DynamicMapped[Comment] = relationship(
+        lazy='dynamic', back_populates='commentset'
+    )
+    toplevel_comments: DynamicMapped[Comment] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            Comment.commentset_id == Commentset.id, Comment.in_reply_to_id.is_(None)
+        ),
+        viewonly=True,
+    )
+    active_memberships: DynamicMapped[CommentsetMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            CommentsetMembership.commentset_id == Commentset.id,
+            CommentsetMembership.is_active,
+        ),
+        viewonly=True,
+    )
+    # Send notifications only to subscribers who haven't muted
+    active_memberships_unmuted: DynamicMapped[CommentsetMembership] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                CommentsetMembership.commentset_id == Commentset.id,
+                CommentsetMembership.is_active,
+                CommentsetMembership.is_muted.is_(False),
+            ),
+            viewonly=True,
+        ),
+        grants_via={'member': {'document_subscriber'}},
+    )
+
+    project: Mapped[Project | None] = with_roles(
+        relationship(uselist=False, back_populates='commentset'),
+        grants_via={None: {'editor': 'document_subscriber'}},
+    )
+    proposal: Mapped[Proposal | None] = relationship(
+        uselist=False, back_populates='commentset'
+    )
+    update: Mapped[Update | None] = relationship(
+        uselist=False, back_populates='commentset'
+    )
+
     __roles__ = {
         'all': {
             'read': {'project', 'proposal', 'update', 'urls'},
@@ -129,13 +169,13 @@ class Commentset(UuidMixin, BaseMixin, Model):
         'related': {'uuid_b58', 'url_name_uuid_b58'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.count = 0
 
     @cached_property
     def parent(self) -> Project | Proposal | Update:
-        # FIXME: Move this to a CommentMixin that uses a registry, like EmailAddress
+        # TODO: Move this to a CommentMixin that uses a registry, like EmailAddress
         if self.project is not None:
             return self.project
         if self.proposal is not None:
@@ -153,7 +193,7 @@ def parent_type(self) -> str:
     with_roles(parent_type, read={'all'})
 
     @cached_property
-    def last_comment(self):
+    def last_comment(self) -> Comment | None:
         return (
             self.comments.filter(Comment.state.PUBLIC)
             .order_by(Comment.created_at.desc())
@@ -182,81 +222,130 @@ def post_comment(
         # 2. Make a CommentMixin (like EmailAddressMixin) and insert logic into the
         #    parent, which can override methods and add custom restrictions
         comment = Comment(
-            posted_by=actor,
-            commentset=self,
-            message=message,
-            in_reply_to=in_reply_to,
+            posted_by=actor, commentset=self, message=message, in_reply_to=in_reply_to
         )
         self.count = Commentset.count + 1
         db.session.add(comment)
         return comment
 
     @state.transition(state.OPEN, state.DISABLED)
-    def disable_comments(self):
+    def disable_comments(self) -> None:
         """Disable posting of comments."""
 
     @state.transition(state.DISABLED, state.OPEN)
-    def enable_comments(self):
+    def enable_comments(self) -> None:
         """Enable posting of comments."""
 
     # Transitions for the other two states are pending on the TODO notes in post_comment
 
-
-class Comment(UuidMixin, BaseMixin, Model):
+    def update_last_seen_at(self, member: Account) -> None:
+        subscription = CommentsetMembership.query.filter_by(
+            commentset=self, member=member, is_active=True
+        ).one_or_none()
+        if subscription is not None:
+            subscription.update_last_seen_at()
+
+    def add_subscriber(self, actor: Account, member: Account) -> bool:
+        """Return True is subscriber is added or unmuted, False if already exists."""
+        changed = False
+        subscription = CommentsetMembership.query.filter_by(
+            commentset=self, member=member, is_active=True
+        ).one_or_none()
+        if subscription is None:
+            subscription = CommentsetMembership(
+                commentset=self,
+                member=member,
+                granted_by=actor,
+            )
+            db.session.add(subscription)
+            changed = True
+        elif subscription.is_muted:
+            subscription = subscription.replace(actor=actor, is_muted=False)
+            changed = True
+        subscription.update_last_seen_at()
+        return changed
+
+    def mute_subscriber(self, actor: Account, member: Account) -> bool:
+        """Return True if subscriber was muted, False if already muted or missing."""
+        subscription = CommentsetMembership.query.filter_by(
+            commentset=self, member=member, is_active=True
+        ).one_or_none()
+        if subscription is not None and not subscription.is_muted:
+            subscription.replace(actor=actor, is_muted=True)
+            return True
+        return False
+
+    def unmute_subscriber(self, actor: Account, member: Account) -> bool:
+        """Return True if subscriber was unmuted, False if not muted or missing."""
+        subscription = CommentsetMembership.query.filter_by(
+            commentset=self, member=member, is_active=True
+        ).one_or_none()
+        if subscription is not None and subscription.is_muted:
+            subscription.replace(actor=actor, is_muted=False)
+            return True
+        return False
+
+    def remove_subscriber(self, actor: Account, member: Account) -> bool:
+        """Return True is subscriber is removed, False if already removed."""
+        subscription = CommentsetMembership.query.filter_by(
+            commentset=self, member=member, is_active=True
+        ).one_or_none()
+        if subscription is not None:
+            subscription.revoke(actor=actor)
+            return True
+        return False
+
+
+class Comment(UuidMixin, BaseMixin[int, Account], Model):
     __tablename__ = 'comment'
 
-    posted_by_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True
+    posted_by_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=True
     )
     _posted_by: Mapped[Account | None] = with_roles(
-        relationship(
-            Account, backref=backref('comments', lazy='dynamic', cascade='all')
-        ),
+        relationship(back_populates='comments'),
         grants={'author'},
     )
-    commentset_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('commentset.id'), nullable=False
+    commentset_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('commentset.id'), default=None, nullable=False
     )
     commentset: Mapped[Commentset] = with_roles(
-        relationship(
-            Commentset,
-            backref=backref('comments', lazy='dynamic', cascade='all'),
-        ),
+        relationship(back_populates='comments'),
         grants_via={None: {'document_subscriber'}},
     )
 
-    in_reply_to_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('comment.id'), nullable=True
+    in_reply_to_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('comment.id'), default=None, nullable=True
     )
-    replies: Mapped[list[Comment]] = relationship(
-        'Comment', backref=backref('in_reply_to', remote_side='Comment.id')
+    in_reply_to: Mapped[Comment] = relationship(
+        back_populates='replies', remote_side='Comment.id'
     )
+    replies: Mapped[list[Comment]] = relationship(back_populates='in_reply_to')
 
     _message, message_text, message_html = MarkdownCompositeBasic.create(
         'message', nullable=False
     )
 
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
-        sa.Integer,
-        StateManager.check_constraint('state', COMMENT_STATE),
+        StateManager.check_constraint('state', COMMENT_STATE, sa.Integer),
         default=COMMENT_STATE.SUBMITTED,
         nullable=False,
     )
-    state = StateManager('_state', COMMENT_STATE, doc="Current state of the comment")
+    state = StateManager['Comment'](
+        '_state', COMMENT_STATE, doc="Current state of the comment"
+    )
 
     edited_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
         read={'all'},
         datasets={'primary', 'related', 'json'},
     )
 
     #: Revision number maintained by SQLAlchemy, starting at 1
-    revisionid: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=False), read={'all'}
-    )
+    revisionid: Mapped[int] = with_roles(sa_orm.mapped_column(), read={'all'})
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'message_text',
             weights={'message_text': 'A'},
@@ -267,6 +356,10 @@ class Comment(UuidMixin, BaseMixin, Model):
         deferred=True,
     )
 
+    moderator_reports: DynamicMapped[CommentModeratorReport] = relationship(
+        lazy='dynamic', back_populates='comment'
+    )
+
     __table_args__ = (
         sa.Index('ix_comment_search_vector', 'search_vector', postgresql_using='gin'),
     )
@@ -287,8 +380,9 @@ class Comment(UuidMixin, BaseMixin, Model):
         'json': {'created_at', 'urls', 'uuid_b58', 'absolute_url'},
         'minimal': {'created_at', 'uuid_b58'},
     }
+    __json_datasets__ = ('json',)
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.commentset.last_comment_at = sa.func.utcnow()
 
@@ -322,9 +416,9 @@ def posted_by(self) -> Account | DuckTypeAccount:
     def _posted_by_setter(self, value: Account | None) -> None:
         self._posted_by = value
 
-    @posted_by.inplace.expression
+    @posted_by.inplace.expression  # type: ignore[arg-type]
     @classmethod
-    def _posted_by_expression(cls) -> sa.orm.InstrumentedAttribute[Account | None]:
+    def _posted_by_expression(cls) -> sa_orm.InstrumentedAttribute[Account | None]:
         """Return SQL Expression."""
         return cls._posted_by
 
@@ -346,11 +440,13 @@ def message(self) -> MessageComposite | MarkdownCompositeBasic:
     @message.inplace.setter
     def _message_setter(self, value: Any) -> None:
         """Edit the message of a comment."""
-        self._message = value  # type: ignore[assignment]
+        self._message = value
 
     @message.inplace.expression
     @classmethod
-    def _message_expression(cls):
+    def _message_expression(
+        cls,
+    ) -> sa_orm.InstrumentedAttribute[MarkdownCompositeBasic]:
         """Return SQL expression for comment message column."""
         return cls._message
 
@@ -366,14 +462,16 @@ def title(self) -> str:
             return _("{user} commented on {obj}").format(
                 user=self.posted_by.pickername, obj=obj.title
             )
-        return _("{account} commented").format(account=self.posted_by.pickername)
+        return _("{account} commented").format(  # type: ignore[unreachable]
+            account=self.posted_by.pickername
+        )
 
     with_roles(title, read={'all'}, datasets={'primary', 'related', 'json'})
 
     @property
     def badges(self) -> set[str]:
         badges = set()
-        roles = set()
+        roles: set[str] | LazyRoleSet = set()
         if self.commentset.project is not None:
             roles = self.commentset.project.roles_for(self._posted_by)
         elif self.commentset.proposal is not None:
@@ -416,6 +514,13 @@ def mark_spam(self) -> None:
     def mark_not_spam(self) -> None:
         """Mark this comment as not spam."""
 
+    def was_reviewed_by(self, account: Account) -> bool:
+        return CommentModeratorReport.query.filter(
+            CommentModeratorReport.comment == self,
+            CommentModeratorReport.resolved_at.is_(None),
+            CommentModeratorReport.reported_by == account,
+        ).notempty()
+
     def roles_for(
         self, actor: Account | None = None, anchors: Sequence = ()
     ) -> LazyRoleSet:
@@ -427,19 +532,10 @@ def roles_for(
 add_search_trigger(Comment, 'search_vector')
 
 
-@reopen(Commentset)
-class __Commentset:
-    toplevel_comments: DynamicMapped[Comment] = relationship(
-        Comment,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            Comment.commentset_id == Commentset.id, Comment.in_reply_to_id.is_(None)
-        ),
-        viewonly=True,
-    )
-
-
 # Tail imports for type checking
+from .commentset_membership import CommentsetMembership
+from .moderation import CommentModeratorReport
+
 if TYPE_CHECKING:
     from .project import Project
     from .proposal import Proposal
diff --git a/funnel/models/commentset_membership.py b/funnel/models/commentset_membership.py
index 27cf4541e..06131a25d 100644
--- a/funnel/models/commentset_membership.py
+++ b/funnel/models/commentset_membership.py
@@ -3,24 +3,18 @@
 from __future__ import annotations
 
 from datetime import datetime
+from typing import TYPE_CHECKING, Self
 
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import DynamicAssociationProxy, with_roles
-
-from . import DynamicMapped, Mapped, Model, Query, backref, db, relationship, sa
 from .account import Account
-from .comment import Comment, Commentset
-from .helpers import reopen
-from .membership_mixin import ImmutableUserMembershipMixin
-from .project import Project
-from .proposal import Proposal
-from .update import Update
+from .base import Mapped, Model, Query, relationship, sa, sa_orm
+from .membership_mixin import ImmutableMembershipMixin
 
 __all__ = ['CommentsetMembership']
 
 
-class CommentsetMembership(ImmutableUserMembershipMixin, Model):
+class CommentsetMembership(ImmutableMembershipMixin, Model):
     """Membership roles for users who are commentset users and subscribers."""
 
     __tablename__ = 'commentset_membership'
@@ -40,42 +34,25 @@ class CommentsetMembership(ImmutableUserMembershipMixin, Model):
         }
     }
 
-    commentset_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
-        sa.ForeignKey('commentset.id', ondelete='CASCADE'),
-        nullable=False,
-    )
-    commentset: Mapped[Commentset] = relationship(
-        Commentset,
-        backref=backref(
-            'subscriber_memberships',
-            lazy='dynamic',
-            cascade='all',
-            passive_deletes=True,
-        ),
+    commentset_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('commentset.id', ondelete='CASCADE'), default=None, nullable=False
     )
+    commentset: Mapped[Commentset] = relationship()
 
-    parent_id: Mapped[int] = sa.orm.synonym('commentset_id')
+    parent_id: Mapped[int] = sa_orm.synonym('commentset_id')
     parent_id_column = 'commentset_id'
-    parent: Mapped[Commentset] = sa.orm.synonym('commentset')
+    parent: Mapped[Commentset] = sa_orm.synonym('commentset')
 
     #: Flag to indicate notifications are muted
-    is_muted: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_muted: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: When the user visited this commentset last
-    last_seen_at: Mapped[datetime] = sa.orm.mapped_column(
+    last_seen_at: Mapped[datetime] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
     )
 
-    new_comment_count: Mapped[int] = sa.orm.column_property(
-        sa.select(sa.func.count(Comment.id))
-        .where(Comment.commentset_id == commentset_id)  # type: ignore[has-type]
-        .where(Comment.state.PUBLIC)  # type: ignore[has-type]
-        .where(Comment.created_at > last_seen_at)
-        .correlate_except(Comment)
-        .scalar_subquery()
-    )
+    if TYPE_CHECKING:
+        # The implementation is at bottom, following the tail imports
+        new_comment_count: Mapped[int]
 
     @cached_property
     def offered_roles(self) -> set[str]:
@@ -91,7 +68,7 @@ def update_last_seen_at(self) -> None:
         self.last_seen_at = sa.func.utcnow()
 
     @classmethod
-    def for_user(cls, account: Account) -> Query[CommentsetMembership]:
+    def for_user(cls, account: Account) -> Query[Self]:
         """
         Return a query representing all active commentset memberships for a user.
 
@@ -118,103 +95,17 @@ def for_user(cls, account: Account) -> Query[CommentsetMembership]:
         )
 
 
-@reopen(Account)
-class __Account:
-    active_commentset_memberships: DynamicMapped[CommentsetMembership] = relationship(
-        CommentsetMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            CommentsetMembership.member_id == Account.id,
-            CommentsetMembership.is_active,
-        ),
-        viewonly=True,
-    )
-
-    subscribed_commentsets = DynamicAssociationProxy(
-        'active_commentset_memberships', 'commentset'
-    )
-
-
-@reopen(Commentset)
-class __Commentset:
-    active_memberships: DynamicMapped[CommentsetMembership] = relationship(
-        CommentsetMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            CommentsetMembership.commentset_id == Commentset.id,
-            CommentsetMembership.is_active,
-        ),
-        viewonly=True,
-    )
-
-    # Send notifications only to subscribers who haven't muted
-    active_memberships_unmuted: DynamicMapped[CommentsetMembership] = with_roles(
-        relationship(
-            CommentsetMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                CommentsetMembership.commentset_id == Commentset.id,
-                CommentsetMembership.is_active,
-                CommentsetMembership.is_muted.is_(False),
-            ),
-            viewonly=True,
-        ),
-        grants_via={'member': {'document_subscriber'}},
-    )
+# Tail imports
+from .comment import Comment, Commentset
+from .project import Project
+from .proposal import Proposal
+from .update import Update
 
-    def update_last_seen_at(self, member: Account) -> None:
-        subscription = CommentsetMembership.query.filter_by(
-            commentset=self, member=member, is_active=True
-        ).one_or_none()
-        if subscription is not None:
-            subscription.update_last_seen_at()
-
-    def add_subscriber(self, actor: Account, member: Account) -> bool:
-        """Return True is subscriber is added or unmuted, False if already exists."""
-        changed = False
-        subscription = CommentsetMembership.query.filter_by(
-            commentset=self, member=member, is_active=True
-        ).one_or_none()
-        if subscription is None:
-            subscription = CommentsetMembership(
-                commentset=self,
-                member=member,
-                granted_by=actor,
-            )
-            db.session.add(subscription)
-            changed = True
-        elif subscription.is_muted:
-            subscription = subscription.replace(actor=actor, is_muted=False)
-            changed = True
-        subscription.update_last_seen_at()
-        return changed
-
-    def mute_subscriber(self, actor: Account, member: Account) -> bool:
-        """Return True if subscriber was muted, False if already muted or missing."""
-        subscription = CommentsetMembership.query.filter_by(
-            commentset=self, member=member, is_active=True
-        ).one_or_none()
-        if not subscription.is_muted:
-            subscription.replace(actor=actor, is_muted=True)
-            return True
-        return False
-
-    def unmute_subscriber(self, actor: Account, member: Account) -> bool:
-        """Return True if subscriber was unmuted, False if not muted or missing."""
-        subscription = CommentsetMembership.query.filter_by(
-            commentset=self, member=member, is_active=True
-        ).one_or_none()
-        if subscription.is_muted:
-            subscription.replace(actor=actor, is_muted=False)
-            return True
-        return False
-
-    def remove_subscriber(self, actor: Account, member: Account) -> bool:
-        """Return True is subscriber is removed, False if already removed."""
-        subscription = CommentsetMembership.query.filter_by(
-            commentset=self, member=member, is_active=True
-        ).one_or_none()
-        if subscription is not None:
-            subscription.revoke(actor=actor)
-            return True
-        return False
+CommentsetMembership.new_comment_count = sa_orm.column_property(
+    sa.select(sa.func.count(Comment.id))
+    .where(Comment.commentset_id == CommentsetMembership.commentset_id)
+    .where(Comment.state.PUBLIC)  # type: ignore[has-type]  # FIXME
+    .where(Comment.created_at > CommentsetMembership.last_seen_at)
+    .correlate_except(Comment)
+    .scalar_subquery()
+)
diff --git a/funnel/models/contact_exchange.py b/funnel/models/contact_exchange.py
index b8eab0694..92c7cbd28 100644
--- a/funnel/models/contact_exchange.py
+++ b/funnel/models/contact_exchange.py
@@ -6,26 +6,27 @@
 from dataclasses import dataclass
 from datetime import date as date_type, datetime
 from itertools import groupby
+from typing import Self
 from uuid import UUID
 
-from pytz import timezone
+from pytz import BaseTzInfo, timezone
 from sqlalchemy.ext.associationproxy import association_proxy
 
 from coaster.sqlalchemy import LazyRoleSet
 from coaster.utils import uuid_to_base58
 
-from . import (
+from .account import Account
+from .base import (
     Mapped,
     Model,
     Query,
     RoleMixin,
     TimestampMixin,
-    backref,
     db,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
 from .project import Project
 from .sync_ticket import TicketParticipant
 
@@ -41,7 +42,7 @@ class ProjectId:
     uuid: UUID
     uuid_b58: str
     title: str
-    timezone: str
+    timezone: BaseTzInfo
 
 
 @dataclass
@@ -50,7 +51,7 @@ class DateCountContacts:
 
     date: datetime
     count: int
-    contacts: Collection[ContactExchange]
+    contacts: Collection[ContactExchange] | Query[ContactExchange]
 
 
 class ContactExchange(TimestampMixin, RoleMixin, Model):
@@ -58,41 +59,33 @@ class ContactExchange(TimestampMixin, RoleMixin, Model):
 
     __tablename__ = 'contact_exchange'
     #: User who scanned this contact
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id', ondelete='CASCADE'), primary_key=True
-    )
-    account: Mapped[Account] = relationship(
-        Account,
-        backref=backref(
-            'scanned_contacts',
-            lazy='dynamic',
-            order_by='ContactExchange.scanned_at.desc()',
-            passive_deletes=True,
-        ),
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id', ondelete='CASCADE'), primary_key=True, default=None
     )
+    account: Mapped[Account] = relationship(back_populates='scanned_contacts')
     #: Participant whose contact was scanned
-    ticket_participant_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
+    ticket_participant_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('ticket_participant.id', ondelete='CASCADE'),
         primary_key=True,
+        default=None,
         index=True,
     )
     ticket_participant: Mapped[TicketParticipant] = relationship(
-        TicketParticipant,
-        backref=backref('scanned_contacts', passive_deletes=True),
+        back_populates='scanned_contacts'
     )
     #: Datetime at which the scan happened
-    scanned_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+    scanned_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        insert_default=sa.func.utcnow(),
+        default=None,
     )
     #: Note recorded by the user (plain text)
-    description: Mapped[str] = sa.orm.mapped_column(
+    description: Mapped[str] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=False, default=''
     )
     #: Archived flag
-    archived: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    archived: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     __roles__ = {
         'owner': {
@@ -141,8 +134,8 @@ def grouped_counts_for(
             cls.scanned_at.label('scanned_at'),
             Project.id.label('project_id'),
             Project.uuid.label('project_uuid'),
-            Project.timezone.label('project_timezone'),
             Project.title.label('project_title'),
+            Project.timezone.label('project_timezone'),
         ).filter(
             cls.ticket_participant_id == TicketParticipant.id,
             TicketParticipant.project_id == Project.id,
@@ -156,10 +149,10 @@ def grouped_counts_for(
 
         query = (
             db.session.query(
-                sa.column('project_id'),
-                sa.column('project_uuid'),
-                sa.column('project_title'),
-                sa.column('project_timezone'),
+                sa.column('project_id', sa.Integer()),
+                sa.column('project_uuid', sa.Uuid()),
+                sa.column('project_title', sa.String()),
+                sa.column('project_timezone', sa.String()),
                 sa.cast(
                     sa.func.date_trunc(
                         'day',
@@ -232,7 +225,7 @@ def grouped_counts_for(
                 [
                     DateCountContacts(
                         r.scan_date,
-                        r.count,
+                        r.count,  # type: ignore[arg-type]  # FIXME
                         cls.contacts_for_project_and_date(
                             account, k, r.scan_date, archived
                         ),
@@ -242,12 +235,12 @@ def grouped_counts_for(
             )
             for k, g in groupby(
                 query,
-                lambda r: ProjectId(
-                    id=r.project_id,
-                    uuid=r.project_uuid,
-                    uuid_b58=uuid_to_base58(r.project_uuid),
-                    title=r.project_title,
-                    timezone=timezone(r.project_timezone),
+                lambda row: ProjectId(
+                    id=row.project_id,
+                    uuid=row.project_uuid,
+                    uuid_b58=uuid_to_base58(row.project_uuid),
+                    title=row.project_title,
+                    timezone=timezone(row.project_timezone),
                 ),
             )
         ]
@@ -256,8 +249,12 @@ def grouped_counts_for(
 
     @classmethod
     def contacts_for_project_and_date(
-        cls, account: Account, project: Project, date: date_type, archived: bool = False
-    ) -> Query[ContactExchange]:
+        cls,
+        account: Account,
+        project: Project | ProjectId,
+        date: date_type,
+        archived: bool = False,
+    ) -> Query[Self]:
         """Return contacts for a given user, project and date."""
         query = cls.query.join(TicketParticipant).filter(
             cls.account == account,
@@ -284,7 +281,7 @@ def contacts_for_project_and_date(
     @classmethod
     def contacts_for_project(
         cls, account: Account, project: Project, archived: bool = False
-    ) -> Query[ContactExchange]:
+    ) -> Query[Self]:
         """Return contacts for a given user and project."""
         query = cls.query.join(TicketParticipant).filter(
             cls.account == account,
diff --git a/funnel/models/draft.py b/funnel/models/draft.py
index d51f79b92..bc9eaeedb 100644
--- a/funnel/models/draft.py
+++ b/funnel/models/draft.py
@@ -6,7 +6,8 @@
 
 from werkzeug.datastructures import MultiDict
 
-from . import Mapped, Model, NoIdMixin, sa, types
+from . import types
+from .base import Mapped, Model, NoIdMixin, sa_orm
 
 __all__ = ['Draft']
 
@@ -16,8 +17,8 @@ class Draft(NoIdMixin, Model):
 
     __tablename__ = 'draft'
 
-    table: Mapped[types.text] = sa.orm.mapped_column(primary_key=True)
-    table_row_id: Mapped[UUID] = sa.orm.mapped_column(primary_key=True)
+    table: Mapped[types.text] = sa_orm.mapped_column(primary_key=True)
+    table_row_id: Mapped[UUID] = sa_orm.mapped_column(primary_key=True)
     body: Mapped[types.jsonb_dict | None]  # Optional only when instance is new
     revision: Mapped[UUID | None]
 
diff --git a/funnel/models/email_address.py b/funnel/models/email_address.py
index 10b56c312..8c912cbf5 100644
--- a/funnel/models/email_address.py
+++ b/funnel/models/email_address.py
@@ -4,8 +4,9 @@
 
 import hashlib
 import unicodedata
+import warnings
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, ClassVar, Literal, cast, overload
+from typing import TYPE_CHECKING, Any, ClassVar, Literal, Self, cast, overload
 
 import base58
 import idna
@@ -15,11 +16,17 @@
 from sqlalchemy.orm import NO_VALUE, Mapper
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import StateManager, auto_init_default, immutable, with_roles
+from coaster.sqlalchemy import (
+    ModelWarning,
+    StateManager,
+    auto_init_default,
+    immutable,
+    with_roles,
+)
 from coaster.utils import LabeledEnum, require_one_of
 
 from ..signals import emailaddress_refcount_dropping
-from . import (
+from .base import (
     BaseMixin,
     Mapped,
     Model,
@@ -30,6 +37,7 @@
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
 
 __all__ = [
@@ -38,6 +46,7 @@
     'EmailAddressBlockedError',
     'EmailAddressInUseError',
     'EmailAddress',
+    'OptionalEmailAddressMixin',
     'EmailAddressMixin',
 ]
 
@@ -148,7 +157,7 @@ class EmailAddressInUseError(EmailAddressError):
     """Email address is in use by another owner."""
 
 
-class EmailAddress(BaseMixin, Model):
+class EmailAddress(BaseMixin[int, 'Account'], Model):
     """
     Represents an email address as a standalone entity, with associated metadata.
 
@@ -176,7 +185,7 @@ class EmailAddress(BaseMixin, Model):
     6. Upcoming: column-level encryption of the email column, securing SQL dumps.
 
     New email addresses must be added using the :meth:`add` or :meth:`add_for`
-    classmethods, depending on whether the email address is linked to an owner or not.
+    class methods, depending on whether the email address is linked to an owner or not.
     """
 
     __tablename__ = 'email_address'
@@ -185,25 +194,23 @@ class EmailAddress(BaseMixin, Model):
     #: Contains the name of the relationship in the :class:`EmailAddress` model
     __backrefs__: ClassVar[set[str]] = set()
     #: These backrefs claim exclusive use of the email address for their linked owner.
-    #: See :class:`EmailAddressMixin` for implementation detail
+    #: See :class:`OptionalEmailAddressMixin` for implementation detail
     __exclusive_backrefs__: ClassVar[set[str]] = set()
 
     #: The email address, centrepiece of this model. Case preserving.
     #: Validated by the :func:`_validate_email` event handler
-    email: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode, nullable=True)
+    email: Mapped[str | None] = sa_orm.mapped_column()
     #: The domain of the email, stored for quick lookup of related addresses
     #: Read-only, accessible via the :property:`domain` property
-    _domain: Mapped[str | None] = sa.orm.mapped_column(
-        'domain', sa.Unicode, nullable=True, index=True
-    )
+    _domain: Mapped[str | None] = sa_orm.mapped_column('domain', index=True)
 
     # email_normalized is defined below
 
     #: BLAKE2b 160-bit hash of :property:`email_normalized`. Kept permanently even if
     #: email is removed. SQLAlchemy type LargeBinary maps to PostgreSQL BYTEA. Despite
     #: the name, we're only storing 20 bytes
-    blake2b160 = immutable(
-        sa.orm.mapped_column(
+    blake2b160: Mapped[bytes] = immutable(
+        sa_orm.mapped_column(
             sa.LargeBinary,
             sa.CheckConstraint(
                 'LENGTH(blake2b160) = 20',
@@ -217,33 +224,36 @@ class EmailAddress(BaseMixin, Model):
     #: BLAKE2b 160-bit hash of :property:`email_canonical`. Kept permanently for blocked
     #: email detection. Indexed but does not use a unique constraint because a+b@tld and
     #: a+c@tld are both a@tld canonically but can exist in records separately.
-    blake2b160_canonical = immutable(
-        sa.orm.mapped_column(sa.LargeBinary, nullable=False, index=True)
+    blake2b160_canonical: Mapped[bytes] = immutable(
+        sa_orm.mapped_column(sa.LargeBinary, nullable=False, index=True)
     )
 
     #: Does this email address work? Records last known delivery state
-    _delivery_state: Mapped[int] = sa.orm.mapped_column(
+    _delivery_state: Mapped[int] = sa_orm.mapped_column(
         'delivery_state',
-        sa.Integer,
         StateManager.check_constraint(
             'delivery_state',
             EMAIL_DELIVERY_STATE,
+            sa.Integer,
             name='email_address_delivery_state_check',
         ),
         nullable=False,
         default=EMAIL_DELIVERY_STATE.UNKNOWN,
     )
-    delivery_state = StateManager(
+    delivery_state = StateManager['EmailAddress'](
         '_delivery_state',
         EMAIL_DELIVERY_STATE,
         doc="Last known delivery state of this email address",
     )
     #: Timestamp of last known delivery state
-    delivery_state_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+    delivery_state_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        insert_default=sa.func.utcnow(),
+        default=None,
     )
     #: Timestamp of last known recipient activity resulting from sent mail
-    active_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    active_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
@@ -252,9 +262,7 @@ class EmailAddress(BaseMixin, Model):
     #: so a test for whether an address is blocked should use blake2b160_canonical to
     #: load the record. Other records with the same canonical hash _may_ exist without
     #: setting the flag due to a lack of database-side enforcement
-    _is_blocked: Mapped[bool] = sa.orm.mapped_column(
-        'is_blocked', sa.Boolean, nullable=False, default=False
-    )
+    _is_blocked: Mapped[bool] = sa_orm.mapped_column('is_blocked', default=False)
 
     __table_args__ = (
         # `domain` must be lowercase always. Note that Python `.lower()` is not
@@ -291,6 +299,11 @@ class EmailAddress(BaseMixin, Model):
         ),
     )
 
+    if TYPE_CHECKING:
+        used_in_account_email: Mapped[list[AccountEmail]] = relationship()
+        used_in_account_email_claim: Mapped[list[AccountEmailClaim]] = relationship()
+        used_in_ticket_participant: Mapped[list[TicketParticipant]] = relationship()
+
     @hybrid_property
     def is_blocked(self) -> bool:
         """
@@ -356,7 +369,7 @@ def __format__(self, format_spec: str) -> str:
         """Format the email address."""
         if not format_spec:
             return self.__str__()
-        return self.__str__().__format__(format_spec)
+        return format(self.__str__(), format_spec)
 
     def __repr__(self) -> str:
         """Debugging representation of the email address."""
@@ -472,7 +485,7 @@ def get_filter(
         email_hash: str | None = None,
     ) -> sa.ColumnElement[bool] | None:
         """
-        Get an filter condition for retriving an :class:`EmailAddress`.
+        Get an filter condition for retrieving an :class:`EmailAddress`.
 
         Accepts an email address or a blake2b160 hash in either bytes or base58 form.
         Internally converts all lookups to a bytes-based hash lookup. Returns an
@@ -527,14 +540,15 @@ def get(
 
         Internally converts an email-based lookup into a hash-based lookup.
         """
-        return cls.query.filter(
-            cls.get_filter(email=email, blake2b160=blake2b160, email_hash=email_hash)
-        ).one_or_none()
+        email_filter = cls.get_filter(
+            email=email, blake2b160=blake2b160, email_hash=email_hash
+        )
+        if email_filter is None:
+            return None
+        return cls.query.filter(email_filter).one_or_none()
 
     @classmethod
-    def get_canonical(
-        cls, email: str, is_blocked: bool | None = None
-    ) -> Query[EmailAddress]:
+    def get_canonical(cls, email: str, is_blocked: bool | None = None) -> Query[Self]:
         """
         Get :class:`EmailAddress` instances matching the canonical representation.
 
@@ -699,7 +713,7 @@ def is_valid_email_address(
 
 
 @declarative_mixin
-class EmailAddressMixin:
+class OptionalEmailAddressMixin:
     """
     Mixin class for models that refer to :class:`EmailAddress`.
 
@@ -725,9 +739,10 @@ class EmailAddressMixin:
     @classmethod
     def email_address_id(cls) -> Mapped[int | None]:
         """Foreign key to email_address table."""
-        return sa.orm.mapped_column(
+        return sa_orm.mapped_column(
             sa.Integer,
             sa.ForeignKey('email_address.id', ondelete='SET NULL'),
+            default=None,
             nullable=cls.__email_optional__,
             unique=cls.__email_unique__,
             index=not cls.__email_unique__,
@@ -735,13 +750,14 @@ def email_address_id(cls) -> Mapped[int | None]:
 
     @declared_attr
     @classmethod
-    def email_address(cls) -> Mapped[EmailAddress]:
+    def email_address(cls) -> Mapped[EmailAddress | None]:
         """Instance of :class:`EmailAddress` as a relationship."""
         backref_name = 'used_in_' + cls.__tablename__
         EmailAddress.__backrefs__.add(backref_name)
         if cls.__email_for__ and cls.__email_is_exclusive__:
             EmailAddress.__exclusive_backrefs__.add(backref_name)
-        return relationship(EmailAddress, backref=backref_name)
+        with warnings.catch_warnings(action='ignore', category=ModelWarning):
+            return relationship(EmailAddress, backref=backref_name)
 
     @property
     def email(self) -> str | None:
@@ -761,19 +777,19 @@ def email(self) -> str | None:
         return None
 
     @email.setter
-    def email(self, value: str | None) -> None:
+    def email(self, __value: str | None) -> None:
         """Set an email address."""
         if self.__email_for__:
-            if value is not None:
+            if __value is not None:
                 self.email_address = EmailAddress.add_for(
-                    getattr(self, self.__email_for__), value
+                    getattr(self, self.__email_for__), __value
                 )
             else:
                 self.email_address = None
 
         else:
-            if value is not None:
-                self.email_address = EmailAddress.add(value)
+            if __value is not None:
+                self.email_address = EmailAddress.add(__value)
             else:
                 self.email_address = None
 
@@ -797,6 +813,37 @@ def transport_hash(self) -> str | None:
         )
 
 
+@declarative_mixin
+class EmailAddressMixin(OptionalEmailAddressMixin):
+    """Non-optional version of :class:`OptionalEmailAddressMixin`."""
+
+    __email_optional__: ClassVar[bool] = False
+
+    if TYPE_CHECKING:
+
+        @declared_attr
+        @classmethod
+        def email_address_id(cls) -> Mapped[int]:  # type: ignore[override]
+            ...
+
+        @declared_attr
+        @classmethod
+        def email_address(cls) -> Mapped[EmailAddress]:  # type: ignore[override]
+            ...
+
+        @property  # type: ignore[override]
+        def email(self) -> str:
+            ...
+
+        @email.setter
+        def email(self, __value: str) -> None:
+            ...
+
+        @property
+        def transport_hash(self) -> str:
+            ...
+
+
 auto_init_default(EmailAddress._delivery_state)  # pylint: disable=protected-access
 auto_init_default(EmailAddress.delivery_state_at)
 auto_init_default(EmailAddress._is_blocked)  # pylint: disable=protected-access
@@ -860,7 +907,7 @@ def _send_refcount_event_remove(
 
 
 def _send_refcount_event_before_delete(
-    _mapper: Any, _connection: Any, target: EmailAddressMixin
+    _mapper: Any, _connection: Any, target: OptionalEmailAddressMixin
 ) -> None:
     if target.email_address:
         emailaddress_refcount_dropping.send(target.email_address)
@@ -874,7 +921,7 @@ def _setup_refcount_events() -> None:
 
 
 def _email_address_mixin_set_validator(
-    target: EmailAddressMixin,
+    target: OptionalEmailAddressMixin,
     value: EmailAddress | None,
     old_value: EmailAddress | None,
     _initiator: Any,
@@ -887,13 +934,14 @@ def _email_address_mixin_set_validator(
                 raise EmailAddressInUseError("This email address it not available")
 
 
-@event.listens_for(EmailAddressMixin, 'mapper_configured', propagate=True)
+@event.listens_for(OptionalEmailAddressMixin, 'mapper_configured', propagate=True)
 def _email_address_mixin_configure_events(
-    _mapper: Any, cls: type[EmailAddressMixin]
+    _mapper: Any, cls: type[OptionalEmailAddressMixin]
 ) -> None:
     event.listen(cls.email_address, 'set', _email_address_mixin_set_validator)
     event.listen(cls, 'before_delete', _send_refcount_event_before_delete)
 
 
 if TYPE_CHECKING:
-    from .account import Account
+    from .account import Account, AccountEmail, AccountEmailClaim
+    from .sync_ticket import TicketParticipant
diff --git a/funnel/models/geoname.py b/funnel/models/geoname.py
index e107a497a..4875f921e 100644
--- a/funnel/models/geoname.py
+++ b/funnel/models/geoname.py
@@ -6,23 +6,23 @@
 from collections.abc import Collection
 from datetime import date
 from decimal import Decimal
-from typing import cast
+from typing import Required, Self, TypedDict
 
 from sqlalchemy.dialects.postgresql import ARRAY
 
 from coaster.utils import make_name
 
-from . import (
+from . import types
+from .base import (
     BaseMixin,
     BaseNameMixin,
     GeonameModel,
     Mapped,
     Query,
-    backref,
     db,
     relationship,
     sa,
-    types,
+    sa_orm,
 )
 from .helpers import quote_autocomplete_like
 
@@ -37,28 +37,34 @@
     'AS': 6255147,  # Asia
     'EU': 6255148,  # Europe
     'NA': 6255149,  # North America
-    'OC': 6255151,  # Ocenia
+    'OC': 6255151,  # Oceania
     'SA': 6255150,  # South America
     'AN': 6255152,  # Antarctica
 }
 
 
+class ParseLocationsDict(TypedDict, total=False):
+    token: Required[str]
+    special: bool
+    geoname: GeoName
+
+
 class GeoCountryInfo(BaseNameMixin, GeonameModel):
     """Geoname record for a country."""
 
     __tablename__ = 'geo_country_info'
 
-    geonameid: Mapped[int] = sa.orm.synonym('id')
+    geonameid: Mapped[int] = sa_orm.synonym('id')
     geoname: Mapped[GeoName | None] = relationship(
-        'GeoName',
         uselist=False,
-        primaryjoin='GeoCountryInfo.id == foreign(GeoName.id)',
-        backref='has_country',
+        viewonly=True,
+        primaryjoin=lambda: GeoCountryInfo.id == sa_orm.foreign(GeoName.id),
+        back_populates='has_country',
     )
-    iso_alpha2: Mapped[types.char2 | None] = sa.orm.mapped_column(
+    iso_alpha2: Mapped[types.char2 | None] = sa_orm.mapped_column(
         sa.CHAR(2), unique=True
     )
-    iso_alpha3: Mapped[types.char3 | None] = sa.orm.mapped_column(unique=True)
+    iso_alpha3: Mapped[types.char3 | None] = sa_orm.mapped_column(unique=True)
     iso_numeric: Mapped[int | None]
     fips_code: Mapped[types.str3 | None]
     capital: Mapped[str | None]
@@ -71,10 +77,10 @@ class GeoCountryInfo(BaseNameMixin, GeonameModel):
     phone: Mapped[types.str16 | None]
     postal_code_format: Mapped[types.unicode | None]
     postal_code_regex: Mapped[types.unicode | None]
-    languages: Mapped[list[str] | None] = sa.orm.mapped_column(
+    languages: Mapped[list[str] | None] = sa_orm.mapped_column(
         ARRAY(sa.Unicode, dimensions=1)
     )
-    neighbours: Mapped[list[str] | None] = sa.orm.mapped_column(
+    neighbours: Mapped[list[str] | None] = sa_orm.mapped_column(
         ARRAY(sa.CHAR(2), dimensions=1)
     )
     equivalent_fips_code: Mapped[types.str3]
@@ -97,21 +103,23 @@ class GeoAdmin1Code(BaseMixin, GeonameModel):
 
     __tablename__ = 'geo_admin1_code'
 
-    geonameid: Mapped[int] = sa.orm.synonym('id')
-    geoname: Mapped[GeoName] = relationship(
-        'GeoName',
+    geonameid: Mapped[int] = sa_orm.synonym('id')
+    geoname: Mapped[GeoName | None] = relationship(
         uselist=False,
-        primaryjoin='GeoAdmin1Code.id == foreign(GeoName.id)',
-        backref='has_admin1code',
+        primaryjoin=lambda: GeoAdmin1Code.id == sa_orm.foreign(GeoName.id),
         viewonly=True,
+        back_populates='has_admin1code',
     )
-    title: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    ascii_title: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    country_id: Mapped[str | None] = sa.orm.mapped_column(
-        'country', sa.CHAR(2), sa.ForeignKey('geo_country_info.iso_alpha2')
+    title: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    ascii_title: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    country_id: Mapped[str | None] = sa_orm.mapped_column(
+        'country',
+        sa.CHAR(2),
+        sa.ForeignKey('geo_country_info.iso_alpha2'),
+        default=None,
     )
-    country: Mapped[GeoCountryInfo | None] = relationship('GeoCountryInfo')
-    admin1_code: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
+    country: Mapped[GeoCountryInfo | None] = relationship()
+    admin1_code: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
 
     def __repr__(self) -> str:
         """Return representation."""
@@ -123,22 +131,24 @@ class GeoAdmin2Code(BaseMixin, GeonameModel):
 
     __tablename__ = 'geo_admin2_code'
 
-    geonameid: Mapped[int] = sa.orm.synonym('id')
+    geonameid: Mapped[int] = sa_orm.synonym('id')
     geoname: Mapped[GeoName] = relationship(
-        'GeoName',
         uselist=False,
-        primaryjoin='GeoAdmin2Code.id == foreign(GeoName.id)',
-        backref='has_admin2code',
         viewonly=True,
+        primaryjoin=lambda: GeoAdmin2Code.id == sa_orm.foreign(GeoName.id),
+        back_populates='has_admin2code',
     )
-    title: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    ascii_title: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    country_id: Mapped[str | None] = sa.orm.mapped_column(
-        'country', sa.CHAR(2), sa.ForeignKey('geo_country_info.iso_alpha2')
+    title: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    ascii_title: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    country_id: Mapped[str | None] = sa_orm.mapped_column(
+        'country',
+        sa.CHAR(2),
+        sa.ForeignKey('geo_country_info.iso_alpha2'),
+        default=None,
     )
-    country: Mapped[GeoCountryInfo | None] = relationship('GeoCountryInfo')
-    admin1_code: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    admin2_code: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
+    country: Mapped[GeoCountryInfo | None] = relationship()
+    admin1_code: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    admin2_code: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
 
     def __repr__(self) -> str:
         """Return representation."""
@@ -150,56 +160,81 @@ class GeoName(BaseNameMixin, GeonameModel):
 
     __tablename__ = 'geo_name'
 
-    geonameid: Mapped[int] = sa.orm.synonym('id')
-    ascii_title: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    latitude: Mapped[Decimal | None] = sa.orm.mapped_column(sa.Numeric)
-    longitude: Mapped[Decimal | None] = sa.orm.mapped_column(sa.Numeric)
-    fclass: Mapped[str | None] = sa.orm.mapped_column(sa.CHAR(1))
-    fcode: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    country_id: Mapped[str | None] = sa.orm.mapped_column(
-        'country', sa.CHAR(2), sa.ForeignKey('geo_country_info.iso_alpha2')
+    geonameid: Mapped[int] = sa_orm.synonym('id')
+    ascii_title: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    latitude: Mapped[Decimal | None] = sa_orm.mapped_column(sa.Numeric)
+    longitude: Mapped[Decimal | None] = sa_orm.mapped_column(sa.Numeric)
+    fclass: Mapped[str | None] = sa_orm.mapped_column(sa.CHAR(1))
+    fcode: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    country_id: Mapped[str | None] = sa_orm.mapped_column(
+        'country',
+        sa.CHAR(2),
+        sa.ForeignKey('geo_country_info.iso_alpha2'),
+        default=None,
     )
-    country: Mapped[GeoCountryInfo | None] = relationship('GeoCountryInfo')
-    cc2: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    admin1: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
+    country: Mapped[GeoCountryInfo | None] = relationship()
+    cc2: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    admin1: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
     admin1_ref: Mapped[GeoAdmin1Code | None] = relationship(
-        'GeoAdmin1Code',
         uselist=False,
-        primaryjoin='and_(GeoName.country_id == foreign(GeoAdmin1Code.country_id), '
-        'GeoName.admin1 == foreign(GeoAdmin1Code.admin1_code))',
+        primaryjoin=lambda: sa.and_(
+            GeoName.country_id == sa_orm.foreign(GeoAdmin1Code.country_id),
+            GeoName.admin1 == sa_orm.foreign(GeoAdmin1Code.admin1_code),
+        ),
         viewonly=True,
     )
-    admin1_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('geo_admin1_code.id'), nullable=True
+    admin1_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('geo_admin1_code.id'), default=None, nullable=True
     )
     admin1code: Mapped[GeoAdmin1Code | None] = relationship(
-        'GeoAdmin1Code', uselist=False, foreign_keys=[admin1_id]
+        uselist=False, foreign_keys=[admin1_id]
     )
 
-    admin2: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
+    admin2: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
     admin2_ref: Mapped[GeoAdmin2Code | None] = relationship(
-        'GeoAdmin2Code',
         uselist=False,
-        primaryjoin='and_(GeoName.country_id == foreign(GeoAdmin2Code.country_id), '
-        'GeoName.admin1 == foreign(GeoAdmin2Code.admin1_code), '
-        'GeoName.admin2 == foreign(GeoAdmin2Code.admin2_code))',
+        primaryjoin=lambda: sa.and_(
+            GeoName.country_id == sa_orm.foreign(GeoAdmin2Code.country_id),
+            GeoName.admin1 == sa_orm.foreign(GeoAdmin2Code.admin1_code),
+            GeoName.admin2 == sa_orm.foreign(GeoAdmin2Code.admin2_code),
+        ),
         viewonly=True,
     )
-    admin2_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('geo_admin2_code.id'), nullable=True
+    admin2_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('geo_admin2_code.id'), default=None, nullable=True
     )
     admin2code: Mapped[GeoAdmin2Code | None] = relationship(
-        'GeoAdmin2Code', uselist=False, foreign_keys=[admin2_id]
+        uselist=False, foreign_keys=[admin2_id]
     )
 
-    admin4: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    admin3: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    population: Mapped[int | None] = sa.orm.mapped_column(sa.BigInteger)
-    elevation: Mapped[int | None] = sa.orm.mapped_column(sa.Integer)
+    admin4: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    admin3: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    population: Mapped[int | None] = sa_orm.mapped_column(sa.BigInteger)
+    elevation: Mapped[int | None] = sa_orm.mapped_column()
     #: Digital Elevation Model
-    dem: Mapped[int | None] = sa.orm.mapped_column(sa.Integer)
-    timezone: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode)
-    moddate: Mapped[date | None] = sa.orm.mapped_column(sa.Date)
+    dem: Mapped[int | None] = sa_orm.mapped_column()
+    timezone: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode)
+    moddate: Mapped[date | None] = sa_orm.mapped_column(sa.Date)
+
+    has_country: Mapped[GeoCountryInfo | None] = relationship(
+        uselist=False,
+        viewonly=True,
+        primaryjoin=lambda: GeoCountryInfo.id == sa_orm.foreign(GeoName.id),
+        back_populates='geoname',
+    )
+    has_admin1code: Mapped[GeoAdmin1Code | None] = relationship(
+        uselist=False,
+        viewonly=True,
+        primaryjoin=lambda: GeoAdmin1Code.id == sa_orm.foreign(GeoName.id),
+        back_populates='geoname',
+    )
+    has_admin2code: Mapped[GeoAdmin2Code | None] = relationship(
+        uselist=False,
+        viewonly=True,
+        primaryjoin=lambda: GeoAdmin2Code.id == sa_orm.foreign(GeoName.id),
+        back_populates='geoname',
+    )
+    alternate_titles: Mapped[list[GeoAltName]] = relationship(back_populates='geoname')
 
     __table_args__ = (
         sa.Index(
@@ -339,7 +374,11 @@ def related_geonames(self) -> dict[str, GeoName]:
         related: dict[str, GeoName] = {}
         if self.admin2code and self.admin2code.geonameid != self.geonameid:
             related['admin2'] = self.admin2code.geoname
-        if self.admin1code and self.admin1code.geonameid != self.geonameid:
+        if (
+            self.admin1code
+            and self.admin1code.geonameid != self.geonameid
+            and self.admin1code.geoname is not None
+        ):
             related['admin1'] = self.admin1code.geoname
         if (
             self.country
@@ -352,13 +391,13 @@ def related_geonames(self) -> dict[str, GeoName]:
             and self.country
             and self.country.continent
         ):
-            continent = GeoName.query.get(continent_codes[self.country.continent])
+            continent = db.session.get(GeoName, continent_codes[self.country.continent])
             if continent:
                 related['continent'] = continent
 
         return related
 
-    def as_dict(self, related=True, alternate_titles=True) -> dict:
+    def as_dict(self, related: bool = True, alternate_titles: bool = True) -> dict:
         """Convert this record into a dictionary suitable for casting to JSON."""
         return {
             'geonameid': self.geonameid,
@@ -399,7 +438,7 @@ def as_dict(self, related=True, alternate_titles=True) -> dict:
         }
 
     @classmethod
-    def get(cls, name) -> GeoName | None:
+    def get(cls, name: str) -> GeoName | None:
         """Get geoname record matching given URL stub name."""
         return cls.query.filter_by(name=name).one_or_none()
 
@@ -450,7 +489,7 @@ def parse_locations(
         special: list[str] | None = None,
         lang: str | None = None,
         bias: list[str] | None = None,
-    ):
+    ) -> list[ParseLocationsDict]:
         """
         Parse a string and return annotations marking all identified locations.
 
@@ -462,12 +501,15 @@ def parse_locations(
         special = [s.lower() for s in special] if special else []
         if bias is None:
             bias = []
-        tokens = NOWORDS_RE.split(q)
+        while '' in bias:
+            bias.remove('')
+        bias = [each.upper() for each in bias]
+        tokens: list[str] = NOWORDS_RE.split(q)
         while '' in tokens:
             tokens.remove('')  # Remove blank tokens from beginning and end
         ltokens = [t.lower() for t in tokens]
-        results: list[dict[str, object]] = []
-        counter = 0
+        results: list[ParseLocationsDict] = []
+        counter: int = 0
         limit = len(tokens)
         while counter < limit:
             token = tokens[counter]
@@ -486,13 +528,13 @@ def parse_locations(
                             sa.or_(GeoAltName.lang == lang, GeoAltName.lang.is_(None))
                         )
                         .options(
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.country
                             ),
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.admin1code
                             ),
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.admin2code
                             ),
                         )
@@ -506,13 +548,13 @@ def parse_locations(
                             )
                         )
                         .options(
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.country
                             ),
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.admin1code
                             ),
-                            sa.orm.joinedload(GeoAltName.geoname).joinedload(
+                            sa_orm.joinedload(GeoAltName.geoname).joinedload(
                                 GeoName.admin2code
                             ),
                         )
@@ -526,7 +568,7 @@ def parse_locations(
                     candidates = [
                         (NOWORDS_RE.split(m.title.lower()), m) for m in matches
                     ]
-                    fullmatch = []
+                    fullmatch: list[tuple[int, GeoAltName]] = []
                     for mtokens, match in candidates:
                         if mtokens == ltokens[counter : counter + len(mtokens)]:
                             fullmatch.append((len(mtokens), match))
@@ -538,14 +580,11 @@ def parse_locations(
                         # (d) population
                         accepted.sort(
                             key=lambda a: (
-                                {
-                                    v: k
-                                    for k, v in enumerate(
-                                        reversed(cast(list[str], bias))
-                                    )
-                                }.get(a.geoname.country_id, -1),
+                                {v: k for k, v in enumerate(reversed(bias))}.get(
+                                    a.geoname.country_id or '', -1
+                                ),
                                 {lang: 0}.get(a.lang, 1),
-                                {'A': 1, 'P': 2}.get(a.geoname.fclass, 0),
+                                {'A': 1, 'P': 2}.get(a.geoname.fclass or '', 0),
                                 a.geoname.population,
                             ),
                             reverse=True,
@@ -568,7 +607,7 @@ def parse_locations(
         return results
 
     @classmethod
-    def autocomplete(cls, prefix: str, lang: str | None = None) -> Query[GeoName]:
+    def autocomplete(cls, prefix: str, lang: str | None = None) -> Query[Self]:
         """
         Autocomplete a geoname record.
 
@@ -596,21 +635,16 @@ class GeoAltName(BaseMixin, GeonameModel):
 
     __tablename__ = 'geo_alt_name'
 
-    geonameid: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('geo_name.id'), nullable=False
-    )
-    geoname: Mapped[GeoName] = relationship(
-        GeoName,
-        backref=backref('alternate_titles', cascade='all, delete-orphan'),
-    )
-    lang: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True, index=True
+    geonameid: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('geo_name.id'), default=None, nullable=False
     )
-    title: Mapped[str] = sa.orm.mapped_column(sa.Unicode, nullable=False)
-    is_preferred_name: Mapped[str] = sa.orm.mapped_column(sa.Boolean, nullable=False)
-    is_short_name: Mapped[bool] = sa.orm.mapped_column(sa.Boolean, nullable=False)
-    is_colloquial: Mapped[bool] = sa.orm.mapped_column(sa.Boolean, nullable=False)
-    is_historic: Mapped[bool] = sa.orm.mapped_column(sa.Boolean, nullable=False)
+    geoname: Mapped[GeoName] = relationship(back_populates='alternate_titles')
+    lang: Mapped[str | None] = sa_orm.mapped_column(index=True)
+    title: Mapped[str] = sa_orm.mapped_column()
+    is_preferred_name: Mapped[bool] = sa_orm.mapped_column()
+    is_short_name: Mapped[bool] = sa_orm.mapped_column()
+    is_colloquial: Mapped[bool] = sa_orm.mapped_column()
+    is_historic: Mapped[bool] = sa_orm.mapped_column()
 
     __table_args__ = (
         sa.Index(
diff --git a/funnel/models/helpers.py b/funnel/models/helpers.py
index 9a38014e5..ec8fd9efb 100644
--- a/funnel/models/helpers.py
+++ b/funnel/models/helpers.py
@@ -4,14 +4,16 @@
 
 import os.path
 import re
+import warnings
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from textwrap import dedent
-from typing import Any, ClassVar, TypeVar, cast
+from typing import Any, ClassVar, TypeVar, get_type_hints
 
 from better_profanity import profanity
 from furl import furl
 from markupsafe import Markup, escape as html_escape
+from sqlalchemy import event as sa_event
 from sqlalchemy.dialects.postgresql import TSQUERY
 from sqlalchemy.dialects.postgresql.base import (
     RESERVED_WORDS as POSTGRESQL_RESERVED_WORDS,
@@ -20,15 +22,18 @@
 from sqlalchemy.orm import Mapped, composite
 from zxcvbn import zxcvbn
 
+from coaster.utils import DataclassFromType
+
 from .. import app
 from ..typing import T
 from ..utils import MarkdownConfig, MarkdownString, markdown_escape
-from . import Model, UrlType, sa
+from .base import Model, UrlType, sa, sa_orm
 
 __all__ = [
     'RESERVED_NAMES',
     'PASSWORD_MIN_LENGTH',
     'PASSWORD_MAX_LENGTH',
+    'IntTitle',
     'check_password_strength',
     'profanity',
     'add_to_class',
@@ -130,6 +135,14 @@
 }
 
 
+@dataclass(frozen=True)
+class IntTitle(DataclassFromType, int):
+    """Integer value with a title (for enums)."""
+
+    # The empty default is required for Mypy's enum plugin's `Enum.__call__` analysis
+    title: str = ''
+
+
 @dataclass
 class PasswordCheckType:
     """
@@ -141,7 +154,7 @@ class PasswordCheckType:
         (guesses < 10^3)
     * 1: very guessable: protection from throttled online attacks
         (guesses < 10^6)
-    * 2: somewhat guessable: protection from unthrottled online attacks
+    * 2: somewhat guessable: protection from un-throttled online attacks
         (guesses < 10^8)
     * 3: safely unguessable: moderate protection from offline slow-hash scenario
         (guesses < 10^10)
@@ -197,6 +210,7 @@ def check_password_strength(
     profanity.add_censor_words([_w.strip() for _w in badwordfile.readlines()])
 
 
+# Used as a delimiter in search results when showing a preview from multiple fields
 visual_field_delimiter = ' ¦ '
 
 
@@ -222,7 +236,11 @@ def decorator(attr: T) -> T:
             # None or '' not allowed
             raise ValueError(f"Could not determine name for {attr!r}")
         if use_name in cls.__dict__:
-            raise AttributeError(f"{cls.__name__} already has attribute {use_name}")
+            raise AttributeError(
+                f"{cls.__name__} already has attribute {use_name}",
+                name=use_name,
+                obj=cls,
+            )
         setattr(cls, use_name, attr)
         return attr
 
@@ -233,7 +251,7 @@ def decorator(attr: T) -> T:
 TempType = TypeVar('TempType', bound=type)
 
 
-def reopen(cls: ReopenedType) -> Callable[[TempType], ReopenedType]:
+def reopen(cls: ReopenedType) -> Callable[[type], ReopenedType]:
     """
     Move the contents of the decorated class into an existing class and return it.
 
@@ -267,7 +285,7 @@ def new_property(self):
     properties that do more processing.
     """
 
-    def decorator(temp_cls: TempType) -> ReopenedType:
+    def decorator(temp_cls: type) -> ReopenedType:
         if temp_cls.__bases__ != (object,):
             raise TypeError("Reopened class cannot add base classes")
         if temp_cls.__class__ is not type:
@@ -279,7 +297,25 @@ def decorator(temp_cls: TempType) -> ReopenedType:
             '__setattr__',
             '__delattr__',
         }.intersection(set(temp_cls.__dict__.keys())):
-            raise TypeError("Reopened class contains unsupported __attributes__")
+            raise TypeError("Reopened class contains unsupported __dunder__ attributes")
+        if '__annotations__' in temp_cls.__dict__:
+            # Temp class annotations must be un-stringified as they may refer to names
+            # not available in the reopened class's namespace
+            try:
+                annotations = get_type_hints(temp_cls, include_extras=True)
+            except NameError as exc:
+                warnings.warn(
+                    f"{temp_cls.__qualname__} has a forward annotation that cannot be"
+                    f" resolved. Annotations in {cls.__qualname__} may not be usable at"
+                    f" runtime: {exc}",
+                    RuntimeWarning,
+                    stacklevel=2,
+                )
+                annotations = temp_cls.__annotations__
+            if '__annotations__' not in cls.__dict__:
+                cls.__annotations__ = annotations
+            else:
+                cls.__annotations__ = annotations | cls.__annotations__
         for attr, value in list(temp_cls.__dict__.items()):
             # Skip the standard Python attributes, process the rest
             if attr not in (
@@ -291,14 +327,21 @@ def decorator(temp_cls: TempType) -> ReopenedType:
             ):
                 # Refuse to overwrite existing attributes
                 if hasattr(cls, attr):
-                    raise AttributeError(f"{cls.__name__} already has attribute {attr}")
+                    # At this time we've already merged __annotations__, so there's no
+                    # good way to recover from this error -- it's effectively fatal and
+                    # requires code rewrite. This is however an implicit assumption when
+                    # using @reopen -- it should not be within a try block.
+                    raise AttributeError(
+                        f"{cls.__qualname__} already has attribute {attr!r}",
+                        name=attr,
+                        obj=cls,
+                    )
                 # All good? Copy the attribute over...
                 setattr(cls, attr, value)
+                if hasattr(value, '__set_name__'):
+                    value.__set_name__(cls, attr)
                 # ...And remove it from the temporary class
                 delattr(temp_cls, attr)
-            # Merge typing annotations
-            elif attr == '__annotations__':
-                cls.__annotations__.update(value)
         # Return the original class. Leave the temporary class to the garbage collector
         return cls
 
@@ -372,14 +415,11 @@ def quote_autocomplete_like(prefix: str, midway: bool = False) -> str:
     return lstrip_like_query
 
 
-def quote_autocomplete_tsquery(prefix: str) -> TSQUERY:
+def quote_autocomplete_tsquery(prefix: str) -> sa.Cast[str]:
     """Return a PostgreSQL tsquery suitable for autocomplete-type matches."""
-    return cast(
+    return sa.cast(
+        sa.func.concat(sa.func.phraseto_tsquery('simple', prefix or ''), ':*'),
         TSQUERY,
-        sa.func.cast(
-            sa.func.concat(sa.func.phraseto_tsquery('simple', prefix or ''), ':*'),
-            TSQUERY,
-        ),
     )
 
 
@@ -391,7 +431,7 @@ def add_search_trigger(model: type[Model], column_name: str) -> dict[str, str]:
 
         class MyModel(Model):
             ...
-            search_vector: Mapped[str] = sa.orm.mapped_column(
+            search_vector: Mapped[str] = sa_orm.mapped_column(
                 TSVectorType(
                     'name', 'title', *indexed_columns,
                     weights={'name': 'A', 'title': 'B'},
@@ -482,13 +522,13 @@ class MyModel(Model):
         '''
     )
 
-    sa.event.listen(
+    sa_event.listen(
         model.__table__,
         'after_create',
         sa.DDL(trigger_function).execute_if(dialect='postgresql'),
     )
 
-    sa.event.listen(
+    sa_event.listen(
         model.__table__,
         'before_drop',
         sa.DDL(drop_statement).execute_if(dialect='postgresql'),
@@ -613,7 +653,7 @@ def __markdown_format__(self, format_spec: str) -> str:
         """Implement format_spec support as required by MarkdownString."""
         # This call's MarkdownString's __format__ instead of __markdown_format__ as the
         # content has not been manipulated from the source string
-        return self.__markdown__().__format__(format_spec)
+        return format(self.__markdown__(), format_spec)
 
     def __html__(self) -> str:
         """Return HTML representation."""
@@ -623,7 +663,7 @@ def __html_format__(self, format_spec: str) -> str:
         """Implement format_spec support as required by Markup."""
         # This call's Markup's __format__ instead of __html_format__ as the
         # content has not been manipulated from the source string
-        return self.__html__().__format__(format_spec)
+        return format(self.__html__(), format_spec)
 
     # Return a Markup string of the HTML
     @property
@@ -692,17 +732,17 @@ def create(
         name: str,
         deferred: bool = False,
         deferred_group: str | None = None,
-        **kwargs,
-    ) -> tuple[sa.orm.Composite[_MC], Mapped[str], Mapped[str]]:
+        **kwargs: Any,
+    ) -> tuple[sa_orm.Composite[_MC], Mapped[str], Mapped[str]]:
         """Create a composite column and backing individual columns."""
-        col_text = sa.orm.mapped_column(
+        col_text = sa_orm.mapped_column(
             name + '_text',
             sa.UnicodeText,
             deferred=deferred,
             deferred_group=deferred_group,
             **kwargs,
         )
-        col_html = sa.orm.mapped_column(
+        col_html = sa_orm.mapped_column(
             name + '_html',
             sa.UnicodeText,
             deferred=deferred,
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 16cfca13b..5ac3c2424 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, Self, overload
+
 from sqlalchemy.ext.orderinglist import OrderingList, ordering_list
 
 from coaster.sqlalchemy import with_roles
 
-from . import (
+from .account import Account
+from .base import (
     BaseScopedNameMixin,
     Mapped,
     Model,
@@ -14,13 +17,12 @@
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
-from .helpers import add_search_trigger, reopen, visual_field_delimiter
-from .project import Project
+from .helpers import add_search_trigger, visual_field_delimiter
 from .project_membership import project_child_role_map
-from .proposal import Proposal
 
-proposal_label = sa.Table(
+proposal_label: sa.Table = sa.Table(
     'proposal_label',
     Model.metadata,
     sa.Column(
@@ -42,26 +44,26 @@
 )
 
 
-class Label(BaseScopedNameMixin, Model):
+class Label(BaseScopedNameMixin[int, Account], Model):
     __tablename__ = 'label'
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id', ondelete='CASCADE'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id', ondelete='CASCADE'), default=None, nullable=False
     )
     # Backref from project is defined in the Project model with an ordering list
     project: Mapped[Project] = with_roles(
-        relationship(Project), grants_via={None: project_child_role_map}
+        relationship(), grants_via={None: project_child_role_map}
     )
     # `parent` is required for
     # :meth:`~coaster.sqlalchemy.mixins.BaseScopedNameMixin.make_name()`
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
 
     #: Parent label's id. Do not write to this column directly, as we don't have the
     #: ability to : validate the value within the app. Always use the :attr:`main_label`
     #: relationship.
-    main_label_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer,
+    main_label_id: Mapped[int | None] = sa_orm.mapped_column(
         sa.ForeignKey('label.id', ondelete='CASCADE'),
+        default=None,
         index=True,
         nullable=True,
     )
@@ -71,7 +73,7 @@ class Label(BaseScopedNameMixin, Model):
     # See https://docs.sqlalchemy.org/en/13/orm/self_referential.html
     options: Mapped[OrderingList[Label]] = relationship(
         back_populates='main_label',
-        order_by='Label.seq',
+        order_by=lambda: Label.seq,
         passive_deletes=True,
         collection_class=ordering_list('seq', count_from=1),
     )
@@ -81,39 +83,33 @@ class Label(BaseScopedNameMixin, Model):
     # add_primary_relationship)
 
     #: Sequence number for this label, used in UI for ordering
-    seq: Mapped[int] = sa.orm.mapped_column(sa.Integer, nullable=False)
+    seq: Mapped[int] = sa_orm.mapped_column()
 
     # A single-line description of this label, shown when picking labels (optional)
-    description: Mapped[str] = sa.orm.mapped_column(
+    description: Mapped[str] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=False, default=''
     )
 
     #: Icon for displaying in space-constrained UI. Contains one emoji symbol.
     #: Since emoji can be composed from multiple symbols, there is no length
     #: limit imposed here
-    icon_emoji: Mapped[str | None] = sa.orm.mapped_column(sa.UnicodeText, nullable=True)
+    icon_emoji: Mapped[str | None] = sa_orm.mapped_column(sa.UnicodeText, nullable=True)
 
     #: Restricted mode specifies that this label may only be applied by someone with
     #: an editorial role (TODO: name the role). If this label is a parent, it applies
     #: to all its children
-    _restricted: Mapped[bool] = sa.orm.mapped_column(
-        'restricted', sa.Boolean, nullable=False, default=False
-    )
+    _restricted: Mapped[bool] = sa_orm.mapped_column('restricted', default=False)
 
     #: Required mode signals to UI that if this label is a parent, one of its
     #: children must be mandatorily applied to the proposal. The value of this
     #: field must be ignored if the label is not a parent
-    _required: Mapped[bool] = sa.orm.mapped_column(
-        'required', sa.Boolean, nullable=False, default=False
-    )
+    _required: Mapped[bool] = sa_orm.mapped_column('required', default=False)
 
     #: Archived mode specifies that the label is no longer available for use
     #: although all the previous records will stay in database.
-    _archived: Mapped[bool] = sa.orm.mapped_column(
-        'archived', sa.Boolean, nullable=False, default=False
-    )
+    _archived: Mapped[bool] = sa_orm.mapped_column('archived', default=False)
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'name',
             'title',
@@ -130,7 +126,7 @@ class Label(BaseScopedNameMixin, Model):
 
     #: Proposals that this label is attached to
     proposals: Mapped[list[Proposal]] = relationship(
-        Proposal, secondary=proposal_label, back_populates='labels'
+        secondary=proposal_label, back_populates='labels'
     )
 
     __table_args__ = (
@@ -339,7 +335,7 @@ def __getattr__(self, name: str) -> bool | str | None:
             Label.name == name, Label.project == self._obj.project
         ).one_or_none()
         if label is None:
-            raise AttributeError
+            raise AttributeError(f"No label {name} in {self._obj.project}")
 
         if not label.has_options:
             return label in self._obj.labels
@@ -357,7 +353,7 @@ def __setattr__(self, name: str, value: bool) -> None:
             Label._archived.is_(False),
         ).one_or_none()
         if label is None:
-            raise AttributeError
+            raise AttributeError(f"No label {name} in {self._obj.project}")
 
         if not label.has_options:
             if value is True:
@@ -389,38 +385,26 @@ def __setattr__(self, name: str, value: bool) -> None:
 
 
 class ProposalLabelProxy:
-    def __get__(self, obj, cls=None) -> ProposalLabelProxyWrapper | ProposalLabelProxy:
+    @overload
+    def __get__(self, obj: None, cls: type[Proposal] | None = None) -> Self:
+        ...
+
+    @overload
+    def __get__(
+        self, obj: Proposal, cls: type[Proposal] | None = None
+    ) -> ProposalLabelProxyWrapper:
+        ...
+
+    def __get__(
+        self, obj: Proposal | None, cls: type[Proposal] | None = None
+    ) -> ProposalLabelProxyWrapper | Self:
         """Get proposal label proxy."""
         if obj is not None:
             return ProposalLabelProxyWrapper(obj)
         return self
 
 
-@reopen(Project)
-class __Project:
-    labels: Mapped[list[Label]] = relationship(
-        Label,
-        primaryjoin=sa.and_(
-            Label.project_id == Project.id,
-            Label.main_label_id.is_(None),
-            Label._archived.is_(False),  # pylint: disable=protected-access
-        ),
-        order_by=Label.seq,
-        viewonly=True,
-    )
-    all_labels: Mapped[list[Label]] = relationship(
-        Label,
-        collection_class=ordering_list('seq', count_from=1),
-        back_populates='project',
-    )
-
-
-@reopen(Proposal)
-class __Proposal:
-    #: For reading and setting labels from the edit form
-    formlabels = ProposalLabelProxy()
-
-    labels: Mapped[list[Label]] = with_roles(
-        relationship(Label, secondary=proposal_label, back_populates='proposals'),
-        read={'all'},
-    )
+# Tail imports
+if TYPE_CHECKING:
+    from .project import Project
+    from .proposal import Proposal
diff --git a/funnel/models/login_session.py b/funnel/models/login_session.py
index 384fbd872..ea2b62a71 100644
--- a/funnel/models/login_session.py
+++ b/funnel/models/login_session.py
@@ -3,22 +3,22 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, Any
 
 from coaster.utils import utcnow
 
 from ..signals import session_revoked
-from . import (
+from .account import Account
+from .base import (
     BaseMixin,
     DynamicMapped,
     Mapped,
     Model,
     UuidMixin,
-    backref,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
-from .helpers import reopen
 
 __all__ = [
     'LoginSession',
@@ -34,7 +34,7 @@
 class LoginSessionError(Exception):
     """Base exception for user session errors."""
 
-    def __init__(self, login_session: LoginSession, *args) -> None:
+    def __init__(self, login_session: LoginSession, *args: Any) -> None:
         self.login_session = login_session
         super().__init__(login_session, *args)
 
@@ -87,44 +87,50 @@ class LoginSessionInactiveUserError(LoginSessionError):
 )
 
 
-class LoginSession(UuidMixin, BaseMixin, Model):
+class LoginSession(UuidMixin, BaseMixin[int, Account], Model):
     __tablename__ = 'login_session'
 
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
-    )
-    account: Mapped[Account] = relationship(
-        Account,
-        backref=backref('all_login_sessions', cascade='all', lazy='dynamic'),
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
+    account: Mapped[Account] = relationship(back_populates='all_login_sessions')
 
     #: User's last known IP address
-    ipaddr: Mapped[str] = sa.orm.mapped_column(sa.String(45), nullable=False)
+    ipaddr: Mapped[str] = sa_orm.mapped_column(sa.String(45), nullable=False)
     #: City geonameid from IP address
-    geonameid_city: Mapped[int | None] = sa.orm.mapped_column(sa.Integer, nullable=True)
+    geonameid_city: Mapped[int | None] = sa_orm.mapped_column()
     #: State/subdivision geonameid from IP address
-    geonameid_subdivision: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, nullable=True
-    )
+    geonameid_subdivision: Mapped[int | None] = sa_orm.mapped_column()
     #: Country geonameid from IP address
-    geonameid_country: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, nullable=True
-    )
+    geonameid_country: Mapped[int | None] = sa_orm.mapped_column()
     #: User's network, from IP address
-    geoip_asn: Mapped[int | None] = sa.orm.mapped_column(sa.Integer, nullable=True)
+    geoip_asn: Mapped[int | None] = sa_orm.mapped_column()
     #: User agent
-    user_agent: Mapped[str] = sa.orm.mapped_column(sa.UnicodeText, nullable=False)
+    user_agent: Mapped[str] = sa_orm.mapped_column(sa.UnicodeText, nullable=False)
     #: The login service that was used to make this session
-    login_service: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode, nullable=True)
+    login_service: Mapped[str | None] = sa_orm.mapped_column()
 
-    accessed_at: Mapped[datetime] = sa.orm.mapped_column(
+    accessed_at: Mapped[datetime] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=False
     )
-    revoked_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    revoked_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
-    sudo_enabled_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+    sudo_enabled_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        insert_default=sa.func.utcnow(),
+        default=None,
+    )
+
+    # --- Backrefs
+    auth_clients: DynamicMapped[AuthClient] = relationship(
+        lazy='dynamic',
+        secondary=auth_client_login_session,
+        back_populates='login_sessions',
+    )
+    authtokens: DynamicMapped[AuthToken] = relationship(
+        lazy='dynamic', back_populates='login_session'
     )
 
     def __repr__(self) -> str:
@@ -187,16 +193,6 @@ def authenticate(cls, buid: str, silent: bool = False) -> LoginSession | None:
         return login_session
 
 
-@reopen(Account)
-class __Account:
-    active_login_sessions: DynamicMapped[LoginSession] = relationship(
-        LoginSession,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            LoginSession.account_id == Account.id,
-            LoginSession.accessed_at > sa.func.utcnow() - LOGIN_SESSION_VALIDITY_PERIOD,
-            LoginSession.revoked_at.is_(None),
-        ),
-        order_by=LoginSession.accessed_at.desc(),
-        viewonly=True,
-    )
+# Tail imports
+if TYPE_CHECKING:
+    from .auth_client import AuthClient, AuthToken
diff --git a/funnel/models/mailer.py b/funnel/models/mailer.py
index 035b8061b..0112e46c2 100644
--- a/funnel/models/mailer.py
+++ b/funnel/models/mailer.py
@@ -5,8 +5,8 @@
 import re
 from collections.abc import Collection, Iterator
 from datetime import datetime
-from enum import IntEnum
-from typing import Any
+from enum import ReprEnum
+from typing import Any, Self
 from uuid import UUID
 
 from flask import request
@@ -19,7 +19,8 @@
 from .. import __
 from ..utils.markdown import MarkdownString, markdown_mailer
 from ..utils.mustache import mustache_md
-from . import (
+from .account import Account
+from .base import (
     BaseNameMixin,
     BaseScopedIdMixin,
     DynamicMapped,
@@ -28,9 +29,9 @@
     db,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
-from .helpers import reopen
+from .helpers import IntTitle
 from .types import jsonb
 
 __all__ = [
@@ -48,58 +49,51 @@
     EMAIL_TAGS[_key].append('style')
 
 
-class MailerState(IntEnum):
+class MailerState(IntTitle, ReprEnum):
     """Send state for :class:`Mailer`."""
 
-    DRAFT = 0
-    QUEUED = 1
-    SENDING = 2
-    SENT = 3
-
-    __titles__ = {
-        DRAFT: __("Draft"),
-        QUEUED: __("Queued"),
-        SENDING: __("Sending"),
-        SENT: __("Sent"),
-    }
+    DRAFT = 0, __("Draft")
+    QUEUED = (1, __("Queued"))
+    SENDING = 2, __("Sending")
+    SENT = 3, __("Sent")
 
-    def __init__(self, value: int) -> None:
-        self.title = self.__titles__[value]
 
-
-class Mailer(BaseNameMixin, Model):
+class Mailer(BaseNameMixin[int, Account], Model):
     """A mailer sent via email to multiple recipients."""
 
     __tablename__ = 'mailer'
 
-    user_uuid: Mapped[UUID] = sa.orm.mapped_column(sa.ForeignKey('account.uuid'))
-    user: Mapped[Account] = relationship(Account, back_populates='mailers')
-    status: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, nullable=False, default=MailerState.DRAFT
+    user_uuid: Mapped[UUID] = sa_orm.mapped_column(
+        sa.ForeignKey('account.uuid'), default=None
     )
-    _fields: Mapped[str] = sa.orm.mapped_column(
-        'fields', sa.UnicodeText, nullable=False, default=''
+    user: Mapped[Account] = relationship(back_populates='mailers')
+    status: Mapped[int] = sa_orm.mapped_column(
+        nullable=False, default=MailerState.DRAFT
     )
-    trackopens: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
+    _fields: Mapped[str] = sa_orm.mapped_column(
+        'fields', sa.UnicodeText, nullable=False, default=''
     )
-    stylesheet: Mapped[str] = sa.orm.mapped_column(
+    trackopens: Mapped[bool] = sa_orm.mapped_column(default=False)
+    stylesheet: Mapped[str] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=False, default=''
     )
-    _cc: Mapped[str] = sa.orm.mapped_column('cc', sa.UnicodeText, nullable=True)
-    _bcc: Mapped[str] = sa.orm.mapped_column('bcc', sa.UnicodeText, nullable=True)
+    _cc: Mapped[str] = sa_orm.mapped_column('cc', sa.UnicodeText, nullable=True)
+    _bcc: Mapped[str] = sa_orm.mapped_column('bcc', sa.UnicodeText, nullable=True)
 
     recipients: DynamicMapped[MailerRecipient] = relationship(
         lazy='dynamic',
         back_populates='mailer',
-        cascade='all, delete-orphan',
-        order_by='(MailerRecipient.draft_id, MailerRecipient._fullname,'
-        ' MailerRecipient._firstname, MailerRecipient._lastname)',
+        order_by=lambda: (
+            # pylint: disable=protected-access
+            MailerRecipient.draft_id,
+            MailerRecipient._fullname,
+            MailerRecipient._firstname,
+            MailerRecipient._lastname,
+        ),
     )
     drafts: Mapped[list[MailerDraft]] = relationship(
         back_populates='mailer',
-        cascade='all, delete-orphan',
-        order_by='MailerDraft.url_id',
+        order_by=lambda: MailerDraft.url_id,
     )
 
     def __init__(self, **kwargs: Any) -> None:
@@ -162,7 +156,7 @@ def recipients_iter(self) -> Iterator[MailerRecipient]:
             .all()
         ]
         for rid in ids:
-            recipient = MailerRecipient.query.get(rid)
+            recipient = db.session.get(MailerRecipient, rid)
             if recipient:
                 yield recipient
 
@@ -191,23 +185,23 @@ def render_preview(self, text: str) -> str:
         return ''
 
 
-class MailerDraft(BaseScopedIdMixin, Model):
+class MailerDraft(BaseScopedIdMixin[int, Account], Model):
     """Revision-controlled draft of mailer text (a Mustache template)."""
 
     __tablename__ = 'mailer_draft'
 
-    mailer_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('mailer.id'), nullable=False
+    mailer_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('mailer.id'), default=None, nullable=False
     )
-    mailer: Mapped[Mailer] = relationship(Mailer, back_populates='drafts')
-    parent: Mapped[Mailer] = sa.orm.synonym('mailer')
-    revision_id: Mapped[int] = sa.orm.synonym('url_id')
+    mailer: Mapped[Mailer] = relationship(back_populates='drafts')
+    parent: Mapped[Mailer] = sa_orm.synonym('mailer')
+    revision_id: Mapped[int] = sa_orm.synonym('url_id')
 
-    subject: Mapped[str] = sa.orm.mapped_column(
+    subject: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(250), nullable=False, default="", deferred=True
     )
 
-    template: Mapped[str] = sa.orm.mapped_column(
+    template: Mapped[str] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=False, default="", deferred=True
     )
 
@@ -220,87 +214,91 @@ def get_preview(self) -> str:
         return self.mailer.render_preview(self.template)
 
 
-class MailerRecipient(BaseScopedIdMixin, Model):
+class MailerRecipient(BaseScopedIdMixin[int, Account], Model):
     """Recipient of a mailer."""
 
     __tablename__ = 'mailer_recipient'
 
     # Mailer this recipient is a part of
-    mailer_id: Mapped[int] = sa.orm.mapped_column(sa.ForeignKey('mailer.id'))
-    mailer: Mapped[Mailer] = relationship(Mailer, back_populates='recipients')
-    parent: Mapped[Mailer] = sa.orm.synonym('mailer')
+    mailer_id: Mapped[int] = sa_orm.mapped_column(sa.ForeignKey('mailer.id'))
+    mailer: Mapped[Mailer] = relationship(back_populates='recipients')
+    parent: Mapped[Mailer] = sa_orm.synonym('mailer')
 
-    _fullname: Mapped[str | None] = sa.orm.mapped_column(
+    _fullname: Mapped[str | None] = sa_orm.mapped_column(
         'fullname', sa.Unicode(80), nullable=True
     )
-    _firstname: Mapped[str | None] = sa.orm.mapped_column(
+    _firstname: Mapped[str | None] = sa_orm.mapped_column(
         'firstname', sa.Unicode(80), nullable=True
     )
-    _lastname: Mapped[str | None] = sa.orm.mapped_column(
+    _lastname: Mapped[str | None] = sa_orm.mapped_column(
         'lastname', sa.Unicode(80), nullable=True
     )
-    _nickname: Mapped[str | None] = sa.orm.mapped_column(
+    _nickname: Mapped[str | None] = sa_orm.mapped_column(
         'nickname', sa.Unicode(80), nullable=True
     )
 
-    _email: Mapped[str] = sa.orm.mapped_column(
+    _email: Mapped[str] = sa_orm.mapped_column(
         'email', sa.Unicode(80), nullable=False, index=True
     )
-    md5sum: Mapped[str] = sa.orm.mapped_column(
+    md5sum: Mapped[str] = sa_orm.mapped_column(
         sa.String(32), nullable=False, index=True
     )
 
-    data: Mapped[jsonb] = sa.orm.mapped_column()
+    data: Mapped[jsonb] = sa_orm.mapped_column()
 
-    is_sent: Mapped[bool] = sa.orm.mapped_column(default=False)
+    is_sent: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     # Support email open tracking
-    opentoken: Mapped[str] = sa.orm.mapped_column(
-        sa.Unicode(44), nullable=False, default=newsecret, unique=True
+    opentoken: Mapped[str] = sa_orm.mapped_column(
+        sa.Unicode(44),
+        nullable=False,
+        insert_default=newsecret,
+        default=None,
+        unique=True,
     )
-    opened: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
-    opened_ipaddr: Mapped[str | None] = sa.orm.mapped_column(
+    opened: Mapped[bool] = sa_orm.mapped_column(default=False)
+    opened_ipaddr: Mapped[str | None] = sa_orm.mapped_column(
         sa.Unicode(45), nullable=True
     )
-    opened_first_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    opened_first_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
-    opened_last_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    opened_last_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
-    opened_count: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, nullable=False, default=0
-    )
+    opened_count: Mapped[int] = sa_orm.mapped_column(nullable=False, default=0)
 
     # Support RSVP if the email requires it
-    rsvptoken: Mapped[str] = sa.orm.mapped_column(
-        sa.Unicode(44), nullable=False, default=newsecret, unique=True
+    rsvptoken: Mapped[str] = sa_orm.mapped_column(
+        sa.Unicode(44),
+        nullable=False,
+        insert_default=newsecret,
+        default=None,
+        unique=True,
     )
     # Y/N/M response
-    rsvp: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode(1), nullable=True)
+    rsvp: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode(1), nullable=True)
 
     # Customised template for this recipient
-    subject: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode(250), nullable=True)
-    template: Mapped[str | None] = sa.orm.mapped_column(
+    subject: Mapped[str | None] = sa_orm.mapped_column(sa.Unicode(250), nullable=True)
+    template: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True, deferred=True
     )
 
     # Rendered version of user's template, for archival
-    rendered_text: Mapped[str | None] = sa.orm.mapped_column(
+    rendered_text: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True, deferred=True
     )
-    rendered_html: Mapped[str | None] = sa.orm.mapped_column(
+    rendered_html: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True, deferred=True
     )
 
     # Draft of the mailer template that the custom template is linked to (for updating
     # before finalising)
-    draft_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('mailer_draft.id')
+    draft_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('mailer_draft.id'), default=None
     )
-    draft: Mapped[MailerDraft | None] = relationship(MailerDraft)
+    draft: Mapped[MailerDraft | None] = relationship()
 
     __table_args__ = (sa.UniqueConstraint('mailer_id', 'url_id'),)
 
@@ -422,7 +420,7 @@ def custom_draft(self) -> bool:
         return self.draft is not None
 
     @classmethod
-    def custom_draft_in(cls, mailer: Mailer) -> list[MailerRecipient]:
+    def custom_draft_in(cls, mailer: Mailer) -> list[Self]:
         return (
             cls.query.filter(
                 cls.mailer == mailer,
@@ -445,10 +443,3 @@ def custom_draft_in(cls, mailer: Mailer) -> list[MailerRecipient]:
             )
             .all()
         )
-
-
-@reopen(Account)
-class __Account:
-    mailers: Mapped[list[Mailer]] = relationship(
-        Mailer, back_populates='user', order_by='Mailer.updated_at.desc()'
-    )
diff --git a/funnel/models/membership_mixin.py b/funnel/models/membership_mixin.py
index c42cbc83e..e945b52aa 100644
--- a/funnel/models/membership_mixin.py
+++ b/funnel/models/membership_mixin.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable
+from collections.abc import Iterable
 from datetime import datetime as datetime_type
-from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar
+from enum import ReprEnum
+from types import SimpleNamespace
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, Protocol, Self, TypeVar
 from uuid import UUID
 
 from sqlalchemy import event
@@ -13,12 +15,11 @@
 
 from baseframe import __
 from coaster.sqlalchemy import StateManager, immutable, with_roles
-from coaster.utils import LabeledEnum
 
-from . import (
+from .account import Account
+from .base import (
     BaseMixin,
     Mapped,
-    Model,
     UuidMixin,
     db,
     declarative_mixin,
@@ -26,13 +27,14 @@
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
-from .reorder_mixin import ReorderProtoMixin
+from .helpers import IntTitle
+from .reorder_mixin import ReorderMixin
 
 # Export only symbols needed in views.
 __all__ = [
-    'MEMBERSHIP_RECORD_TYPE',
+    'MembershipRecordTypeEnum',
     'MembershipError',
     'MembershipRevokedError',
     'MembershipRecordTypeError',
@@ -41,29 +43,58 @@
 # --- Typing ---------------------------------------------------------------------------
 
 MembershipType = TypeVar('MembershipType', bound='ImmutableMembershipMixin')
+
+
+class MembershipMixinProtocol(Protocol):
+    member_id: Mapped[int]
+    member: declared_attr[Account]
+    _local_data_only: bool
+    parent_id_column: ClassVar[str]
+
+    def replace(self, actor: Account, **data: Any) -> Self:
+        ...
+
+
+class FrozenAttributionSubclassProtocol(MembershipMixinProtocol, Protocol):
+    _title: declared_attr[str | None]
+
+
+class ReorderSubclassProtocol(Protocol):
+    seq: Mapped[Any]
+    parent_id: Mapped[Any]
+    parent: Mapped[Any]
+    is_active: hybrid_property[bool]
+
+    @property
+    def parent_scoped_reorder_query_filter(
+        self: ReorderSubclassProtocol,
+    ) -> ColumnElement[bool]:
+        ...
+
+
+MembershipMixinType = TypeVar('MembershipMixinType', bound=MembershipMixinProtocol)
 FrozenAttributionType = TypeVar(
-    'FrozenAttributionType', bound='FrozenAttributionProtoMixin'
+    'FrozenAttributionType', bound=FrozenAttributionSubclassProtocol
 )
 
+
 # --- Enum -----------------------------------------------------------------------------
 
 
-class MEMBERSHIP_RECORD_TYPE(LabeledEnum):  # noqa: N801
+class MembershipRecordTypeEnum(IntTitle, ReprEnum):
     """Membership record types."""
 
-    # TODO: Convert into IntEnum
-
     #: An invite represents a potential future membership, but not a current membership
-    INVITE = (1, 'invite', __("Invite"))
+    INVITE = 1, __("Invite")
     #: An accept recognises a conversion from an invite into a current membership
-    ACCEPT = (2, 'accept', __("Accept"))
+    ACCEPT = 2, __("Accept")
     #: A direct add recognises a current membership without proof of consent
-    DIRECT_ADD = (3, 'direct_add', __("Direct add"))
+    DIRECT_ADD = 3, __("Direct add")
     #: An amendment is when data in the record has been changed
-    AMEND = (4, 'amend', __("Amend"))
+    AMEND = 4, __("Amend")
     #: A migrate record says this used to be some other form of membership and has been
     #: created due to a technical change in the product
-    # Forthcoming: MIGRATE = (5, 'migrate', __("Migrate"))
+    # Forthcoming: MIGRATE = 5, __("Migrate")
 
 
 # --- Exceptions -----------------------------------------------------------------------
@@ -85,25 +116,83 @@ class MembershipRecordTypeError(MembershipError):
 
 
 @declarative_mixin
-class ImmutableMembershipMixin(UuidMixin, BaseMixin[UUID]):
+class ImmutableMembershipMixin(UuidMixin, BaseMixin[UUID, Account]):
     """Support class for immutable memberships."""
 
-    #: Can granted_by be null? Only in memberships based on legacy data
-    __null_granted_by__: ClassVar[bool] = False
-    #: List of columns that will be copied into a new row when a membership is amended
-    __data_columns__: ClassVar[Iterable[str]] = ()
-    #: Name of the parent id column, used in SQL constraints
-    parent_id_column: ClassVar[str | None]
     if TYPE_CHECKING:
         #: Subclass has a table name
         __tablename__: str
         #: Parent column (declare as synonym of 'profile_id' or 'project_id' in
         #: subclasses)
-        parent_id: Mapped[int]
+        parent_id: Mapped[Any] | None
         #: Parent object
-        parent: Mapped[Model | None]
-        #: Subject of this membership (subclasses must define)
-        member: Mapped[Account]
+        parent: Mapped[Any] | None
+
+    #: Can granted_by be null? Only in memberships based on legacy data
+    __null_granted_by__: ClassVar[bool] = False
+    #: List of columns that will be copied into a new row when a membership is amended
+    __data_columns__: ClassVar[Iterable[str]] = ()
+    #: Name of the parent id column, used in SQL constraints
+    parent_id_column: ClassVar[str]
+    #: Foreign key column to account table
+    member_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id', ondelete='CASCADE'),
+        default=None,
+        nullable=False,
+        index=True,
+    )
+
+    @classmethod
+    def __member(cls) -> Mapped[Account]:
+        """Member in this membership record."""
+        return relationship(Account, foreign_keys=[cls.member_id])
+
+    member = with_roles(
+        declared_attr(__member),
+        read={'member', 'editor'},
+        grants_via={None: {'admin': 'member'}},
+    )
+    del __member
+
+    @declared_attr
+    @classmethod
+    def user(cls) -> Mapped[Account]:
+        """Legacy alias for member in this membership record."""
+        return sa_orm.synonym('member')
+
+    __table_args__: tuple  # pyright: ignore[reportGeneralTypeIssues]
+
+    @declared_attr.directive  # type: ignore[no-redef]
+    @classmethod
+    def __table_args__(cls) -> tuple:
+        """Table arguments for SQLAlchemy."""
+        try:
+            args = list(super().__table_args__)  # type: ignore[misc]
+        except AttributeError:
+            args = []
+        kwargs = args.pop(-1) if args and isinstance(args[-1], dict) else None
+        if cls.parent_id_column:
+            args.append(
+                sa.Index(
+                    'ix_' + cls.__tablename__ + '_active',
+                    cls.parent_id_column,
+                    'member_id',
+                    unique=True,
+                    postgresql_where='revoked_at IS NULL',
+                ),
+            )
+        else:
+            args.append(
+                sa.Index(
+                    'ix_' + cls.__tablename__ + '_active',
+                    'member_id',
+                    unique=True,
+                    postgresql_where='revoked_at IS NULL',
+                ),
+            )
+        if kwargs:
+            args.append(kwargs)
+        return tuple(args)
 
     #: Should an active membership record be revoked when the member is soft-deleted?
     #: (Hard deletes will cascade and also delete all membership records.)
@@ -117,24 +206,28 @@ class ImmutableMembershipMixin(UuidMixin, BaseMixin[UUID]):
     #: for records created when the member table was added to the database
     granted_at: Mapped[datetime_type] = with_roles(
         immutable(
-            sa.orm.mapped_column(
-                sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+            sa_orm.mapped_column(
+                sa.TIMESTAMP(timezone=True),
+                nullable=False,
+                insert_default=sa.func.utcnow(),
+                default=None,
             )
         ),
         read={'member', 'editor'},
     )
     #: End time of membership, ordinarily a mirror of updated_at
     revoked_at: Mapped[datetime_type | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
         read={'member', 'editor'},
     )
     #: Record type
     record_type: Mapped[int] = with_roles(
         immutable(
-            sa.orm.mapped_column(
-                sa.Integer,
-                StateManager.check_constraint('record_type', MEMBERSHIP_RECORD_TYPE),
-                default=MEMBERSHIP_RECORD_TYPE.DIRECT_ADD,
+            sa_orm.mapped_column(
+                StateManager.check_constraint(
+                    'record_type', MembershipRecordTypeEnum, sa.Integer
+                ),
+                default=MembershipRecordTypeEnum.DIRECT_ADD,
                 nullable=False,
             )
         ),
@@ -142,17 +235,19 @@ class ImmutableMembershipMixin(UuidMixin, BaseMixin[UUID]):
     )
 
     @cached_property
-    def record_type_label(self):
-        return MEMBERSHIP_RECORD_TYPE[self.record_type]
+    def record_type_enum(self) -> MembershipRecordTypeEnum:
+        return MembershipRecordTypeEnum(self.record_type)
 
-    with_roles(record_type_label, read={'member', 'editor'})
+    with_roles(record_type_enum, read={'member', 'editor'})
 
     @declared_attr
     @classmethod
     def revoked_by_id(cls) -> Mapped[int | None]:
         """Id of user who revoked the membership."""
-        return sa.orm.mapped_column(
-            sa.ForeignKey('account.id', ondelete='SET NULL'), nullable=True
+        return sa_orm.mapped_column(
+            sa.ForeignKey('account.id', ondelete='SET NULL'),
+            default=None,
+            nullable=True,
         )
 
     @with_roles(read={'member', 'editor'}, grants={'editor'})
@@ -171,9 +266,9 @@ def granted_by_id(cls) -> Mapped[int | None]:
         This is nullable only for historical data. New records always require a value
         for granted_by.
         """
-        return sa.orm.mapped_column(
-            sa.Integer,
+        return sa_orm.mapped_column(
             sa.ForeignKey('account.id', ondelete='SET NULL'),
+            default=None,
             nullable=cls.__null_granted_by__,
         )
 
@@ -189,7 +284,7 @@ def is_active(self) -> bool:
         """Test if membership record is active (not revoked, not an invite)."""
         return (
             self.revoked_at is None
-            and self.record_type != MEMBERSHIP_RECORD_TYPE.INVITE
+            and self.record_type != MembershipRecordTypeEnum.INVITE
         )
 
     @is_active.inplace.expression
@@ -197,7 +292,7 @@ def is_active(self) -> bool:
     def _is_active_expression(cls) -> sa.ColumnElement[bool]:
         """Test if membership record is active as a SQL expression."""
         return sa.and_(
-            cls.revoked_at.is_(None), cls.record_type != MEMBERSHIP_RECORD_TYPE.INVITE
+            cls.revoked_at.is_(None), cls.record_type != MembershipRecordTypeEnum.INVITE
         )
 
     with_roles(is_active, read={'member'})
@@ -205,14 +300,14 @@ def _is_active_expression(cls) -> sa.ColumnElement[bool]:
     @hybrid_property
     def is_invite(self) -> bool:
         """Test if membership record is an invitation."""
-        return self.record_type == MEMBERSHIP_RECORD_TYPE.INVITE
+        return self.record_type == MembershipRecordTypeEnum.INVITE
 
     with_roles(is_invite, read={'member', 'editor'})
 
     @hybrid_property
     def is_amendment(self) -> bool:
         """Test if membership record is an amendment."""
-        return self.record_type == MEMBERSHIP_RECORD_TYPE.AMEND
+        return self.record_type == MembershipRecordTypeEnum.AMEND
 
     with_roles(is_amendment, read={'member', 'editor'})
 
@@ -241,14 +336,8 @@ def revoke(self, actor: Account) -> None:
         self.revoked_at = sa.func.utcnow()
         self.revoked_by = actor
 
-    def copy_template(self: MembershipType, **kwargs) -> MembershipType:
-        """Make a copy of self for customization."""
-        raise NotImplementedError("Subclasses must implement copy_template")
-
     @with_roles(call={'editor'})
-    def replace(
-        self: MembershipType, actor: Account, _accept: bool = False, **data: Any
-    ) -> MembershipType:
+    def replace(self, actor: Account, _accept: bool = False, **data: Any) -> Self:
         """Replace this membership record with changes to role columns."""
         if self.revoked_at is not None:
             raise MembershipRevokedError(
@@ -259,7 +348,7 @@ def replace(
 
         # Perform sanity check. If nothing changed, just return self
         has_changes = False
-        if self.record_type == MEMBERSHIP_RECORD_TYPE.INVITE and _accept:
+        if self.record_type == MembershipRecordTypeEnum.INVITE and _accept:
             # If the existing record is an INVITE and this is an ACCEPT, we have
             # a record change even if no data changed
             has_changes = True
@@ -285,13 +374,13 @@ def replace(
 
         # if existing record type is INVITE, then ACCEPT or amend as new INVITE
         # else replace it with AMEND
-        if self.record_type == MEMBERSHIP_RECORD_TYPE.INVITE:
+        if self.record_type == MembershipRecordTypeEnum.INVITE:
             if _accept:
-                new.record_type = MEMBERSHIP_RECORD_TYPE.ACCEPT
+                new.record_type = MembershipRecordTypeEnum.ACCEPT
             else:
-                new.record_type = MEMBERSHIP_RECORD_TYPE.INVITE
+                new.record_type = MembershipRecordTypeEnum.INVITE
         else:
-            new.record_type = MEMBERSHIP_RECORD_TYPE.AMEND
+            new.record_type = MembershipRecordTypeEnum.AMEND
 
         self._local_data_only = True
         for column in self.__data_columns__:
@@ -304,13 +393,11 @@ def replace(
         return new
 
     @with_roles(call={'editor'})
-    def amend_by(self, actor: Account):
+    def amend_by(self, actor: Account) -> AmendMembership[Self]:
         """Amend a membership in a `with` context."""
         return AmendMembership(self, actor)
 
-    def merge_and_replace(
-        self: MembershipType, actor: Account, other: MembershipType
-    ) -> MembershipType:
+    def merge_and_replace(self, actor: Account, other: Self) -> Self:
         """Replace this record by merging data from an independent record."""
         if self.__class__ is not other.__class__:
             raise TypeError("Merger requires membership records of the same type")
@@ -320,8 +407,8 @@ def merge_and_replace(
             raise MembershipRevokedError("Can't merge with a revoked membership record")
 
         if (
-            self.record_type == MEMBERSHIP_RECORD_TYPE.INVITE
-            and other.record_type != MEMBERSHIP_RECORD_TYPE.INVITE
+            self.record_type == MembershipRecordTypeEnum.INVITE
+            and other.record_type != MembershipRecordTypeEnum.INVITE
         ):
             # If we are an INVITE but the other is not an INVITE, then we must ACCEPT
             # the INVITE before proceeding to an AMEND merger
@@ -346,87 +433,14 @@ def merge_and_replace(
         return replacement
 
     @with_roles(call={'member'})
-    def accept(self: MembershipType, actor: Account) -> MembershipType:
+    def accept(self, actor: Account) -> Self:
         """Accept a membership invitation."""
-        if self.record_type != MEMBERSHIP_RECORD_TYPE.INVITE:
+        if self.record_type != MembershipRecordTypeEnum.INVITE:
             raise MembershipRecordTypeError("This membership record is not an invite")
         if 'member' not in self.roles_for(actor):
             raise ValueError("Invite must be accepted by the invited user")
         return self.replace(actor, _accept=True)
 
-    @with_roles(call={'owner', 'member'})
-    def freeze_member_attribution(
-        self: MembershipType, actor: Account
-    ) -> MembershipType:
-        """
-        Freeze member attribution and return a replacement record.
-
-        Subclasses that support member attribution must override this method. The
-        default implementation returns `self`.
-        """
-        return self
-
-
-@declarative_mixin
-class ImmutableUserMembershipMixin(ImmutableMembershipMixin):
-    """Support class for immutable memberships for users."""
-
-    @declared_attr
-    @classmethod
-    def member_id(cls) -> Mapped[int]:
-        """Foreign key column to account table."""
-        return sa.orm.mapped_column(
-            sa.Integer,
-            sa.ForeignKey('account.id', ondelete='CASCADE'),
-            nullable=False,
-            index=True,
-        )
-
-    @with_roles(read={'member', 'editor'}, grants_via={None: {'admin': 'member'}})
-    @declared_attr
-    @classmethod
-    def member(cls) -> Mapped[Account]:  # type: ignore[override]
-        """Member in this membership record."""
-        return relationship(Account, foreign_keys=[cls.member_id])
-
-    @declared_attr
-    @classmethod
-    def user(cls) -> Mapped[Account]:
-        """Legacy alias for member in this membership record."""
-        return sa.orm.synonym('member')
-
-    @declared_attr.directive
-    @classmethod
-    def __table_args__(cls) -> tuple:
-        """Table arguments for SQLAlchemy."""
-        try:
-            args = list(super().__table_args__)  # type: ignore[misc]
-        except AttributeError:
-            args = []
-        kwargs = args.pop(-1) if args and isinstance(args[-1], dict) else None
-        if cls.parent_id_column is not None:
-            args.append(
-                sa.Index(
-                    'ix_' + cls.__tablename__ + '_active',
-                    cls.parent_id_column,
-                    'member_id',
-                    unique=True,
-                    postgresql_where='revoked_at IS NULL',
-                ),
-            )
-        else:
-            args.append(
-                sa.Index(
-                    'ix_' + cls.__tablename__ + '_active',
-                    'member_id',
-                    unique=True,
-                    postgresql_where='revoked_at IS NULL',
-                ),
-            )
-        if kwargs:
-            args.append(kwargs)
-        return tuple(args)
-
     @hybrid_property
     def is_self_granted(self) -> bool:
         """Return True if the member in this record is also the granting actor."""
@@ -445,13 +459,14 @@ def is_self_revoked(self) -> bool:
 
     with_roles(is_self_revoked, read={'member', 'editor'})
 
-    def copy_template(self: MembershipType, **kwargs) -> MembershipType:
-        return type(self)(member=self.member, **kwargs)  # type: ignore
+    def copy_template(self, **kwargs: Any) -> Self:
+        """Make a copy of self for customization."""
+        return self.__class__(member=self.member, **kwargs)  # type: ignore[call-arg]
 
     @classmethod
     def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         """
-        Migrate memberhip records from one account to another.
+        Migrate membership records from one account to another.
 
         If both accounts have active records, they are merged into a new record in the
         new account's favour. All revoked records for the old account are transferred to
@@ -501,36 +516,31 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
 
 
 @declarative_mixin
-class ReorderMembershipProtoMixin(ReorderProtoMixin):
+class ReorderMembershipMixin(ImmutableMembershipMixin, ReorderMixin):
     """Customizes ReorderMixin for membership models."""
 
-    if TYPE_CHECKING:
-        parent_id_column: ClassVar[str]
-
     #: Sequence number. Not immutable, and may be overwritten by ReorderMixin as a
     #: side-effect of reordering other records. This is not considered a revision.
     #: However, it can be argued that relocating a sponsor in the list constitutes a
     #: change that must be recorded as a revision. We may need to change our opinion
     #: on `seq` being mutable in a future iteration.
-    @declared_attr
-    @classmethod
-    def seq(cls) -> Mapped[int]:
-        """Ordering sequence number."""
-        return sa.orm.mapped_column(sa.Integer, nullable=False)
+    seq: Mapped[int] = sa_orm.mapped_column(nullable=False)
+
+    __table_args__: tuple  # pyright: ignore[reportGeneralTypeIssues]
 
-    @declared_attr.directive
+    @declared_attr.directive  # type: ignore[no-redef]
     @classmethod
-    def __table_args__(cls) -> tuple:
+    def __table_args__(cls) -> tuple:  # type: ignore[override]
         """Table arguments."""
         try:
-            args = list(super().__table_args__)  # type: ignore[misc]
+            args = list(super().__table_args__)
         except AttributeError:
             args = []
         kwargs = args.pop(-1) if args and isinstance(args[-1], dict) else None
         # Add unique constraint on :attr:`seq` for active records
         args.append(
             sa.Index(
-                'ix_' + cls.__tablename__ + '_seq',  # type: ignore[attr-defined]
+                'ix_' + cls.__tablename__ + '_seq',
                 cls.parent_id_column,
                 'seq',
                 unique=True,
@@ -541,18 +551,20 @@ def __table_args__(cls) -> tuple:
             args.append(kwargs)
         return tuple(args)
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self: ReorderSubclassProtocol, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         # Assign a default value to `seq`
         if self.seq is None:  # Will be None until first commit
-            self.seq = (  # type: ignore[unreachable]
+            self.seq = (
                 sa.select(sa.func.coalesce(sa.func.max(self.__class__.seq) + 1, 1))
                 .where(self.parent_scoped_reorder_query_filter)
                 .scalar_subquery()
             )
 
     @property
-    def parent_scoped_reorder_query_filter(self) -> ColumnElement:
+    def parent_scoped_reorder_query_filter(
+        self: ReorderSubclassProtocol,
+    ) -> ColumnElement[bool]:
         """
         Return a query filter that includes a scope limitation to active records.
 
@@ -566,38 +578,35 @@ def parent_scoped_reorder_query_filter(self) -> ColumnElement:
         if self.parent_id is not None:
             return sa.and_(
                 cls.parent_id == self.parent_id,
-                cls.is_active,  # type: ignore[attr-defined]
+                cls.is_active,
             )
-        return sa.and_(  # type: ignore[unreachable]
+        return sa.and_(
             cls.parent == self.parent,
             cls.is_active,
         )
 
 
 @declarative_mixin
-class FrozenAttributionProtoMixin:
+class FrozenAttributionMixin:
     """Provides a `title` data column and support method to freeze it."""
 
-    if TYPE_CHECKING:
-        member: Mapped[Account]
-        replace: Callable[..., FrozenAttributionType]
-        _local_data_only: bool
-
-    @declared_attr
     @classmethod
-    def _title(cls) -> Mapped[str | None]:
+    def __title(cls) -> Mapped[str | None]:
         """Create optional attribution title for this membership record."""
         return immutable(
-            sa.orm.mapped_column(
+            sa_orm.mapped_column(
                 'title', sa.Unicode, sa.CheckConstraint("title <> ''"), nullable=True
             )
         )
 
+    _title = declared_attr(__title)
+    del __title
+
     @property
-    def title(self) -> str:
+    def title(self: FrozenAttributionSubclassProtocol) -> str:
         """Attribution title for this record."""
         if self._local_data_only:
-            # self._title may be None
+            # self._title may be None when returning local data
             return self._title  # type: ignore[return-value]
         return self._title or self.member.title
 
@@ -609,7 +618,7 @@ def title(self, value: str | None) -> None:
         self._title = value or None  # Don't set empty string
 
     @property
-    def pickername(self) -> str:
+    def pickername(self: FrozenAttributionSubclassProtocol) -> str:
         """Return member's pickername, but only if attribution isn't frozen."""
         return self._title if self._title else self.member.pickername
 
@@ -619,9 +628,7 @@ def freeze_member_attribution(
     ) -> FrozenAttributionType:
         """Freeze member attribution and return a replacement record."""
         if self._title is None:
-            membership: FrozenAttributionType = self.replace(
-                actor=actor, title=self.member.title
-            )
+            membership = self.replace(actor=actor, title=self.member.title)
         else:
             membership = self
         return membership
@@ -643,6 +650,10 @@ class AmendMembership(Generic[MembershipType]):
     to any attribute listed as a data column.
     """
 
+    membership: MembershipType
+    _actor: Account
+    _new: dict[str, Any]
+
     def __init__(self, membership: MembershipType, actor: Account) -> None:
         """Create an amendment placeholder."""
         if membership.revoked_at is not None:
@@ -650,8 +661,8 @@ def __init__(self, membership: MembershipType, actor: Account) -> None:
                 "This membership record has already been revoked"
             )
         object.__setattr__(self, 'membership', membership)
-        object.__setattr__(self, '_new', {})
         object.__setattr__(self, '_actor', actor)
+        object.__setattr__(self, '_new', {})
 
     def __getattr__(self, attr: str) -> Any:
         """Get an attribute from the underlying record."""
@@ -662,14 +673,20 @@ def __getattr__(self, attr: str) -> Any:
     def __setattr__(self, attr: str, value: Any) -> None:
         """Set an amended value."""
         if attr not in self.membership.__data_columns__:
-            raise AttributeError(f"{attr} cannot be set")
+            raise AttributeError(
+                f"{attr} cannot be set",
+                name=attr,
+                obj=SimpleNamespace(
+                    **{_: None for _ in self.membership.__data_columns__}
+                ),
+            )
         self._new[attr] = value
 
     def __enter__(self) -> AmendMembership:
         """Enter a `with` context."""
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback) -> None:
+    def __exit__(self, exc_type: Any, _exc_value: Any, _traceback: Any) -> None:
         """Exit a `with` context and replace the membership record."""
         if exc_type is None:
             object.__setattr__(
@@ -687,7 +704,7 @@ def _confirm_enumerated_mixins(_mapper: Any, cls: type[Account]) -> None:
     """Confirm that the membership collection attributes actually exist."""
     expected_class = ImmutableMembershipMixin
     if issubclass(cls, Account):
-        expected_class = ImmutableUserMembershipMixin
+        expected_class = ImmutableMembershipMixin
     for source in (
         cls.__active_membership_attrs__,
         cls.__noninvite_membership_attrs__,
@@ -697,10 +714,14 @@ def _confirm_enumerated_mixins(_mapper: Any, cls: type[Account]) -> None:
             if attr_relationship is None:
                 raise AttributeError(
                     f'{cls.__name__} does not have a relationship named'
-                    f' {attr_name!r} targeting a subclass of {expected_class.__name__}'
+                    f' {attr_name!r} targeting a subclass of {expected_class.__name__}',
+                    name=attr_name,
+                    obj=cls,
                 )
             if not issubclass(attr_relationship.property.mapper.class_, expected_class):
                 raise AttributeError(
                     f'{cls.__name__}.{attr_name} should be a relationship to a'
-                    f' subclass of {expected_class.__name__}'
+                    f' subclass of {expected_class.__name__}',
+                    name=attr_name,
+                    obj=cls,
                 )
diff --git a/funnel/models/moderation.py b/funnel/models/moderation.py
index 52b2e73f6..ae5c6220a 100644
--- a/funnel/models/moderation.py
+++ b/funnel/models/moderation.py
@@ -3,16 +3,26 @@
 from __future__ import annotations
 
 from datetime import datetime
+from typing import Self
 from uuid import UUID
 
 from baseframe import __
 from coaster.sqlalchemy import StateManager, with_roles
 from coaster.utils import LabeledEnum
 
-from . import BaseMixin, Mapped, Model, UuidMixin, backref, db, relationship, sa
 from .account import Account
+from .base import (
+    BaseMixin,
+    Mapped,
+    Model,
+    Query,
+    UuidMixin,
+    db,
+    relationship,
+    sa,
+    sa_orm,
+)
 from .comment import Comment
-from .helpers import reopen
 from .site_membership import SiteMembership
 
 __all__ = ['MODERATOR_REPORT_TYPE', 'CommentModeratorReport']
@@ -23,35 +33,32 @@ class MODERATOR_REPORT_TYPE(LabeledEnum):  # noqa: N801
     SPAM = (2, 'spam', __("Spam"))
 
 
-class CommentModeratorReport(UuidMixin, BaseMixin[UUID], Model):
+class CommentModeratorReport(UuidMixin, BaseMixin[UUID, Account], Model):
     __tablename__ = 'comment_moderator_report'
 
-    comment_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('comment.id'), nullable=False, index=True
+    comment_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('comment.id'), default=None, nullable=False, index=True
     )
-    comment: Mapped[Comment] = relationship(
-        Comment,
-        foreign_keys=[comment_id],
-        backref=backref('moderator_reports', cascade='all', lazy='dynamic'),
+    comment: Mapped[Comment] = relationship(back_populates='moderator_reports')
+    reported_by_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False, index=True
     )
-    reported_by_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False, index=True
-    )
-    reported_by: Mapped[Account] = relationship(
-        Account,
-        foreign_keys=[reported_by_id],
-        backref=backref('moderator_reports', cascade='all', lazy='dynamic'),
-    )
-    report_type: Mapped[int] = sa.orm.mapped_column(
+    reported_by: Mapped[Account] = relationship(back_populates='moderator_reports')
+    report_type: Mapped[int] = sa_orm.mapped_column(
         sa.SmallInteger,
-        StateManager.check_constraint('report_type', MODERATOR_REPORT_TYPE),
+        StateManager.check_constraint(
+            'report_type', MODERATOR_REPORT_TYPE, sa.SmallInteger
+        ),
         nullable=False,
         default=MODERATOR_REPORT_TYPE.SPAM,
     )
-    reported_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), default=sa.func.utcnow(), nullable=False
+    reported_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        insert_default=sa.func.utcnow(),
+        default=None,
+        nullable=False,
     )
-    resolved_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    resolved_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
 
@@ -67,12 +74,12 @@ class CommentModeratorReport(UuidMixin, BaseMixin[UUID], Model):
     }
 
     @classmethod
-    def get_one(cls, exclude_user=None):
+    def get_one(cls, exclude_user: Account | None = None) -> Self | None:
         reports = cls.get_all(exclude_user)
         return reports.order_by(sa.func.random()).first()
 
     @classmethod
-    def get_all(cls, exclude_user=None):
+    def get_all(cls, exclude_user: Account | None = None) -> Query[Self]:
         """
         Get all reports.
 
@@ -104,7 +111,7 @@ def submit(
         return report, created
 
     @property
-    def users_who_are_comment_moderators(self):
+    def users_who_are_comment_moderators(self) -> Query[Account]:
         return Account.query.join(
             SiteMembership, SiteMembership.member_id == Account.id
         ).filter(
@@ -113,17 +120,3 @@ def users_who_are_comment_moderators(self):
         )
 
     with_roles(users_who_are_comment_moderators, grants={'comment_moderator'})
-
-
-@reopen(Comment)
-class __Comment:
-    def is_reviewed_by(self, account: Account) -> bool:
-        return db.session.query(
-            db.session.query(CommentModeratorReport)
-            .filter(
-                CommentModeratorReport.comment == self,
-                CommentModeratorReport.resolved_at.is_(None),
-                CommentModeratorReport.reported_by == account,
-            )
-            .exists()
-        ).scalar()
diff --git a/funnel/models/notification.py b/funnel/models/notification.py
index 629c99e04..2d3e609e9 100644
--- a/funnel/models/notification.py
+++ b/funnel/models/notification.py
@@ -84,13 +84,15 @@
 from collections.abc import Callable, Generator, Sequence
 from dataclasses import dataclass
 from datetime import datetime
-from types import SimpleNamespace
+from enum import ReprEnum
+from types import SimpleNamespace, UnionType
 from typing import (
     Any,
     ClassVar,
     Generic,
     Optional,
     Protocol,
+    Self,
     TypeVar,
     Union,
     cast,
@@ -100,8 +102,7 @@
 from uuid import UUID, uuid4
 
 from sqlalchemy import event
-from sqlalchemy.orm import column_keyed_dict
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from typing_extensions import get_original_bases
 from werkzeug.utils import cached_property
 
@@ -113,30 +114,30 @@
     immutable,
     with_roles,
 )
-from coaster.utils import LabeledEnum, uuid_from_base58, uuid_to_base58
+from coaster.utils import utcnow, uuid_from_base58, uuid_to_base58
 
 from ..typing import T
-from . import (
+from .account import Account, AccountEmail, AccountPhone
+from .base import (
     BaseMixin,
     DynamicMapped,
     Mapped,
     Model,
     NoIdMixin,
     Query,
-    backref,
     db,
     hybrid_property,
     postgresql,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account, AccountEmail, AccountPhone
-from .helpers import reopen
+from .helpers import IntTitle
 from .phone_number import PhoneNumber, PhoneNumberMixin
-from .typing import UuidModelUnion
+from .typing import ModelUuidProtocol
 
 __all__ = [
-    'SMS_STATUS',
+    'SmsStatusEnum',
     'notification_categories',
     'SmsMessage',
     'NotificationType',
@@ -152,9 +153,9 @@
 # --- Typing ---------------------------------------------------------------------------
 
 # Document generic type
-_D = TypeVar('_D', bound=UuidModelUnion)
+_D = TypeVar('_D', bound=ModelUuidProtocol)
 # Fragment generic type
-_F = TypeVar('_F', bound=Optional[UuidModelUnion])
+_F = TypeVar('_F', bound=ModelUuidProtocol | None)
 # Type of None (required to detect Optional)
 NoneType = type(None)
 
@@ -188,17 +189,15 @@ class NotificationCategory:
         __("Projects I am participating in"),
         # Criteria: User has registered or proposed
         lambda user: (
-            db.session.query(user.rsvps.exists()).scalar()  # type: ignore[has-type]
-            or db.session.query(  # type: ignore[has-type]
-                user.proposal_memberships.exists()
-            ).scalar()
+            db.session.query(user.rsvps.exists()).scalar()
+            or db.session.query(user.proposal_memberships.exists()).scalar()
         ),
     ),
     project_crew=NotificationCategory(
         4,
         __("Projects I am a crew member in"),
         # Criteria: user has ever been a project crew member
-        lambda user: db.session.query(  # type: ignore[has-type]
+        lambda user: db.session.query(
             user.projects_as_crew_memberships.exists()
         ).scalar(),
     ),
@@ -206,7 +205,7 @@ class NotificationCategory:
         5,
         __("Accounts I manage"),
         # Criteria: user has ever been an organization admin
-        lambda user: db.session.query(  # type: ignore[has-type]
+        lambda user: db.session.query(
             user.organization_admin_memberships.exists()
         ).scalar(),
     ),
@@ -222,47 +221,46 @@ class NotificationCategory:
 # --- Flags ----------------------------------------------------------------------------
 
 
-class SMS_STATUS(LabeledEnum):  # noqa: N801
+class SmsStatusEnum(IntTitle, ReprEnum):
     """SMS delivery status."""
 
-    QUEUED = (1, __("Queued"))
-    PENDING = (2, __("Pending"))
-    DELIVERED = (3, __("Delivered"))
-    FAILED = (4, __("Failed"))
-    UNKNOWN = (5, __("Unknown"))
+    QUEUED = 1, __("Queued")
+    PENDING = 2, __("Pending")
+    DELIVERED = 3, __("Delivered")
+    FAILED = 4, __("Failed")
+    UNKNOWN = 5, __("Unknown")
 
 
 # --- Legacy models --------------------------------------------------------------------
 
 
-class SmsMessage(PhoneNumberMixin, BaseMixin, Model):
+class SmsMessage(PhoneNumberMixin, BaseMixin[int, Account], Model):
     """An outbound SMS message."""
 
     __tablename__ = 'sms_message'
-    __phone_optional__ = False
     __phone_unique__ = False
     __phone_is_exclusive__ = False
     phone_number_reference_is_active: bool = False
 
     transactionid: Mapped[str | None] = immutable(
-        sa.orm.mapped_column(sa.UnicodeText, unique=True, nullable=True)
+        sa_orm.mapped_column(sa.UnicodeText, unique=True, nullable=True)
     )
     # The message itself
     message: Mapped[str] = immutable(
-        sa.orm.mapped_column(sa.UnicodeText, nullable=False)
+        sa_orm.mapped_column(sa.UnicodeText, nullable=False)
     )
     # Flags
-    status: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, default=SMS_STATUS.QUEUED, nullable=False
+    status: Mapped[int] = sa_orm.mapped_column(
+        default=SmsStatusEnum.QUEUED, nullable=False
     )
-    status_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    status_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
-    fail_reason: Mapped[str | None] = sa.orm.mapped_column(
+    fail_reason: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         phone = kwargs.pop('phone', None)
         if phone:
             kwargs['phone_number'] = PhoneNumber.add(phone)
@@ -275,6 +273,9 @@ def __init__(self, **kwargs) -> None:
 class NotificationType(Generic[_D, _F], Protocol):
     """Protocol for :class:`Notification` and :class:`PreviewNotification`."""
 
+    preference_context: ClassVar[Any]
+    for_private_recipient: bool
+
     type: str  # noqa: A003
     eventid: UUID
     id: UUID  # noqa: A003
@@ -283,6 +284,7 @@ class NotificationType(Generic[_D, _F], Protocol):
     document_uuid: UUID
     fragment: _F | None
     fragment_uuid: UUID | None
+    created_at: datetime
     created_by_id: int | None
     created_by: Account | None
 
@@ -309,15 +311,23 @@ class Notification(NoIdMixin, Model, Generic[_D, _F]):
     #: be shared across notifications, and will be used to enforce a limit of one
     #: instance of a UserNotification per-event rather than per-notification
     eventid: Mapped[UUID] = immutable(
-        sa.orm.mapped_column(
-            postgresql.UUID, primary_key=True, nullable=False, default=uuid4
+        sa_orm.mapped_column(
+            postgresql.UUID,
+            primary_key=True,
+            nullable=False,
+            insert_default=uuid4,
+            default=None,
         )
     )
 
     #: Notification id
     id: Mapped[UUID] = immutable(  # noqa: A003
-        sa.orm.mapped_column(
-            postgresql.UUID, primary_key=True, nullable=False, default=uuid4
+        sa_orm.mapped_column(
+            postgresql.UUID,
+            primary_key=True,
+            nullable=False,
+            insert_default=uuid4,
+            default=None,
         )
     )
 
@@ -334,12 +344,12 @@ class Notification(NoIdMixin, Model, Generic[_D, _F]):
     pref_type: ClassVar[str] = ''
 
     #: Document model, must be specified in subclasses
-    document_model: ClassVar[type[UuidModelUnion]]
+    document_model: ClassVar[type[ModelUuidProtocol]]
     #: SQL table name for document type, auto-populated from the document model
     document_type: ClassVar[str]
 
     #: Fragment model, optional for subclasses
-    fragment_model: ClassVar[type[UuidModelUnion] | None] = None
+    fragment_model: ClassVar[type[ModelUuidProtocol] | None] = None
     #: SQL table name for fragment type, auto-populated from the fragment model
     fragment_type: ClassVar[str | None]
 
@@ -359,29 +369,33 @@ class Notification(NoIdMixin, Model, Generic[_D, _F]):
     preference_context: ClassVar[Any] = None
 
     #: Notification type (identifier for subclass of :class:`NotificationType`)
-    type_: Mapped[str] = immutable(
-        sa.orm.mapped_column('type', sa.Unicode, nullable=False)
-    )
+    type_: Mapped[str] = immutable(sa_orm.mapped_column('type'))
 
     #: Id of user that triggered this notification
-    created_by_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('account.id', ondelete='SET NULL'), nullable=True
+    created_by_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id', ondelete='SET NULL'),
+        default=None,
+        nullable=True,
     )
     #: User that triggered this notification. Optional, as not all notifications are
     #: caused by user activity. Used to optionally exclude user from receiving
     #: notifications of their own activity
-    created_by: Mapped[Account | None] = relationship(Account)
+    created_by: Mapped[Account | None] = relationship()
 
     #: UUID of document that the notification refers to
     document_uuid: Mapped[UUID] = immutable(
-        sa.orm.mapped_column(postgresql.UUID, nullable=False, index=True)
+        sa_orm.mapped_column(postgresql.UUID, nullable=False, index=True)
     )
 
     #: Optional fragment within document that the notification refers to. This may be
     #: the document itself, or something within it, such as a comment. Notifications for
     #: multiple fragments are collapsed into a single notification
     fragment_uuid: Mapped[UUID | None] = immutable(
-        sa.orm.mapped_column(postgresql.UUID, nullable=True)
+        sa_orm.mapped_column(postgresql.UUID, nullable=True)
+    )
+
+    recipients: DynamicMapped[NotificationRecipient] = relationship(
+        lazy='dynamic', back_populates='notification'
     )
 
     __table_args__ = (
@@ -477,7 +491,7 @@ def __init_subclass__(  # pylint: disable=arguments-differ
         cls,
         type: str,  # noqa: A002  # pylint: disable=redefined-builtin
         shadows: type[Notification] | None = None,
-        **kwargs,
+        **kwargs: Any,
     ) -> None:
         # For SQLAlchemy's polymorphic support
         if '__mapper_args__' not in cls.__dict__:
@@ -492,7 +506,7 @@ def __init_subclass__(  # pylint: disable=arguments-differ
                     fragment_model = None
                 elif get_origin(fragment_model) is Optional:
                     fragment_model = get_args(fragment_model)[0]
-                elif get_origin(fragment_model) is Union:
+                elif get_origin(fragment_model) in (Union, UnionType):
                     _union_args = get_args(fragment_model)
                     if len(_union_args) == 2 and _union_args[1] is NoneType:
                         fragment_model = _union_args[0]
@@ -634,9 +648,9 @@ def allow_transport(cls, transport: str) -> bool:
         return getattr(cls, 'allow_' + transport)
 
     @property
-    def role_provider_obj(self) -> _F | _D:
+    def role_provider_obj(self) -> ModelUuidProtocol:
         """Return fragment if exists, document otherwise, indicating role provider."""
-        return cast(_F | _D, self.fragment or self.document)
+        return self.fragment or self.document  # type: ignore[return-value]  # FIXME
 
     def dispatch(self) -> Generator[NotificationRecipient, None, None]:
         """
@@ -678,8 +692,8 @@ def dispatch(self) -> Generator[NotificationRecipient, None, None]:
 
             # Since this query uses SQLAlchemy's session cache, we don't have to
             # bother with a local cache for the first case.
-            existing_notification = NotificationRecipient.query.get(
-                (account.id, self.eventid)
+            existing_notification = db.session.get(
+                NotificationRecipient, (account.id, self.eventid)
             )
             if existing_notification is None:
                 recipient = NotificationRecipient(
@@ -694,7 +708,7 @@ def dispatch(self) -> Generator[NotificationRecipient, None, None]:
     # Make :attr:`type_` available under the name `type`, but declare this at the very
     # end of the class to avoid conflicts with the Python `type` global that is
     # used for type-hinting
-    type: Mapped[str] = sa.orm.synonym('type_')  # noqa: A003
+    type: Mapped[str] = sa_orm.synonym('type_')  # noqa: A003
 
 
 class PreviewNotification(NotificationType):
@@ -709,11 +723,13 @@ class PreviewNotification(NotificationType):
         )
     """
 
+    preference_context = None
+
     def __init__(  # pylint: disable=super-init-not-called
         self,
         cls: type[Notification],
-        document: UuidModelUnion,
-        fragment: UuidModelUnion | None = None,
+        document: ModelUuidProtocol,
+        fragment: ModelUuidProtocol | None = None,
         user: Account | None = None,
     ) -> None:
         self.eventid = uuid4()
@@ -721,12 +737,14 @@ def __init__(  # pylint: disable=super-init-not-called
         self.eventid_b58 = uuid_to_base58(self.eventid)
         self.cls = cls
         self.type = cls.cls_type
+        self.for_private_recipient = cls.for_private_recipient
         self.document = document
         self.document_uuid = document.uuid
         self.fragment = fragment
         self.fragment_uuid = fragment.uuid if fragment is not None else None
+        self.created_at = utcnow()
         self.created_by = user
-        self.created_by_id = cast(int, user.id) if user is not None else None
+        self.created_by_id = user.id if user is not None else None
 
     def __getattr__(self, attr: str) -> Any:
         """Get an attribute."""
@@ -756,14 +774,14 @@ def notification_pref_type(self) -> str:
     with_roles(notification_pref_type, read={'owner'})
 
     @cached_property
-    def document(self) -> UuidModelUnion | None:
+    def document(self) -> ModelUuidProtocol | None:
         """Document that this notification is for."""
         return self.notification.document
 
     with_roles(document, read={'owner'})
 
     @cached_property
-    def fragment(self) -> UuidModelUnion | None:
+    def fragment(self) -> ModelUuidProtocol | None:
         """Fragment within this document that this notification is for."""
         return self.notification.fragment
 
@@ -784,7 +802,7 @@ def is_not_deleted(self, revoke: bool = False) -> bool:
             pass
         if revoke:
             self.is_revoked = True
-            # Do not set self.rollupid because this is not a rollup
+            # Do not set `self.rollupid` because this is not a rollup
         return False
 
 
@@ -801,35 +819,35 @@ class NotificationRecipient(NoIdMixin, NotificationRecipientProtoMixin, Model):
 
     #: Id of user being notified
     recipient_id: Mapped[int] = immutable(
-        sa.orm.mapped_column(
-            sa.Integer,
+        sa_orm.mapped_column(
             sa.ForeignKey('account.id', ondelete='CASCADE'),
             primary_key=True,
+            default=None,
             nullable=False,
         )
     )
 
-    #: User being notified (backref defined below, outside the model)
+    #: User being notified
     recipient: Mapped[Account] = with_roles(
-        relationship(Account), read={'owner'}, grants={'owner'}
+        relationship(), read={'owner'}, grants={'owner'}
     )
 
     #: Random eventid, shared with the Notification instance
     eventid: Mapped[UUID] = with_roles(
         immutable(
-            sa.orm.mapped_column(postgresql.UUID, primary_key=True, nullable=False)
+            sa_orm.mapped_column(postgresql.UUID, primary_key=True, nullable=False)
         ),
         read={'owner'},
     )
 
     #: Id of notification that this user received (fkey in __table_args__ below)
-    notification_id: Mapped[UUID] = sa.orm.mapped_column(
+    notification_id: Mapped[UUID] = sa_orm.mapped_column(
         postgresql.UUID, nullable=False
     )
 
     #: Notification that this user received
     notification: Mapped[Notification] = with_roles(
-        relationship(Notification, backref=backref('recipients', lazy='dynamic')),
+        relationship(back_populates='recipients'),
         read={'owner'},
     )
 
@@ -839,13 +857,11 @@ class NotificationRecipient(NoIdMixin, NotificationRecipientProtoMixin, Model):
     #: Note: This column represents the first instance of a role shifting from being an
     #: entirely in-app symbol (i.e., code refactorable) to being data in the database
     #: (i.e., requiring a data migration alongside a code refactor)
-    role: Mapped[str] = with_roles(
-        immutable(sa.orm.mapped_column(sa.Unicode, nullable=False)), read={'owner'}
-    )
+    role: Mapped[str] = with_roles(immutable(sa_orm.mapped_column()), read={'owner'})
 
     #: Timestamp for when this notification was marked as read
     read_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), default=None, nullable=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), default=None, nullable=True),
         read={'owner'},
     )
 
@@ -855,34 +871,26 @@ class NotificationRecipient(NoIdMixin, NotificationRecipientProtoMixin, Model):
     #:    a recipient of the new notification
     #: 3. The underlying document or fragment has been deleted
     revoked_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
         read={'owner'},
     )
 
     #: When a roll-up is performed, record an identifier for the items rolled up
     rollupid: Mapped[UUID | None] = with_roles(
-        sa.orm.mapped_column(postgresql.UUID, nullable=True, index=True),
+        sa_orm.mapped_column(postgresql.UUID, nullable=True, index=True),
         read={'owner'},
     )
 
     #: Message id for email delivery
-    messageid_email: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True
-    )
+    messageid_email: Mapped[str | None] = sa_orm.mapped_column(default=None)
     #: Message id for SMS delivery
-    messageid_sms: Mapped[str | None] = sa.orm.mapped_column(sa.Unicode, nullable=True)
+    messageid_sms: Mapped[str | None] = sa_orm.mapped_column(default=None)
     #: Message id for web push delivery
-    messageid_webpush: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True
-    )
+    messageid_webpush: Mapped[str | None] = sa_orm.mapped_column(default=None)
     #: Message id for Telegram delivery
-    messageid_telegram: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True
-    )
+    messageid_telegram: Mapped[str | None] = sa_orm.mapped_column(default=None)
     #: Message id for WhatsApp delivery
-    messageid_whatsapp: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True
-    )
+    messageid_whatsapp: Mapped[str | None] = sa_orm.mapped_column(default=None)
 
     __table_args__ = (
         sa.ForeignKeyConstraint(
@@ -1122,7 +1130,7 @@ def rollup_previous(self) -> None:
                     NotificationRecipient.rollupid == self.rollupid,
                 )
                 .options(
-                    sa.orm.load_only(
+                    sa_orm.load_only(
                         NotificationRecipient.recipient_id,
                         NotificationRecipient.eventid,
                         NotificationRecipient.revoked_at,
@@ -1135,7 +1143,7 @@ def rollup_previous(self) -> None:
 
     def rolledup_fragments(self) -> Query | None:
         """Return all fragments in the rolled up batch as a base query."""
-        if not self.notification.fragment_model:
+        if self.notification.fragment_model is None:
             return None
         # Return a query on the fragment model with the rolled up identifiers
         if not self.rollupid:
@@ -1154,17 +1162,17 @@ def rolledup_fragments(self) -> Query | None:
     @classmethod
     def get_for(cls, user: Account, eventid_b58: str) -> NotificationRecipient | None:
         """Retrieve a :class:`UserNotification` using SQLAlchemy session cache."""
-        return cls.query.get((user.id, uuid_from_base58(eventid_b58)))
+        return db.session.get(cls, (user.id, uuid_from_base58(eventid_b58)))
 
     @classmethod
     def web_notifications_for(
         cls, user: Account, unread_only: bool = False
-    ) -> Query[NotificationRecipient]:
+    ) -> Query[Self]:
         """Return web notifications for a user, optionally returning unread-only."""
-        query = NotificationRecipient.query.join(Notification).filter(
+        query = cls.query.join(Notification).filter(
             Notification.type.in_(notification_web_types),
-            NotificationRecipient.recipient == user,
-            NotificationRecipient.revoked_at.is_(None),
+            cls.recipient == user,
+            cls.revoked_at.is_(None),
         )
         if unread_only:
             query = query.filter(NotificationRecipient.read_at.is_(None))
@@ -1190,7 +1198,9 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         for notification_recipient in cls.query.filter_by(
             recipient_id=old_account.id
         ).all():
-            existing = cls.query.get((new_account.id, notification_recipient.eventid))
+            existing = db.session.get(
+                cls, (new_account.id, notification_recipient.eventid)
+            )
             # TODO: Instead of dropping old_user's dupe notifications, check which of
             # the two has a higher priority role and keep that. This may not be possible
             # if the two copies are for different notifications under the same eventid.
@@ -1245,46 +1255,34 @@ def rolledup_fragments(self) -> Query | None:
 # --- Notification preferences ---------------------------------------------------------
 
 
-class NotificationPreferences(BaseMixin, Model):
+class NotificationPreferences(BaseMixin[int, Account], Model):
     """Holds a user's preferences for a particular :class:`Notification` type."""
 
     __tablename__ = 'notification_preferences'
 
     #: Id of account whose preferences are represented here
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
+    account_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('account.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
         index=True,
     )
     #: User account whose preferences are represented here
     account: Mapped[Account] = with_roles(
-        relationship(Account, back_populates='notification_preferences'),
+        relationship(back_populates='notification_preferences'),
         read={'owner'},
         grants={'owner'},
     )
 
     # Notification type, corresponding to Notification.type (a class attribute there)
     # notification_type = '' holds the veto switch to disable a transport entirely
-    notification_type: Mapped[str] = immutable(
-        sa.orm.mapped_column(sa.Unicode, nullable=False)
-    )
+    notification_type: Mapped[str] = immutable(sa_orm.mapped_column())
 
-    by_email: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), rw={'owner'}
-    )
-    by_sms: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), rw={'owner'}
-    )
-    by_webpush: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), rw={'owner'}
-    )
-    by_telegram: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), rw={'owner'}
-    )
-    by_whatsapp: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, nullable=False), rw={'owner'}
-    )
+    by_email: Mapped[bool] = with_roles(sa_orm.mapped_column(), rw={'owner'})
+    by_sms: Mapped[bool] = with_roles(sa_orm.mapped_column(), rw={'owner'})
+    by_webpush: Mapped[bool] = with_roles(sa_orm.mapped_column(), rw={'owner'})
+    by_telegram: Mapped[bool] = with_roles(sa_orm.mapped_column(), rw={'owner'})
+    by_whatsapp: Mapped[bool] = with_roles(sa_orm.mapped_column(), rw={'owner'})
 
     __table_args__ = (sa.UniqueConstraint('account_id', 'notification_type'),)
 
@@ -1298,7 +1296,7 @@ class NotificationPreferences(BaseMixin, Model):
         }
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         if self.account:
             self.set_defaults()
@@ -1378,7 +1376,7 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
             {'account_id': new_account.id}, synchronize_session=False
         )
 
-    @sa.orm.validates('notification_type')
+    @sa_orm.validates('notification_type')
     def _valid_notification_type(self, key: str, value: str | None) -> str:
         if value == '':  # Special-cased name for main preferences
             return value
@@ -1387,53 +1385,6 @@ def _valid_notification_type(self, key: str, value: str | None) -> str:
         return value
 
 
-@reopen(Account)
-class __Account:
-    all_notifications: DynamicMapped[NotificationRecipient] = with_roles(
-        relationship(
-            NotificationRecipient,
-            lazy='dynamic',
-            order_by=NotificationRecipient.created_at.desc(),
-            viewonly=True,
-        ),
-        read={'owner'},
-    )
-
-    notification_preferences: Mapped[dict[str, NotificationPreferences]] = relationship(
-        NotificationPreferences,
-        collection_class=column_keyed_dict(NotificationPreferences.notification_type),
-        back_populates='account',
-    )
-
-    # This relationship is wrapped in a property that creates it on first access
-    _main_notification_preferences: Mapped[NotificationPreferences] = relationship(
-        NotificationPreferences,
-        primaryjoin=sa.and_(
-            NotificationPreferences.account_id == Account.id,
-            NotificationPreferences.notification_type == '',
-        ),
-        uselist=False,
-        viewonly=True,
-    )
-
-    @cached_property
-    def main_notification_preferences(self) -> NotificationPreferences:
-        """Return user's main notification preferences, toggling transports on/off."""
-        if not self._main_notification_preferences:
-            main = NotificationPreferences(
-                notification_type='',
-                account=self,
-                by_email=True,
-                by_sms=True,
-                by_webpush=False,
-                by_telegram=False,
-                by_whatsapp=False,
-            )
-            db.session.add(main)
-            return main
-        return self._main_notification_preferences
-
-
 # --- Signal handlers ------------------------------------------------------------------
 
 
diff --git a/funnel/models/notification_types.py b/funnel/models/notification_types.py
index ca11d5a04..3ba50ba9b 100644
--- a/funnel/models/notification_types.py
+++ b/funnel/models/notification_types.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 from baseframe import __
 
 from .account import Account
@@ -150,7 +148,7 @@ class ProposalSubmittedNotification(
 
 class ProjectStartingNotification(
     DocumentHasAccount,
-    Notification[Project, Optional[Session]],
+    Notification[Project, Session | None],
     type='project_starting',
 ):
     """Notification of a session about to start."""
diff --git a/funnel/models/phone_number.py b/funnel/models/phone_number.py
index 72d002a86..7861c5e56 100644
--- a/funnel/models/phone_number.py
+++ b/funnel/models/phone_number.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import hashlib
+import warnings
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, ClassVar, Literal, overload
 
@@ -14,11 +15,11 @@
 from werkzeug.utils import cached_property
 
 from baseframe import _
-from coaster.sqlalchemy import immutable, with_roles
+from coaster.sqlalchemy import ModelWarning, immutable, with_roles
 from coaster.utils import require_one_of
 
 from ..signals import phonenumber_refcount_dropping
-from . import (
+from .base import (
     BaseMixin,
     Mapped,
     Model,
@@ -28,6 +29,7 @@
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
 
 __all__ = [
@@ -40,6 +42,7 @@
     'canonical_phone_number',
     'phone_blake2b160_hash',
     'PhoneNumber',
+    'OptionalPhoneNumberMixin',
     'PhoneNumberMixin',
 ]
 
@@ -232,7 +235,7 @@ def phone_blake2b160_hash(
 # --- Models ---------------------------------------------------------------------------
 
 
-class PhoneNumber(BaseMixin, Model):
+class PhoneNumber(BaseMixin[int, 'Account'], Model):
     """
     Represents a phone number as a standalone entity, with associated metadata.
 
@@ -255,20 +258,18 @@ class PhoneNumber(BaseMixin, Model):
     #: Contains the name of the relationship in the :class:`PhoneNumber` model
     __backrefs__: ClassVar[set[str]] = set()
     #: These backrefs claim exclusive use of the phone number for their linked owner.
-    #: See :class:`PhoneNumberMixin` for implementation detail
+    #: See :class:`OptionalPhoneNumberMixin` for implementation detail
     __exclusive_backrefs__: ClassVar[set[str]] = set()
 
     #: The phone number, centrepiece of this model. Stored normalized in E164 format.
     #: Validated by the :func:`_validate_phone` event handler
-    number: Mapped[str | None] = sa.orm.mapped_column(
-        sa.Unicode, nullable=True, unique=True
-    )
+    number: Mapped[str | None] = sa_orm.mapped_column(unique=True)
 
     #: BLAKE2b 160-bit hash of :attr:`phone`. Kept permanently even if phone is
     #: removed. SQLAlchemy type LargeBinary maps to PostgreSQL BYTEA. Despite the name,
     #: we're only storing 20 bytes
-    blake2b160 = immutable(
-        sa.orm.mapped_column(
+    blake2b160: Mapped[bytes] = immutable(
+        sa_orm.mapped_column(
             sa.LargeBinary,
             sa.CheckConstraint(
                 'LENGTH(blake2b160) = 20',
@@ -284,54 +285,58 @@ class PhoneNumber(BaseMixin, Model):
     # device, we record distinct timestamps for last sent, delivery and failure.
 
     #: Cached state for whether this phone number is known to have SMS support
-    has_sms: Mapped[bool | None] = sa.orm.mapped_column(sa.Boolean, nullable=True)
+    has_sms: Mapped[bool | None] = sa_orm.mapped_column()
     #: Timestamp at which this number was determined to be valid/invalid for SMS
-    has_sms_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    has_sms_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Cached state for whether this phone number is known to be on WhatsApp or not
-    has_wa: Mapped[bool | None] = sa.orm.mapped_column(sa.Boolean, nullable=True)
+    has_wa: Mapped[bool | None] = sa_orm.mapped_column()
     #: Timestamp at which this number was tested for availability on WhatsApp
-    has_wa_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    has_wa_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: Timestamp of last SMS sent
-    msg_sms_sent_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_sms_sent_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Timestamp of last SMS delivered
-    msg_sms_delivered_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_sms_delivered_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Timestamp of last SMS delivery failure
-    msg_sms_failed_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_sms_failed_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: Timestamp of last WA message sent
-    msg_wa_sent_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_wa_sent_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Timestamp of last WA message delivered
-    msg_wa_delivered_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_wa_delivered_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Timestamp of last WA message delivery failure
-    msg_wa_failed_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    msg_wa_failed_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: Timestamp of last known recipient activity resulting from sent messages
-    active_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    active_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: Is this phone number blocked from being used? :attr:`phone` should be null if so.
-    blocked_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    blocked_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
+    if TYPE_CHECKING:
+        used_in_sms_message: Mapped[list[SmsMessage]] = relationship()
+        used_in_account_phone: Mapped[list[AccountPhone]] = relationship()
+
     __table_args__ = (
         # If `blocked_at` is not None, `number` and `has_*` must be None
         sa.CheckConstraint(
@@ -422,7 +427,7 @@ def md5(self) -> str | None:
 
     @cached_property
     def parsed(self) -> phonenumbers.PhoneNumber | None:
-        """Return parsed phone number using libphonenumbers."""
+        """Return parsed phone number using libphonenumber."""
         if self.number:
             return phonenumbers.parse(self.number)
         return None
@@ -548,7 +553,7 @@ def get_filter(
         phone_hash: str | None = None,
     ) -> ColumnElement[bool]:
         """
-        Get an filter condition for retriving a :class:`PhoneNumber`.
+        Get an filter condition for retrieving a :class:`PhoneNumber`.
 
         Accepts a normalized phone number or a blake2b160 hash in either bytes or base58
         form. Internally converts all lookups to a bytes-based hash lookup. Returns an
@@ -706,7 +711,7 @@ def validate_for(
         # There's an existing? Is it blocked?
         if existing.is_blocked:
             return 'blocked'
-        # Is the existing phone mumber available for this owner?
+        # Is the existing phone number available for this owner?
         if not existing.is_available_for(owner):
             # Not available, so return False
             return 'taken'
@@ -722,17 +727,19 @@ def get_numbers(cls, prefix: str, remove: bool = True) -> set[str]:
         """Get all numbers with the given prefix as a Python set."""
         query = (
             cls.query.filter(cls.number.startswith(prefix))
-            .options(sa.orm.load_only(cls.number))
+            .options(sa_orm.load_only(cls.number))
             .yield_per(1000)
         )
+        # This query only has results where `.number` is not None, so we type checkers
+        # have to be told to ignore the possibility of a null:
         if remove:
             skip = len(prefix)
-            return {r.number[skip:] for r in query}
-        return {r.number for r in query}
+            return {r.number[skip:] for r in query}  # type: ignore[index]
+        return {r.number for r in query}  # type: ignore[misc]
 
 
 @declarative_mixin
-class PhoneNumberMixin:
+class OptionalPhoneNumberMixin:
     """
     Mixin class for models that refer to :class:`PhoneNumber`.
 
@@ -756,11 +763,11 @@ class PhoneNumberMixin:
 
     @declared_attr
     @classmethod
-    def phone_number_id(cls) -> Mapped[int]:
+    def phone_number_id(cls) -> Mapped[int | None]:
         """Foreign key to phone_number table."""
-        return sa.orm.mapped_column(
-            sa.Integer,
+        return sa_orm.mapped_column(
             sa.ForeignKey('phone_number.id', ondelete='SET NULL'),
+            default=None,
             nullable=cls.__phone_optional__,
             unique=cls.__phone_unique__,
             index=not cls.__phone_unique__,
@@ -768,13 +775,14 @@ def phone_number_id(cls) -> Mapped[int]:
 
     @declared_attr
     @classmethod
-    def phone_number(cls) -> Mapped[PhoneNumber]:
+    def phone_number(cls) -> Mapped[PhoneNumber | None]:
         """Instance of :class:`PhoneNumber` as a relationship."""
         backref_name = 'used_in_' + cls.__tablename__
         PhoneNumber.__backrefs__.add(backref_name)
         if cls.__phone_for__ and cls.__phone_is_exclusive__:
             PhoneNumber.__exclusive_backrefs__.add(backref_name)
-        return relationship(PhoneNumber, backref=backref_name)
+        with warnings.catch_warnings(action='ignore', category=ModelWarning):
+            return relationship(PhoneNumber, backref=backref_name)
 
     @property
     def phone(self) -> str | None:
@@ -794,17 +802,17 @@ def phone(self) -> str | None:
         return None
 
     @phone.setter
-    def phone(self, value: str | None) -> None:
+    def phone(self, __value: str | None) -> None:
         if self.__phone_for__:
-            if value is not None:
+            if __value is not None:
                 self.phone_number = PhoneNumber.add_for(
-                    getattr(self, self.__phone_for__), value
+                    getattr(self, self.__phone_for__), __value
                 )
             else:
                 self.phone_number = None
         else:
-            if value is not None:
-                self.phone_number = PhoneNumber.add(value)
+            if __value is not None:
+                self.phone_number = PhoneNumber.add(__value)
             else:
                 self.phone_number = None
 
@@ -828,6 +836,37 @@ def transport_hash(self) -> str | None:
         )
 
 
+@declarative_mixin
+class PhoneNumberMixin(OptionalPhoneNumberMixin):
+    """Non-optional version of :class:`OptionalPhoneNumberMixin`."""
+
+    __phone_optional__: ClassVar[bool] = False
+
+    if TYPE_CHECKING:
+
+        @declared_attr
+        @classmethod
+        def phone_number_id(cls) -> Mapped[int]:  # type: ignore[override]
+            ...
+
+        @declared_attr
+        @classmethod
+        def phone_number(cls) -> Mapped[PhoneNumber]:  # type: ignore[override]
+            ...
+
+        @property  # type: ignore[override]
+        def phone(self) -> str:
+            ...
+
+        @phone.setter
+        def phone(self, __value: str) -> None:
+            ...
+
+        @property
+        def transport_hash(self) -> str:
+            ...
+
+
 def _clear_cached_properties(target: PhoneNumber) -> None:
     """Clear cached properties in :class:`PhoneNumber`."""
     for attr in ('parsed', 'formatted'):
@@ -884,7 +923,7 @@ def _send_refcount_event_remove(
 
 
 def _send_refcount_event_before_delete(
-    _mapper: Any, _connection: Any, target: PhoneNumberMixin
+    _mapper: Any, _connection: Any, target: OptionalPhoneNumberMixin
 ) -> None:
     if target.phone_number:
         phonenumber_refcount_dropping.send(target.phone_number)
@@ -898,7 +937,7 @@ def _setup_refcount_events() -> None:
 
 
 def _phone_number_mixin_set_validator(
-    target: PhoneNumberMixin,
+    target: OptionalPhoneNumberMixin,
     value: PhoneNumber | None,
     old_value: PhoneNumber | None,
     _initiator: Any,
@@ -910,13 +949,14 @@ def _phone_number_mixin_set_validator(
             raise PhoneNumberInUseError("This phone number it not available")
 
 
-@event.listens_for(PhoneNumberMixin, 'mapper_configured', propagate=True)
+@event.listens_for(OptionalPhoneNumberMixin, 'mapper_configured', propagate=True)
 def _phone_number_mixin_configure_events(
-    _mapper: Any, cls: type[PhoneNumberMixin]
+    _mapper: Any, cls: type[OptionalPhoneNumberMixin]
 ) -> None:
     event.listen(cls.phone_number, 'set', _phone_number_mixin_set_validator)
     event.listen(cls, 'before_delete', _send_refcount_event_before_delete)
 
 
 if TYPE_CHECKING:
-    from .account import Account
+    from .account import Account, AccountPhone
+    from .notification import SmsMessage
diff --git a/funnel/models/project.py b/funnel/models/project.py
index a1a7f92ac..29c68458c 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -1,21 +1,35 @@
 """Project model."""
+# pylint: disable=unnecessary-lambda
 
 from __future__ import annotations
 
+from collections import OrderedDict, defaultdict
 from collections.abc import Sequence
-from datetime import datetime
+from datetime import datetime, timedelta
+from enum import ReprEnum
+from typing import TYPE_CHECKING, Any, Literal, Self, cast, overload
 
+from flask_babel import format_date, get_locale
 from furl import furl
+from isoweek import Week
 from pytz import BaseTzInfo, utc
-from sqlalchemy.orm import attribute_keyed_dict
+from sqlalchemy.ext.orderinglist import OrderingList, ordering_list
 from werkzeug.utils import cached_property
 
 from baseframe import __, localize_timezone
-from coaster.sqlalchemy import LazyRoleSet, StateManager, with_roles
+from coaster.sqlalchemy import (
+    DynamicAssociationProxy,
+    LazyRoleSet,
+    ManagedState,
+    StateManager,
+    with_roles,
+)
 from coaster.utils import LabeledEnum, buid, utcnow
 
 from .. import app
-from . import (
+from . import types
+from .account import Account
+from .base import (
     BaseScopedNameMixin,
     DynamicMapped,
     Mapped,
@@ -26,26 +40,23 @@
     TSVectorType,
     UrlType,
     UuidMixin,
-    backref,
     db,
     hybrid_property,
     relationship,
     sa,
-    types,
+    sa_orm,
 )
-from .account import Account
-from .comment import SET_TYPE, Commentset
 from .helpers import (
     RESERVED_NAMES,
     ImgeeType,
+    IntTitle,
     MarkdownCompositeDocument,
     add_search_trigger,
-    reopen,
     valid_name,
     visual_field_delimiter,
 )
 
-__all__ = ['PROJECT_RSVP_STATE', 'Project', 'ProjectLocation', 'ProjectRedirect']
+__all__ = ['ProjectRsvpStateEnum', 'Project', 'ProjectLocation', 'ProjectRedirect']
 
 
 # --- Constants ---------------------------------------------------------------
@@ -67,35 +78,28 @@ class CFP_STATE(LabeledEnum):  # noqa: N801
     ANY = {NONE, PUBLIC, CLOSED}
 
 
-class PROJECT_RSVP_STATE(LabeledEnum):  # noqa: N801
-    NONE = (1, __("Not accepting registrations"))
-    ALL = (2, __("Anyone can register"))
-    MEMBERS = (3, __("Only members can register"))
+class ProjectRsvpStateEnum(IntTitle, ReprEnum):
+    NONE = 1, __("Not accepting registrations")
+    ALL = 2, __("Anyone can register")
+    MEMBERS = 3, __("Only members can register")
 
 
 # --- Models ------------------------------------------------------------------
 
 
-class Project(UuidMixin, BaseScopedNameMixin, Model):
+class Project(UuidMixin, BaseScopedNameMixin[int, Account], Model):
     __tablename__ = 'project'
     reserved_names = RESERVED_NAMES
 
-    created_by_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    created_by_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
-    created_by: Mapped[Account] = relationship(
-        Account,
-        foreign_keys=[created_by_id],
-    )
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    created_by: Mapped[Account] = relationship(foreign_keys=[created_by_id])
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
     account: Mapped[Account] = with_roles(
-        relationship(
-            Account,
-            foreign_keys=[account_id],
-            backref=backref('projects', cascade='all', lazy='dynamic'),
-        ),
+        relationship(foreign_keys=[account_id], back_populates='projects'),
         read={'all'},
         # If account grants an 'admin' role, make it 'account_admin' here
         grants_via={
@@ -109,9 +113,9 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
         # 'related' or 'without_parent' as it is the parent
         datasets={'primary'},
     )
-    parent: Mapped[Account] = sa.orm.synonym('account')
+    parent: Mapped[Account] = sa_orm.synonym('account')
     tagline: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(250), nullable=False),
+        sa_orm.mapped_column(sa.Unicode(250), nullable=False),
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
@@ -127,52 +131,58 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
     with_roles(instructions, read={'all'})
 
     location: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(50), default='', nullable=True),
+        sa_orm.mapped_column(sa.Unicode(50), default='', nullable=True),
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
     parsed_location: Mapped[types.jsonb_dict]
 
     website: Mapped[furl | None] = with_roles(
-        sa.orm.mapped_column(UrlType, nullable=True),
+        sa_orm.mapped_column(UrlType, nullable=True),
         read={'all'},
         datasets={'primary', 'without_parent'},
     )
     timezone: Mapped[BaseTzInfo] = with_roles(
-        sa.orm.mapped_column(TimezoneType(backend='pytz'), nullable=False, default=utc),
+        sa_orm.mapped_column(
+            TimezoneType(backend='pytz'),
+            nullable=False,
+            insert_default=utc,
+            default=None,
+        ),
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
 
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
-        sa.Integer,
-        StateManager.check_constraint('state', PROJECT_STATE),
+        StateManager.check_constraint('state', PROJECT_STATE, sa.Integer),
         default=PROJECT_STATE.DRAFT,
         nullable=False,
         index=True,
     )
     state = with_roles(
-        StateManager('_state', PROJECT_STATE, doc="Project state"), call={'all'}
+        StateManager['Project']('_state', PROJECT_STATE, doc="Project state"),
+        call={'all'},
     )
-    _cfp_state: Mapped[int] = sa.orm.mapped_column(
+    _cfp_state: Mapped[int] = sa_orm.mapped_column(
         'cfp_state',
-        sa.Integer,
-        StateManager.check_constraint('cfp_state', CFP_STATE),
+        StateManager.check_constraint('cfp_state', CFP_STATE, sa.Integer),
         default=CFP_STATE.NONE,
         nullable=False,
         index=True,
     )
     cfp_state = with_roles(
-        StateManager('_cfp_state', CFP_STATE, doc="CfP state"), call={'all'}
+        StateManager['Project']('_cfp_state', CFP_STATE, doc="CfP state"), call={'all'}
     )
 
     #: State of RSVPs
     rsvp_state: Mapped[int] = with_roles(
-        sa.orm.mapped_column(
+        sa_orm.mapped_column(
             sa.SmallInteger,
-            StateManager.check_constraint('rsvp_state', PROJECT_RSVP_STATE),
-            default=PROJECT_RSVP_STATE.NONE,
+            StateManager.check_constraint(
+                'rsvp_state', ProjectRsvpStateEnum, sa.SmallInteger
+            ),
+            default=ProjectRsvpStateEnum.NONE,
             nullable=False,
         ),
         read={'all'},
@@ -181,62 +191,62 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
     )
 
     #: Audit timestamp to detect re-publishing to re-surface a project
-    first_published_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    first_published_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
     #: Timestamp of when this project was most recently published
     published_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
         read={'all'},
         write={'promoter'},
         datasets={'primary', 'without_parent', 'related'},
     )
     #: Optional start time for schedule, cached from column property schedule_start_at
     start_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
         read={'all'},
         write={'editor'},
         datasets={'primary', 'without_parent', 'related'},
     )
     #: Optional end time for schedule, cached from column property schedule_end_at
     end_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True, index=True),
         read={'all'},
         write={'editor'},
         datasets={'primary', 'without_parent', 'related'},
     )
 
-    cfp_start_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    cfp_start_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
-    cfp_end_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    cfp_end_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
 
     bg_image: Mapped[furl | None] = with_roles(
-        sa.orm.mapped_column(ImgeeType, nullable=True),
+        sa_orm.mapped_column(ImgeeType, nullable=True),
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
 
     #: Auto-generated preview image for Open Graph
-    preview_image: Mapped[bytes | None] = sa.orm.mapped_column(
+    preview_image: Mapped[bytes | None] = sa_orm.mapped_column(
         sa.LargeBinary, nullable=True, deferred=True
     )
 
     buy_tickets_url: Mapped[furl | None] = with_roles(
-        sa.orm.mapped_column(UrlType, nullable=True),
+        sa_orm.mapped_column(UrlType, nullable=True),
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
 
     banner_video_url: Mapped[furl | None] = with_roles(
-        sa.orm.mapped_column(UrlType, nullable=True),
+        sa_orm.mapped_column(UrlType, nullable=True),
         read={'all'},
         datasets={'primary', 'without_parent'},
     )
     boxoffice_data: Mapped[types.jsonb_dict] = with_roles(
-        sa.orm.mapped_column(),
+        sa_orm.mapped_column(),
         # This is an attribute, but we deliberately use `call` instead of `read` to
         # block this from dictionary enumeration. FIXME: Break up this dictionary into
         # individual columns with `all` access for ticket embed id and `promoter`
@@ -245,25 +255,24 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
     )
 
     hasjob_embed_url: Mapped[furl | None] = with_roles(
-        sa.orm.mapped_column(UrlType, nullable=True), read={'all'}
+        sa_orm.mapped_column(UrlType, nullable=True), read={'all'}
     )
     hasjob_embed_limit: Mapped[int | None] = with_roles(
-        sa.orm.mapped_column(sa.Integer, default=8, nullable=True), read={'all'}
+        sa_orm.mapped_column(default=8, nullable=True), read={'all'}
     )
 
-    commentset_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('commentset.id'), nullable=False
+    commentset_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('commentset.id'), default=None, nullable=False
     )
     commentset: Mapped[Commentset] = relationship(
-        Commentset,
-        uselist=False,
-        cascade='all',
-        single_parent=True,
-        back_populates='project',
+        uselist=False, single_parent=True, back_populates='project'
     )
 
-    parent_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('project.id', ondelete='SET NULL'), nullable=True
+    parent_project_id: Mapped[int | None] = sa_orm.mapped_column(
+        'parent_id',  # TODO: Migration required
+        sa.ForeignKey('project.id', ondelete='SET NULL'),
+        default=None,
+        nullable=True,
     )
     parent_project: Mapped[Project | None] = relationship(
         remote_side='Project.id', back_populates='subprojects'
@@ -273,34 +282,33 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
     #: Featured project flag. This can only be set by website editors, not
     #: project editors or account admins.
     site_featured: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, default=False, nullable=False),
+        sa_orm.mapped_column(default=False),
         read={'all'},
         write={'site_editor'},
         datasets={'primary', 'without_parent'},
     )
 
     livestream_urls: Mapped[list[str] | None] = with_roles(
-        sa.orm.mapped_column(
+        sa_orm.mapped_column(
             sa.ARRAY(sa.UnicodeText, dimensions=1),
             nullable=True,  # For legacy data
             server_default=sa.text("'{}'::text[]"),
+            default=None,
         ),
         read={'all'},
         datasets={'primary', 'without_parent'},
     )
 
     is_restricted_video: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, default=False, nullable=False),
+        sa_orm.mapped_column(default=False),
         read={'all'},
         datasets={'primary', 'without_parent'},
     )
 
     #: Revision number maintained by SQLAlchemy, used for vCal files, starting at 1
-    revisionid: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=False), read={'all'}
-    )
+    revisionid: Mapped[int] = with_roles(sa_orm.mapped_column(), read={'all'})
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'name',
             'title',
@@ -327,8 +335,168 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
         deferred=True,
     )
 
-    # Relationships
-    primary_venue: Mapped[Venue | None] = relationship()
+    # --- Backrefs and relationships
+
+    redirects: Mapped[list[ProjectRedirect]] = relationship(back_populates='project')
+    locations: Mapped[list[ProjectLocation]] = relationship(back_populates='project')
+
+    # label.py
+    labels: Mapped[list[Label]] = relationship(
+        primaryjoin=lambda: sa.and_(
+            Label.project_id == Project.id,
+            Label.main_label_id.is_(None),
+            Label._archived.is_(False),  # pylint: disable=protected-access
+        ),
+        order_by=lambda: Label.seq,
+        viewonly=True,
+    )
+    all_labels: Mapped[OrderingList[Label]] = relationship(
+        collection_class=ordering_list('seq', count_from=1),
+        back_populates='project',
+    )
+
+    # project_membership.py
+    crew_memberships: DynamicMapped[ProjectMembership] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='project'
+    )
+    active_crew_memberships: DynamicMapped[ProjectMembership] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                ProjectMembership.project_id == Project.id,
+                ProjectMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ),
+            viewonly=True,
+        ),
+        grants_via={'member': {'editor', 'promoter', 'usher', 'participant', 'crew'}},
+    )
+
+    active_editor_memberships: DynamicMapped[ProjectMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.project_id == Project.id,
+            ProjectMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ProjectMembership.is_editor.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    active_promoter_memberships: DynamicMapped[ProjectMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.project_id == Project.id,
+            ProjectMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ProjectMembership.is_promoter.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    active_usher_memberships: DynamicMapped[ProjectMembership] = relationship(
+        lazy='dynamic',
+        primaryjoin=lambda: sa.and_(
+            ProjectMembership.project_id == Project.id,
+            ProjectMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ProjectMembership.is_usher.is_(True),
+        ),
+        viewonly=True,
+    )
+
+    crew = DynamicAssociationProxy[Account]('active_crew_memberships', 'member')
+    editors = DynamicAssociationProxy[Account]('active_editor_memberships', 'member')
+    promoters = DynamicAssociationProxy[Account](
+        'active_promoter_memberships', 'member'
+    )
+    ushers = DynamicAssociationProxy[Account]('active_usher_memberships', 'member')
+
+    # proposal.py
+    proposals: DynamicMapped[Proposal] = relationship(
+        lazy='dynamic', order_by=lambda: Proposal.seq, back_populates='project'
+    )
+
+    # rsvp.py
+    rsvps: DynamicMapped[Rsvp] = relationship(lazy='dynamic', back_populates='project')
+
+    # saved.py
+    saves: DynamicMapped[SavedProject] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='project'
+    )
+
+    # session.py
+    sessions: DynamicMapped[Session] = relationship(
+        lazy='dynamic', back_populates='project'
+    )
+
+    if TYPE_CHECKING:
+        # These are column properties, defined at the end of the file
+        schedule_start_at: Mapped[datetime | None]
+        next_session_at: Mapped[datetime | None]
+        schedule_end_at: Mapped[datetime | None]
+        # This relationship is added by add_primary_relationship in models/venue.py
+        primary_venue: Mapped[Venue | None] = relationship()
+
+    # sponsor_membership.py
+    all_sponsor_memberships: DynamicMapped[ProjectSponsorMembership] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='project'
+    )
+
+    sponsor_memberships: DynamicMapped[ProjectSponsorMembership] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                ProjectSponsorMembership.project_id == Project.id,
+                ProjectSponsorMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ),
+            order_by=lambda: ProjectSponsorMembership.seq,
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+
+    @with_roles(read={'all'})
+    @cached_property
+    def has_sponsors(self) -> bool:
+        return db.session.query(self.sponsor_memberships.exists()).scalar()
+
+    sponsors = DynamicAssociationProxy[Account]('sponsor_memberships', 'member')
+
+    # sync_ticket.py
+    ticket_clients: Mapped[list[TicketClient]] = relationship(back_populates='project')
+    ticket_events: Mapped[list[TicketEvent]] = relationship(back_populates='project')
+    ticket_types: Mapped[list[TicketType]] = relationship(back_populates='project')
+    # XXX: This relationship exposes an edge case in RoleMixin. It previously expected
+    # TicketParticipant.participant to be unique per project, meaning one user could
+    # have one participant ticket only. This is not guaranteed by the model as tickets
+    # are unique per email address per ticket type, and one user can have (a) two email
+    # addresses with tickets, or (b) tickets of different types. RoleMixin has since
+    # been patched to look for the first matching record (.first() instead of .one()).
+    # This may expose a new edge case in future in case the TicketParticipant model adds
+    # an `offered_roles` method, as only the first matching record's method will be
+    # called
+    ticket_participants: DynamicMapped[TicketParticipant] = with_roles(
+        relationship(lazy='dynamic', back_populates='project'),
+        grants_via={
+            'participant': {'participant', 'project_participant', 'ticket_participant'}
+        },
+    )
+
+    # update.py
+    updates: DynamicMapped[Update] = relationship(
+        lazy='dynamic', back_populates='project'
+    )
+
+    # venue.py
+    venues: Mapped[OrderingList[Venue]] = with_roles(
+        relationship(
+            order_by=lambda: Venue.seq,
+            collection_class=ordering_list('seq', count_from=1),
+            back_populates='project',
+        ),
+        read={'all'},
+    )
+
+    @property
+    def rooms(self) -> list[VenueRoom]:
+        return [room for venue in self.venues for room in venue.rooms]
 
     __table_args__ = (
         sa.UniqueConstraint('account_id', 'name'),
@@ -364,8 +532,8 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
                 'short_title',  # From BaseScopedNameMixin
                 'title',  # From BaseScopedNameMixin
                 'urls',  # From UrlForMixin
-                'created_at',  # From TimestampMixin, used for ical render timestamp
-                'updated_at',  # From TimestampMixin, used for ical render timestamp
+                'created_at',  # From TimestampMixin, used for vCal render timestamp
+                'updated_at',  # From TimestampMixin, used for vCal render timestamp
             },
             'call': {
                 'features',  # From RegistryMixin
@@ -408,6 +576,7 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
         state.PUBLISHED,
         lambda project: (
             project.start_at is not None
+            and project.end_at is not None
             and project.start_at <= utcnow() < project.end_at
         ),
         lambda project: sa.and_(
@@ -434,17 +603,13 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
     cfp_state.add_conditional_state(
         'HAS_PROPOSALS',
         cfp_state.ANY,
-        lambda project: db.session.query(  # type: ignore[has-type]
-            project.proposals.exists()
-        ).scalar(),
+        lambda project: db.session.query(project.proposals.exists()).scalar(),
         label=('has_proposals', __("Has submissions")),
     )
     cfp_state.add_conditional_state(
         'HAS_SESSIONS',
         cfp_state.ANY,
-        lambda project: db.session.query(  # type: ignore[has-type]
-            project.sessions.exists()
-        ).scalar(),
+        lambda project: db.session.query(project.sessions.exists()).scalar(),
         label=('has_sessions', __("Has sessions")),
     )
     cfp_state.add_conditional_state(
@@ -488,7 +653,7 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
         cfp_state.EXPIRED,
     )
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.commentset = Commentset(settype=SET_TYPE.PROJECT)
         # Add the creator as editor and promoter
@@ -511,7 +676,7 @@ def __str__(self) -> str:
     def __format__(self, format_spec: str) -> str:
         if not format_spec:
             return self.joined_title
-        return self.joined_title.__format__(format_spec)
+        return format(self.joined_title, format_spec)
 
     @with_roles(call={'editor'})
     @cfp_state.transition(
@@ -566,7 +731,7 @@ def publish(self) -> bool:
         message=__("The project has been withdrawn and is no longer listed"),
         type='success',
     )
-    def withdraw(self):
+    def withdraw(self) -> None:
         """Withdraw a project."""
 
     @property
@@ -684,7 +849,7 @@ def datelocation(self) -> str:
     # def delete(self):
     #     pass
 
-    @sa.orm.validates('name', 'account')
+    @sa_orm.validates('name', 'account')
     def _validate_and_create_redirect(self, key: str, value: str | None) -> str:
         # TODO: When labels, venues and other resources are relocated from project to
         # account, this validator can no longer watch for `account` change. We'll need a
@@ -701,7 +866,7 @@ def _validate_and_create_redirect(self, key: str, value: str | None) -> str:
 
     @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
     @cached_property
-    def cfp_start_at_localized(self):
+    def cfp_start_at_localized(self) -> datetime | None:
         return (
             localize_timezone(self.cfp_start_at, tz=self.timezone)
             if self.cfp_start_at
@@ -710,7 +875,7 @@ def cfp_start_at_localized(self):
 
     @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
     @cached_property
-    def cfp_end_at_localized(self):
+    def cfp_end_at_localized(self) -> datetime | None:
         return (
             localize_timezone(self.cfp_end_at, tz=self.timezone)
             if self.cfp_end_at
@@ -719,7 +884,7 @@ def cfp_end_at_localized(self):
 
     @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
     @cached_property
-    def start_at_localized(self):
+    def start_at_localized(self) -> datetime | None:
         """Return localized start_at timestamp."""
         return (
             localize_timezone(self.start_at, tz=self.timezone)
@@ -729,7 +894,7 @@ def start_at_localized(self):
 
     @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
     @cached_property
-    def end_at_localized(self):
+    def end_at_localized(self) -> datetime | None:
         """Return localized end_at timestamp."""
         return localize_timezone(self.end_at, tz=self.timezone) if self.end_at else None
 
@@ -737,7 +902,51 @@ def end_at_localized(self):
     @hybrid_property
     def allow_rsvp(self) -> bool:
         """RSVP state as a boolean value (allowed for all or not)."""
-        return self.rsvp_state == PROJECT_RSVP_STATE.ALL
+        return self.rsvp_state == ProjectRsvpStateEnum.ALL
+
+    @property
+    def active_rsvps(self) -> Query[Rsvp]:
+        return self.rsvps.join(Account).filter(Rsvp.state.YES, Account.state.ACTIVE)
+
+    @overload
+    def rsvp_for(self, account: Account, create: Literal[True]) -> Rsvp:
+        ...
+
+    @overload
+    def rsvp_for(
+        self, account: Account | None, create: Literal[False] = False
+    ) -> Rsvp | None:
+        ...
+
+    def rsvp_for(self, account: Account | None, create: bool = False) -> Rsvp | None:
+        return Rsvp.get_for(self, account, create)
+
+    def rsvps_with(self, state: RsvpStateEnum) -> Query[Rsvp]:
+        return self.rsvps.join(Account).filter(
+            Account.state.ACTIVE,
+            Rsvp._state == state,  # pylint: disable=protected-access
+        )
+
+    def rsvp_counts(self) -> dict[str, int]:
+        return {
+            row[0]: row[1]
+            for row in db.session.query(
+                Rsvp._state,  # pylint: disable=protected-access
+                sa.func.count(Rsvp._state),  # pylint: disable=protected-access
+            )
+            .join(Account)
+            .filter(Account.state.ACTIVE, Rsvp.project == self)
+            .group_by(Rsvp._state)  # pylint: disable=protected-access
+            .all()
+        }
+
+    @cached_property
+    def rsvp_count_going(self) -> int:
+        return (
+            self.rsvps.join(Account)
+            .filter(Account.state.ACTIVE, Rsvp.state.YES)
+            .count()
+        )
 
     def update_schedule_timestamps(self) -> None:
         """Update cached timestamps from sessions."""
@@ -756,6 +965,439 @@ def is_safe_to_delete(self) -> bool:
         """Return True if project has no proposals."""
         return self.proposals.count() == 0
 
+    @property
+    def proposals_all(self) -> Query[Proposal]:
+        if self.subprojects:
+            return Proposal.query.filter(
+                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
+            )
+        return self.proposals
+
+    @property
+    def proposals_by_state(self) -> dict[ManagedState, list[Proposal]]:
+        if self.subprojects:
+            basequery = Proposal.query.filter(
+                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
+            )
+        else:
+            basequery = Proposal.query.filter_by(project=self)
+        return Proposal.state.group(
+            basequery.filter(
+                ~(Proposal.state.DRAFT), ~(Proposal.state.DELETED)
+            ).order_by(sa.desc('created_at'))
+        )
+
+    @property
+    def proposals_by_confirmation(self) -> dict[str, list[Proposal]]:
+        if self.subprojects:
+            basequery = Proposal.query.filter(
+                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
+            )
+        else:
+            basequery = Proposal.query.filter_by(project=self)
+        return {
+            'confirmed': basequery.filter(Proposal.state.CONFIRMED)
+            .order_by(sa.desc('created_at'))
+            .all(),
+            'unconfirmed': basequery.filter(
+                ~(Proposal.state.CONFIRMED),
+                ~(Proposal.state.DRAFT),
+                ~(Proposal.state.DELETED),
+            )
+            .order_by(sa.desc('created_at'))
+            .all(),
+        }
+
+    if TYPE_CHECKING:
+        _has_featured_proposals: Mapped[bool | None]
+
+    @property
+    def has_featured_proposals(self) -> bool:
+        return bool(self._has_featured_proposals)
+
+    with_roles(has_featured_proposals, read={'all'})
+
+    @with_roles(call={'all'})
+    def is_saved_by(self, account: Account) -> bool:
+        return account is not None and self.saves.filter_by(account=account).notempty()
+
+    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
+    @cached_property
+    def schedule_start_at_localized(self) -> datetime | None:
+        return (
+            localize_timezone(self.schedule_start_at, tz=self.timezone)
+            if self.schedule_start_at
+            else None
+        )
+
+    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
+    @cached_property
+    def schedule_end_at_localized(self) -> datetime | None:
+        return (
+            localize_timezone(self.schedule_end_at, tz=self.timezone)
+            if self.schedule_end_at
+            else None
+        )
+
+    @with_roles(read={'all'})
+    @cached_property
+    def session_count(self) -> int:
+        return self.sessions.filter(Session.start_at.is_not(None)).count()
+
+    featured_sessions: Mapped[list[Session]] = with_roles(
+        relationship(
+            order_by=lambda: Session.start_at.asc(),
+            primaryjoin=lambda: sa.and_(
+                Session.project_id == Project.id, Session.featured.is_(True)
+            ),
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+    scheduled_sessions: Mapped[list[Session]] = with_roles(
+        relationship(
+            order_by=lambda: Session.start_at.asc(),
+            primaryjoin=lambda: sa.and_(
+                Session.project_id == Project.id,
+                Session.scheduled,
+            ),
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+    unscheduled_sessions: Mapped[list[Session]] = with_roles(
+        relationship(
+            order_by=lambda: Session.start_at.asc(),
+            primaryjoin=lambda: sa.and_(
+                Session.project_id == Project.id,
+                Session.scheduled.is_not(True),
+            ),
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+
+    sessions_with_video: DynamicMapped[Session] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                Project.id == Session.project_id,
+                Session.video_id.is_not(None),
+                Session.video_source.is_not(None),
+            ),
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+
+    @with_roles(read={'all'})
+    @cached_property
+    def has_sessions_with_video(self) -> bool:
+        return self.query.session.query(self.sessions_with_video.exists()).scalar()
+
+    def next_session_from(self, timestamp: datetime) -> Session | None:
+        """Find the next session in this project from given timestamp."""
+        return (
+            self.sessions.filter(
+                Session.start_at.is_not(None), Session.start_at >= timestamp
+            )
+            .order_by(Session.start_at.asc())
+            .first()
+        )
+
+    @with_roles(call={'all'})
+    def next_starting_at(self, timestamp: datetime | None = None) -> datetime | None:
+        """
+        Return timestamp of next session from given timestamp.
+
+        Supplements :attr:`next_session_at` to also consider projects without sessions.
+        """
+        # If there's no `self.start_at`, there is no session either
+        if self.start_at is not None:
+            if timestamp is None:
+                timestamp = utcnow()
+            # If `self.start_at` is in the future, it is guaranteed to be the closest
+            # timestamp, so return it directly
+            if self.start_at >= timestamp:
+                return self.start_at
+            # In the past? Then look for a session and return that timestamp, if any
+            return (
+                db.session.query(sa.func.min(Session.start_at))
+                .filter(
+                    Session.start_at.is_not(None),
+                    Session.start_at >= timestamp,
+                    Session.project == self,
+                )
+                .scalar()
+            )
+
+        return None
+
+    @classmethod
+    def starting_at(
+        cls, timestamp: datetime, within: timedelta, gap: timedelta
+    ) -> Query[Self]:
+        """
+        Return projects that are about to start, for sending notifications.
+
+        :param datetime timestamp: The timestamp to look for new sessions at
+        :param timedelta within: Find anything at timestamp + within delta. Lookup will
+            be for sessions where timestamp >= start_at < timestamp+within
+        :param timedelta gap: A project will be considered to be starting if it has no
+            sessions ending within the gap period before the timestamp
+
+        Typical use of this method is from a background worker that calls it at
+        intervals of five minutes with parameters (timestamp, within 5m, 60m gap).
+        """
+        # As a rule, start_at is queried with >= and <, end_at with > and <= because
+        # they represent inclusive lower and upper bounds.
+
+        # Check project starting time before looking for individual sessions, as some
+        # projects will have no sessions
+        return (
+            cls.query.filter(
+                cls.id.in_(
+                    db.session.query(sa.func.distinct(Session.project_id)).filter(
+                        Session.start_at.is_not(None),
+                        Session.start_at >= timestamp,
+                        Session.start_at < timestamp + within,
+                        Session.project_id.notin_(
+                            db.session.query(
+                                sa.func.distinct(Session.project_id)
+                            ).filter(
+                                Session.start_at.is_not(None),
+                                sa.or_(
+                                    sa.and_(
+                                        Session.start_at >= timestamp - gap,
+                                        Session.start_at < timestamp,
+                                    ),
+                                    sa.and_(
+                                        Session.end_at > timestamp - gap,
+                                        Session.end_at <= timestamp,
+                                    ),
+                                ),
+                            )
+                        ),
+                    )
+                )
+            )
+            .join(Session.project)
+            .filter(cls.state.PUBLISHED)
+        ).union(
+            cls.query.filter(
+                cls.state.PUBLISHED,
+                cls.start_at.is_not(None),
+                cls.start_at >= timestamp,
+                cls.start_at < timestamp + within,
+            )
+        )
+
+    @with_roles(call={'all'})
+    def current_sessions(self) -> dict | None:
+        if self.start_at is None or (self.start_at > utcnow() + timedelta(minutes=30)):
+            return None
+
+        current_sessions = (
+            self.sessions.outerjoin(VenueRoom)
+            .filter(Session.start_at <= sa.func.utcnow() + timedelta(minutes=30))
+            .filter(Session.end_at > sa.func.utcnow())
+            .order_by(Session.start_at.asc(), VenueRoom.seq.asc())
+        )
+
+        return {
+            'sessions': [
+                session.current_access(datasets=('without_parent', 'related'))
+                for session in current_sessions
+            ],
+            'rooms': [
+                room.current_access(datasets=('without_parent', 'related'))
+                for room in self.rooms
+            ],
+        }
+
+    # TODO: Use TypedDict for return type
+    def calendar_weeks(self, leading_weeks: bool = True) -> dict[str, Any]:
+        # session_dates is a list of tuples in this format -
+        # (date, day_start_at, day_end_at, event_count)
+        if self.schedule_start_at:
+            session_dates = list(
+                db.session.query(
+                    sa.func.date_trunc(
+                        'day', sa.func.timezone(self.timezone.zone, Session.start_at)
+                    ).label('date'),
+                    sa.func.min(Session.start_at).label('day_start_at'),
+                    sa.func.max(Session.end_at).label('day_end_at'),
+                    sa.func.count().label('count'),
+                )
+                .select_from(Session)
+                .filter(
+                    Session.project == self,
+                    Session.start_at.is_not(None),
+                    Session.end_at.is_not(None),
+                )
+                .group_by('date')
+                .order_by('date')
+            )
+        elif self.start_at:
+            start_at = cast(datetime, self.start_at_localized)
+            end_at = cast(datetime, self.end_at_localized)
+            if start_at.date() == end_at.date():
+                session_dates = [(start_at, start_at, end_at, 1)]
+            else:
+                session_dates = [
+                    (
+                        start_at + timedelta(days=plusdays),
+                        start_at + timedelta(days=plusdays),
+                        end_at - timedelta(days=plusdays),
+                        1,
+                    )
+                    for plusdays in range(
+                        (
+                            end_at.replace(hour=1, minute=0, second=0, microsecond=0)
+                            - start_at.replace(
+                                hour=0, minute=0, second=0, microsecond=0
+                            )
+                        ).days
+                        + 1
+                    )
+                ]
+        else:
+            session_dates = []
+
+        session_dates_dict = {
+            date.date(): {
+                'day_start_at': day_start_at,
+                'day_end_at': day_end_at,
+                'count': count,
+            }
+            for date, day_start_at, day_end_at, count in session_dates
+        }
+
+        # FIXME: This doesn't work. This code needs to be tested in isolation
+        # session_dates = (
+        #     db.session.query(
+        #         sa.cast(
+        #             sa.func.date_trunc(
+        #                 'day', sa.func.timezone(self.timezone.zone, Session.start_at)
+        #             ),
+        #             sa.Date,
+        #         ).label('date'),
+        #         sa.func.count().label('count'),
+        #     )
+        #     .filter(Session.project == self, Session.scheduled)
+        #     .group_by(sa.text('date'))
+        #     .order_by(sa.text('date'))
+        # )
+
+        # if the project's week is within next 2 weeks, send current week as well
+        now = utcnow().astimezone(self.timezone)
+        current_week = Week.withdate(now)
+
+        if leading_weeks and self.schedule_start_at is not None:
+            schedule_start_week = Week.withdate(self.schedule_start_at)
+
+            # session_dates is a list of tuples in this format -
+            # (date, day_start_at, day_end_at, event_count)
+            # as these days dont have any event, day_start/end_at are None,
+            # and count is 0.
+            if (
+                schedule_start_week > current_week
+                and (schedule_start_week - current_week) <= 2
+            ):
+                if (schedule_start_week - current_week) == 2:
+                    # add this so that the next week's dates
+                    # are also included in the calendar.
+                    session_dates.insert(0, (now + timedelta(days=7), None, None, 0))
+                session_dates.insert(0, (now, None, None, 0))
+
+        weeks: dict[str, dict[str, Any]] = defaultdict(dict)
+        today = now.date()
+        for project_date, _day_start_at, _day_end_at, session_count in session_dates:
+            weekobj = Week.withdate(project_date)
+            weekid = weekobj.isoformat()
+            if weekid not in weeks:
+                weeks[weekid]['year'] = weekobj.year
+                # Order is important, and we need dict to count easily
+                weeks[weekid]['dates'] = OrderedDict()
+            for wdate in weekobj.days():
+                weeks[weekid]['dates'].setdefault(wdate, 0)
+                if project_date.date() == wdate:
+                    # If the event is over don't set upcoming for current week
+                    if wdate >= today and weekobj >= current_week and session_count > 0:
+                        weeks[weekid]['upcoming'] = True
+                    weeks[weekid]['dates'][wdate] += session_count
+                    if 'month' not in weeks[weekid]:
+                        weeks[weekid]['month'] = format_date(wdate, 'MMM')
+        # Extract sorted weeks as a list
+        weeks_list = [v for k, v in sorted(weeks.items())]
+
+        for week in weeks_list:
+            # Converting to JSON messes up dictionary key order even though we used
+            # OrderedDict. This turns the OrderedDict into a list of tuples and JSON
+            # preserves that order.
+            week['dates'] = [
+                {
+                    'isoformat': date.isoformat(),
+                    'day': format_date(date, 'd'),
+                    'count': count,
+                    'day_start_at': (
+                        session_dates_dict[date]['day_start_at']
+                        .astimezone(self.timezone)
+                        .strftime('%I:%M %p')
+                        if date in session_dates_dict.keys()
+                        else None
+                    ),
+                    'day_end_at': (
+                        session_dates_dict[date]['day_end_at']
+                        .astimezone(self.timezone)
+                        .strftime('%I:%M %p %Z')
+                        if date in session_dates_dict.keys()
+                        else None
+                    ),
+                }
+                for date, count in week['dates'].items()
+            ]
+        return {
+            'locale': get_locale(),
+            'weeks': weeks_list,
+            'today': now.date().isoformat(),
+            'days': [format_date(day, 'EEE') for day in Week.thisweek().days()],
+        }
+
+    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
+    @cached_property
+    def calendar_weeks_full(self) -> dict[str, Any]:  # TODO: Use TypedDict
+        return self.calendar_weeks(leading_weeks=True)
+
+    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
+    @cached_property
+    def calendar_weeks_compact(self) -> dict[str, Any]:  # TODO: Use TypedDict
+        return self.calendar_weeks(leading_weeks=False)
+
+    @property
+    def published_updates(self) -> Query[Update]:
+        return self.updates.filter(Update.state.PUBLISHED).order_by(
+            Update.is_pinned.desc(), Update.published_at.desc()
+        )
+
+    with_roles(published_updates, read={'all'})
+
+    @property
+    def draft_updates(self) -> Query[Update]:
+        return self.updates.filter(Update.state.DRAFT).order_by(Update.created_at)
+
+    with_roles(draft_updates, read={'editor'})
+
+    @property
+    def pinned_update(self) -> Update | None:
+        return (
+            self.updates.filter(Update.state.PUBLISHED, Update.is_pinned.is_(True))
+            .order_by(Update.published_at.desc())
+            .first()
+        )
+
+    with_roles(pinned_update, read={'all'})
+
     @classmethod
     def order_by_date(cls) -> sa.Case:
         """
@@ -770,7 +1412,7 @@ def order_by_date(cls) -> sa.Case:
         return clause
 
     @classmethod
-    def all_unsorted(cls) -> Query[Project]:
+    def all_unsorted(cls) -> Query[Self]:
         """Return query of all published projects, without ordering criteria."""
         return (
             cls.query.join(Account, Project.account)
@@ -779,7 +1421,7 @@ def all_unsorted(cls) -> Query[Project]:
         )
 
     @classmethod
-    def all(cls) -> Query[Project]:  # noqa: A003
+    def all(cls) -> Query[Self]:  # noqa: A003
         """Return all published projects, ordered by date."""
         return cls.all_unsorted().order_by(cls.order_by_date())
 
@@ -815,102 +1457,22 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
 add_search_trigger(Project, 'search_vector')
 
 
-@reopen(Account)
-class __Account:
-    id: Mapped[int]  # noqa: A003
-
-    listed_projects: DynamicMapped[Project] = relationship(
-        Project,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            Account.id == Project.account_id,
-            Project.state.PUBLISHED,
-        ),
-        viewonly=True,
-    )
-    draft_projects: DynamicMapped[Project] = relationship(
-        Project,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            Account.id == Project.account_id,
-            sa.or_(Project.state.DRAFT, Project.cfp_state.DRAFT),
-        ),
-        viewonly=True,
-    )
-    projects_by_name: Mapped[dict[str, Project]] = with_roles(
-        relationship(
-            Project,
-            foreign_keys=[Project.account_id],
-            collection_class=attribute_keyed_dict('name'),
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-
-    def draft_projects_for(self, user: Account | None) -> list[Project]:
-        if user is not None:
-            return [
-                membership.project
-                for membership in user.projects_as_crew_active_memberships.join(
-                    Project
-                ).filter(
-                    # Project is attached to this account
-                    Project.account_id == self.id,
-                    # Project is in draft state OR has a draft call for proposals
-                    sa.or_(Project.state.DRAFT, Project.cfp_state.DRAFT),
-                )
-            ]
-        return []
-
-    def unscheduled_projects_for(self, user: Account | None) -> list[Project]:
-        if user is not None:
-            return [
-                membership.project
-                for membership in user.projects_as_crew_active_memberships.join(
-                    Project
-                ).filter(
-                    # Project is attached to this account
-                    Project.account_id == self.id,
-                    # Project is in draft state OR has a draft call for proposals
-                    sa.or_(Project.state.PUBLISHED_WITHOUT_SESSIONS),
-                )
-            ]
-        return []
-
-    @with_roles(read={'all'}, datasets={'primary', 'without_parent', 'related'})
-    @cached_property
-    def published_project_count(self) -> int:
-        return (
-            self.listed_projects.filter(Project.state.PUBLISHED).order_by(None).count()
-        )
-
-    @with_roles(grants_via={None: {'participant': 'member'}})
-    @cached_property
-    def membership_project(self) -> Project | None:
-        """Return a project that has memberships flag enabled (temporary)."""
-        return self.projects.filter(
-            Project.boxoffice_data.op('@>')({'has_membership': True})
-        ).first()
-
-
 class ProjectRedirect(TimestampMixin, Model):
     __tablename__ = 'project_redirect'
 
-    account_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False, primary_key=True
-    )
-    account: Mapped[Account] = relationship(
-        Account, backref=backref('project_redirects', cascade='all')
+    account_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False, primary_key=True
     )
-    parent: Mapped[Account] = sa.orm.synonym('account')
-    name: Mapped[str] = sa.orm.mapped_column(
+    account: Mapped[Account] = relationship(back_populates='project_redirects')
+    parent: Mapped[Account] = sa_orm.synonym('account')
+    name: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(250), nullable=False, primary_key=True
     )
 
-    project_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id', ondelete='SET NULL'), nullable=True
+    project_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id', ondelete='SET NULL'), default=None, nullable=True
     )
-    project: Mapped[Project | None] = relationship(Project, backref='redirects')
+    project: Mapped[Project | None] = relationship(back_populates='redirects')
 
     def __repr__(self) -> str:
         """Represent :class:`ProjectRedirect` as a string."""
@@ -921,7 +1483,7 @@ def __repr__(self) -> str:
             f' → {self.project.account.urlname}/{self.project.name}>'
         )
 
-    def redirect_view_args(self):
+    def redirect_view_args(self) -> dict[str, str]:
         if self.project:
             return {'account': self.account.urlname, 'project': self.project.name}
         return {}
@@ -948,7 +1510,7 @@ def add(
             account = project.account
         if name is None:
             name = project.name
-        redirect = cls.query.get((account.id, name))
+        redirect = db.session.get(cls, (account.id, name))
         if redirect is None:
             redirect = cls(account=account, name=name, project=project)
             db.session.add(redirect)
@@ -978,19 +1540,15 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
 class ProjectLocation(TimestampMixin, Model):
     __tablename__ = 'project_location'
     #: Project we are tagging
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), primary_key=True, nullable=False
-    )
-    project: Mapped[Project] = relationship(
-        Project, backref=backref('locations', cascade='all')
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, primary_key=True, nullable=False
     )
+    project: Mapped[Project] = relationship(back_populates='locations')
     #: Geonameid for this project
-    geonameid: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, primary_key=True, nullable=False, index=True
-    )
-    primary: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=True, nullable=False
+    geonameid: Mapped[int] = sa_orm.mapped_column(
+        primary_key=True, nullable=False, index=True
     )
+    primary: Mapped[bool] = sa_orm.mapped_column(default=True, nullable=False)
 
     def __repr__(self) -> str:
         """Represent :class:`ProjectLocation` as a string."""
@@ -1000,15 +1558,90 @@ def __repr__(self) -> str:
         )
 
 
-@reopen(Commentset)
-class __Commentset:
-    project: Mapped[Project | None] = with_roles(
-        relationship(Project, uselist=False, back_populates='commentset'),
-        grants_via={None: {'editor': 'document_subscriber'}},
-    )
+# Tail imports
+from .label import Label
+from .project_membership import ProjectMembership
+from .proposal import Proposal
+from .rsvp import Rsvp, RsvpStateEnum
+from .session import Session
+from .sponsor_membership import ProjectSponsorMembership
+from .update import Update
+from .venue import Venue, VenueRoom
+
+if TYPE_CHECKING:
+    from .saved import SavedProject
+    from .sync_ticket import TicketClient, TicketEvent, TicketParticipant, TicketType
+
+
+# Whether the project has any featured proposals. Returns `None` instead of
+# a boolean if the project does not have any proposal.
+# pylint: disable=protected-access
+Project._has_featured_proposals = sa_orm.column_property(
+    sa.exists()
+    .where(Proposal.project_id == Project.id)
+    .where(Proposal.featured.is_(True))
+    .correlate_except(Proposal),
+    deferred=True,
+)
+# pylint: enable=protected-access
+
+
+# Project schedule column expressions. Guide:
+# https://docs.sqlalchemy.org/en/13/orm/mapped_sql_expr.html#using-column-property
+Project.schedule_start_at = with_roles(
+    sa_orm.column_property(
+        sa.select(sa.func.min(Session.start_at))
+        .where(Session.start_at.is_not(None))
+        .where(Session.project_id == Project.id)
+        .correlate_except(Session)
+        .scalar_subquery()
+    ),
+    read={'all'},
+    datasets={'primary', 'without_parent'},
+)
+
+Project.next_session_at = with_roles(
+    sa_orm.column_property(
+        sa.select(sa.func.min(sa.column('start_at')))
+        .select_from(
+            sa.select(sa.func.min(Session.start_at).label('start_at'))
+            .where(Session.start_at.is_not(None))
+            .where(Session.start_at >= sa.func.utcnow())
+            .where(Session.project_id == Project.id)
+            .correlate_except(Session)
+            .union(
+                sa.select(Project.start_at.label('start_at'))
+                .where(Project.start_at.is_not(None))
+                .where(Project.start_at >= sa.func.utcnow())
+                .correlate(Project)
+            )
+            .subquery()
+        )
+        .scalar_subquery()
+    ),
+    read={'all'},
+)
+
+Project.schedule_end_at = with_roles(
+    sa_orm.column_property(
+        sa.select(sa.func.max(Session.end_at))
+        .where(Session.end_at.is_not(None))
+        .where(Session.project_id == Project.id)
+        .correlate_except(Session)
+        .scalar_subquery()
+    ),
+    read={'all'},
+    datasets={'primary', 'without_parent'},
+)
+
+with_roles(
+    Project.active_rsvps,
+    # This has to use a column reference because 'active_rsvps' has a join on Account
+    # and SQLAlchemy will interpret filter_by params to refer to attributes on the last
+    # joined model, not the first
+    grants_via={Rsvp.participant: {'participant', 'project_participant'}},
+)
 
 
 # Tail imports
-# pylint: disable=wrong-import-position
-from .project_membership import ProjectMembership  # isort:skip
-from .venue import Venue  # isort:skip  # skipcq: FLK-E402
+from .comment import SET_TYPE, Commentset
diff --git a/funnel/models/project_membership.py b/funnel/models/project_membership.py
index 07b36f6f2..28097f0af 100644
--- a/funnel/models/project_membership.py
+++ b/funnel/models/project_membership.py
@@ -4,12 +4,10 @@
 
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import DynamicAssociationProxy, immutable, with_roles
+from coaster.sqlalchemy import immutable, with_roles
 
-from . import DynamicMapped, Mapped, Model, backref, declared_attr, relationship, sa
-from .account import Account
-from .helpers import reopen
-from .membership_mixin import ImmutableUserMembershipMixin
+from .base import Mapped, Model, declared_attr, relationship, sa, sa_orm
+from .membership_mixin import ImmutableMembershipMixin
 from .project import Project
 
 __all__ = ['ProjectMembership', 'project_child_role_map', 'project_child_role_set']
@@ -29,13 +27,15 @@
 
 #: ProjectMembership maps project's `account_admin` role to membership's `editor`
 #: role in addition to the recurring role grant map
-project_membership_role_map: dict[str, str | set[str]] = {
+project_membership_role_map: dict[str, set[str]] = {
     'account_admin': {'account_admin', 'editor'}
 }
-project_membership_role_map.update(project_child_role_map)
+project_membership_role_map.update(
+    {k: {v} if isinstance(v, str) else v for k, v in project_child_role_map.items()}
+)
 
 
-class ProjectMembership(ImmutableUserMembershipMixin, Model):
+class ProjectMembership(ImmutableMembershipMixin, Model):
     """Users can be crew members of projects, with specified access rights."""
 
     __tablename__ = 'project_membership'
@@ -60,7 +60,7 @@ class ProjectMembership(ImmutableUserMembershipMixin, Model):
         },
         'project_crew': {
             'read': {
-                'record_type_label',
+                'record_type_enum',
                 'granted_at',
                 'granted_by',
                 'revoked_at',
@@ -103,60 +103,44 @@ class ProjectMembership(ImmutableUserMembershipMixin, Model):
         },
     }
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id', ondelete='CASCADE'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id', ondelete='CASCADE'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(
-            Project,
-            backref=backref(
-                'crew_memberships',
-                lazy='dynamic',
-                cascade='all',
-                passive_deletes=True,
-            ),
-        ),
+        relationship(back_populates='crew_memberships'),
         grants_via={None: project_membership_role_map},
     )
-    parent_id: Mapped[int] = sa.orm.synonym('project_id')
+    parent_id: Mapped[int] = sa_orm.synonym('project_id')
     parent_id_column = 'project_id'
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
 
     # Project crew roles (at least one must be True):
 
     #: Editors can edit all common and editorial details of an event
-    is_editor: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_editor: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: Promoters are responsible for promotion and have write access
     #: to common details plus read access to everything else. Unlike
     #: editors, they cannot edit the schedule
-    is_promoter: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_promoter: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: Ushers help participants find their way around an event and have
     #: the ability to scan badges at the door
-    is_usher: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_usher: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     #: Optional label, indicating the member's role in the project
-    label = immutable(
-        sa.orm.mapped_column(
-            sa.Unicode,
+    label: Mapped[str | None] = immutable(
+        sa_orm.mapped_column(
             sa.CheckConstraint(
                 "label <> ''", name='project_crew_membership_label_check'
-            ),
-            nullable=True,
+            )
         )
     )
 
     @declared_attr.directive
     @classmethod
-    def __table_args__(cls) -> tuple:
+    def __table_args__(cls) -> tuple:  # type: ignore[override]
         """Table arguments."""
         try:
-            args = list(super().__table_args__)  # type: ignore[misc]
+            args = list(super().__table_args__)
         except AttributeError:
             args = []
         kwargs = args.pop(-1) if args and isinstance(args[-1], dict) else None
@@ -185,122 +169,3 @@ def offered_roles(self) -> set[str]:
         if self.is_usher:
             roles.add('usher')
         return roles
-
-
-# Project relationships: all crew, vs specific roles
-@reopen(Project)
-class __Project:
-    active_crew_memberships: DynamicMapped[ProjectMembership] = with_roles(
-        relationship(
-            ProjectMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                ProjectMembership.project_id == Project.id,
-                ProjectMembership.is_active,
-            ),
-            viewonly=True,
-        ),
-        grants_via={'member': {'editor', 'promoter', 'usher', 'participant', 'crew'}},
-    )
-
-    active_editor_memberships: DynamicMapped[ProjectMembership] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.project_id == Project.id,
-            ProjectMembership.is_active,
-            ProjectMembership.is_editor.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    active_promoter_memberships: DynamicMapped[ProjectMembership] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.project_id == Project.id,
-            ProjectMembership.is_active,
-            ProjectMembership.is_promoter.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    active_usher_memberships: DynamicMapped[ProjectMembership] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.project_id == Project.id,
-            ProjectMembership.is_active,
-            ProjectMembership.is_usher.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    crew = DynamicAssociationProxy('active_crew_memberships', 'member')
-    editors = DynamicAssociationProxy('active_editor_memberships', 'member')
-    promoters = DynamicAssociationProxy('active_promoter_memberships', 'member')
-    ushers = DynamicAssociationProxy('active_usher_memberships', 'member')
-
-
-# Similarly for users (add as needs come up)
-@reopen(Account)
-class __Account:
-    # pylint: disable=invalid-unary-operand-type
-
-    # This relationship is only useful to check if the user has ever been a crew member.
-    # Most operations will want to use one of the active membership relationships.
-    projects_as_crew_memberships: DynamicMapped[ProjectMembership] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        foreign_keys=[ProjectMembership.member_id],
-        viewonly=True,
-    )
-
-    # This is used to determine if it is safe to purge the subject's database record
-    projects_as_crew_noninvite_memberships: DynamicMapped[
-        ProjectMembership
-    ] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.member_id == Account.id,
-            ~ProjectMembership.is_invite,
-        ),
-        viewonly=True,
-    )
-    projects_as_crew_active_memberships: DynamicMapped[
-        ProjectMembership
-    ] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.member_id == Account.id,
-            ProjectMembership.is_active,
-        ),
-        viewonly=True,
-    )
-
-    projects_as_crew = DynamicAssociationProxy(
-        'projects_as_crew_active_memberships', 'project'
-    )
-
-    projects_as_editor_active_memberships: DynamicMapped[
-        ProjectMembership
-    ] = relationship(
-        ProjectMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectMembership.member_id == Account.id,
-            ProjectMembership.is_active,
-            ProjectMembership.is_editor.is_(True),
-        ),
-        viewonly=True,
-    )
-
-    projects_as_editor = DynamicAssociationProxy(
-        'projects_as_editor_active_memberships', 'project'
-    )
-
-
-Account.__active_membership_attrs__.add('projects_as_crew_active_memberships')
-Account.__noninvite_membership_attrs__.add('projects_as_crew_noninvite_memberships')
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 1124e3e51..548625fdf 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -4,36 +4,44 @@
 
 from collections.abc import Sequence
 from datetime import datetime as datetime_type
+from typing import TYPE_CHECKING, Any, Self
+
+from werkzeug.utils import cached_property
 
 from baseframe import __
 from baseframe.filters import preview
-from coaster.sqlalchemy import LazyRoleSet, StateManager, with_roles
+from coaster.sqlalchemy import (
+    DynamicAssociationProxy,
+    LazyRoleSet,
+    StateManager,
+    with_roles,
+)
 from coaster.utils import LabeledEnum
 
-from . import (
+from .account import Account
+from .base import (
     BaseMixin,
     BaseScopedIdNameMixin,
+    DynamicMapped,
     Mapped,
     Model,
     Query,
     TSVectorType,
     UuidMixin,
-    backref,
     db,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
-from .comment import SET_TYPE, Commentset
 from .helpers import (
     MarkdownCompositeDocument,
     add_search_trigger,
-    reopen,
     visual_field_delimiter,
 )
+from .label import Label, ProposalLabelProxy, proposal_label
 from .project import Project
 from .project_membership import project_child_role_map
-from .reorder_mixin import ReorderProtoMixin
+from .reorder_mixin import ReorderMixin
 from .video_mixin import VideoMixin
 
 __all__ = ['PROPOSAL_STATE', 'Proposal', 'ProposalSuuidRedirect']
@@ -118,38 +126,26 @@ class PROPOSAL_STATE(LabeledEnum):  # noqa: N801
 # --- Models ------------------------------------------------------------------
 
 
-class Proposal(  # type: ignore[misc]
-    UuidMixin, BaseScopedIdNameMixin, VideoMixin, ReorderProtoMixin, Model
-):
+class Proposal(UuidMixin, BaseScopedIdNameMixin, VideoMixin, ReorderMixin, Model):
     __tablename__ = 'proposal'
 
-    created_by_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False
+    created_by_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False
     )
     created_by: Mapped[Account] = with_roles(
-        relationship(
-            Account,
-            foreign_keys=[created_by_id],
-            backref=backref('created_proposals', cascade='all', lazy='dynamic'),
-        ),
+        relationship(back_populates='created_proposals'),
         grants={'creator', 'participant'},
     )
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(
-            Project,
-            foreign_keys=[project_id],
-            backref=backref(
-                'proposals', cascade='all', lazy='dynamic', order_by='Proposal.url_id'
-            ),
-        ),
+        relationship(back_populates='proposals'),
         grants_via={None: project_child_role_map},
     )
-    parent_id: Mapped[int] = sa.orm.synonym('project_id')
+    parent_id: Mapped[int] = sa_orm.synonym('project_id')
     parent_id_column = 'project_id'
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
 
     #: Reuse the `url_id` column from BaseScopedIdNameMixin as a sorting order column.
     #: `url_id` was a public number on talkfunnel.com, but is private on hasgeek.com.
@@ -159,58 +155,44 @@ class Proposal(  # type: ignore[misc]
     #: to all proposals, including drafts. A user-facing sequence will have gaps.
     #: Should numbering be required in the product, see `Update.number` for a better
     #: implementation.
-    seq: Mapped[int] = sa.orm.synonym('url_id')
+    seq: Mapped[int] = sa_orm.synonym('url_id')
 
     # TODO: Stand-in for `submitted_at` until proposals have a workflow-driven datetime
-    datetime: Mapped[datetime_type] = sa.orm.synonym('created_at')
+    datetime: Mapped[datetime_type] = sa_orm.synonym('created_at')
 
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
-        sa.Integer,
-        StateManager.check_constraint('state', PROPOSAL_STATE),
+        StateManager.check_constraint('state', PROPOSAL_STATE, sa.Integer),
         default=PROPOSAL_STATE.SUBMITTED,
         nullable=False,
     )
-    state = StateManager('_state', PROPOSAL_STATE, doc="Current state of the proposal")
+    state = StateManager['Proposal'](
+        '_state', PROPOSAL_STATE, doc="Current state of the proposal"
+    )
 
-    commentset_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('commentset.id'), nullable=False
+    commentset_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('commentset.id'), default=None, nullable=False
     )
     commentset: Mapped[Commentset] = relationship(
-        Commentset,
-        uselist=False,
-        lazy='joined',
-        cascade='all',
-        single_parent=True,
-        back_populates='proposal',
+        uselist=False, lazy='joined', single_parent=True, back_populates='proposal'
     )
 
     body, body_text, body_html = MarkdownCompositeDocument.create(
         'body', nullable=False, default=''
     )
-    description: Mapped[str] = sa.orm.mapped_column(
-        sa.Unicode, nullable=False, default=''
-    )
-    custom_description: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
-    template: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
-    featured: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    description: Mapped[str] = sa_orm.mapped_column(default='')
+    custom_description: Mapped[bool] = sa_orm.mapped_column(default=False)
+    template: Mapped[bool] = sa_orm.mapped_column(default=False)
+    featured: Mapped[bool] = sa_orm.mapped_column(default=False)
 
-    edited_at: Mapped[datetime_type | None] = sa.orm.mapped_column(
+    edited_at: Mapped[datetime_type | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True
     )
 
     #: Revision number maintained by SQLAlchemy, starting at 1
-    revisionid: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=False), read={'all'}
-    )
+    revisionid: Mapped[int] = with_roles(sa_orm.mapped_column(), read={'all'})
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'title',
             'description',
@@ -231,6 +213,54 @@ class Proposal(  # type: ignore[misc]
         deferred=True,
     )
 
+    #: For reading and setting labels from the edit form
+    formlabels = ProposalLabelProxy()
+
+    labels: Mapped[list[Label]] = with_roles(
+        relationship(Label, secondary=proposal_label, back_populates='proposals'),
+        read={'all'},
+    )
+
+    all_memberships: DynamicMapped[ProposalMembership] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='proposal'
+    )
+
+    # This relationship does not use `lazy='dynamic'` because it is expected to contain
+    # <2 records on average, and won't exceed 50 in the most extreme cases
+    memberships: Mapped[list[ProposalMembership]] = with_roles(
+        relationship(
+            primaryjoin=lambda: sa.and_(
+                ProposalMembership.proposal_id == Proposal.id,
+                ProposalMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ),
+            order_by=lambda: ProposalMembership.seq,
+            viewonly=True,
+        ),
+        read={'all'},
+        # These grants are authoritative and used instead of `offered_roles` above
+        grants_via={'member': {'submitter', 'editor'}},
+    )
+
+    session: Mapped[Session | None] = relationship(
+        uselist=False, back_populates='proposal'
+    )
+
+    all_sponsor_memberships: DynamicMapped[ProposalSponsorMembership] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='proposal'
+    )
+    sponsor_memberships: DynamicMapped[ProposalSponsorMembership] = with_roles(
+        relationship(
+            lazy='dynamic',
+            primaryjoin=lambda: sa.and_(
+                ProposalSponsorMembership.proposal_id == Proposal.id,
+                ProposalSponsorMembership.is_active,  # type: ignore[has-type]  # FIXME
+            ),
+            order_by=lambda: ProposalSponsorMembership.seq,
+            viewonly=True,
+        ),
+        read={'all'},
+    )
+
     __table_args__ = (
         sa.UniqueConstraint(
             'project_id', 'url_id', name='proposal_project_id_url_id_key'
@@ -291,7 +321,7 @@ class Proposal(  # type: ignore[misc]
         'related': {'urls', 'uuid_b58', 'url_name_uuid_b58', 'title'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.commentset = Commentset(settype=SET_TYPE.PROPOSAL)
         # Assume self.created_by is set. Fail if not.
@@ -314,7 +344,7 @@ def __str__(self) -> str:
     def __format__(self, format_spec: str) -> str:
         if not format_spec:
             return self.title
-        return self.title.__format__(format_spec)
+        return format(self.title, format_spec)
 
     # State transitions
     state.add_conditional_state(
@@ -332,7 +362,7 @@ def __format__(self, format_spec: str) -> str:
         message=__("This proposal has been withdrawn"),
         type='danger',
     )
-    def withdraw(self):
+    def withdraw(self) -> None:
         pass
 
     @with_roles(call={'creator'})  # skipcq: PTC-W0049
@@ -343,7 +373,7 @@ def withdraw(self):
         message=__("This proposal has been submitted"),
         type='success',
     )
-    def submit(self):
+    def submit(self) -> None:
         pass
 
     # TODO: remove project_editor once ProposalMembership UI
@@ -356,7 +386,7 @@ def submit(self):
         message=__("This proposal has been submitted"),
         type='danger',
     )
-    def undo_to_submitted(self):
+    def undo_to_submitted(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -367,7 +397,7 @@ def undo_to_submitted(self):
         message=__("This proposal has been confirmed"),
         type='success',
     )
-    def confirm(self):
+    def confirm(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -378,7 +408,7 @@ def confirm(self):
         message=__("This proposal is no longer confirmed"),
         type='danger',
     )
-    def unconfirm(self):
+    def unconfirm(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -389,7 +419,7 @@ def unconfirm(self):
         message=__("This proposal has been waitlisted"),
         type='primary',
     )
-    def waitlist(self):
+    def waitlist(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -400,7 +430,7 @@ def waitlist(self):
         message=__("This proposal has been rejected"),
         type='danger',
     )
-    def reject(self):
+    def reject(self) -> None:
         pass
 
     @with_roles(call={'creator'})  # skipcq: PTC-W0049
@@ -411,7 +441,7 @@ def reject(self):
         message=__("This proposal has been cancelled"),
         type='danger',
     )
-    def cancel(self):
+    def cancel(self) -> None:
         pass
 
     @with_roles(call={'creator'})  # skipcq: PTC-W0049
@@ -422,7 +452,7 @@ def cancel(self):
         message=__("This proposal’s cancellation has been reversed"),
         type='success',
     )
-    def undo_cancel(self):
+    def undo_cancel(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -433,7 +463,7 @@ def undo_cancel(self):
         message=__("Awaiting details for this proposal"),
         type='primary',
     )
-    def awaiting_details(self):
+    def awaiting_details(self) -> None:
         pass
 
     @with_roles(call={'project_editor'})  # skipcq: PTC-W0049
@@ -444,7 +474,7 @@ def awaiting_details(self):
         message=__("This proposal has been put under evaluation"),
         type='success',
     )
-    def under_evaluation(self):
+    def under_evaluation(self) -> None:
         pass
 
     @with_roles(call={'creator'})  # skipcq: PTC-W0049
@@ -455,15 +485,24 @@ def under_evaluation(self):
         message=__("This proposal has been deleted"),
         type='danger',
     )
-    def delete(self):
+    def delete(self) -> None:
         pass
 
+    @property
+    def first_user(self) -> Account:
+        """Return the first credited member on the proposal, or creator if none."""
+        for membership in self.memberships:
+            if not membership.is_uncredited:
+                return membership.member
+        return self.created_by
+
     @with_roles(call={'project_editor'})
     def move_to(self, project: Project) -> None:
         """Move to a new project and reset :attr:`url_id`."""
         self.project = project
-        self.url_id = None  # pylint: disable=attribute-defined-outside-init
-        self.make_id()
+        # pylint: disable=attribute-defined-outside-init
+        self.url_id = None
+        self.make_scoped_id()
 
     def update_description(self) -> None:
         if not self.custom_description:
@@ -489,6 +528,13 @@ def getprev(self) -> Proposal | None:
             .first()
         )
 
+    @with_roles(read={'all'})
+    @cached_property
+    def has_sponsors(self) -> bool:
+        return db.session.query(self.sponsor_memberships.exists()).scalar()
+
+    sponsors = DynamicAssociationProxy[Account]('sponsor_memberships', 'member')
+
     def roles_for(
         self, actor: Account | None = None, anchors: Sequence = ()
     ) -> LazyRoleSet:
@@ -506,7 +552,7 @@ def roles_for(
         return roles
 
     @classmethod
-    def all_public(cls) -> Query[Proposal]:
+    def all_public(cls) -> Query[Self]:
         return cls.query.join(Project).filter(Project.state.PUBLISHED, cls.state.PUBLIC)
 
     @classmethod
@@ -520,89 +566,24 @@ def get(  # type: ignore[override]  # pylint: disable=arguments-differ
 add_search_trigger(Proposal, 'search_vector')
 
 
-class ProposalSuuidRedirect(BaseMixin, Model):
+class ProposalSuuidRedirect(BaseMixin[int, Account], Model):
     """Holds Proposal SUUIDs from before when they were deprecated."""
 
     __tablename__ = 'proposal_suuid_redirect'
 
-    suuid: Mapped[str] = sa.orm.mapped_column(
+    suuid: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(22), nullable=False, index=True
     )
-    proposal_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False
-    )
-    proposal: Mapped[Proposal] = relationship(Proposal)
-
-
-@reopen(Commentset)
-class __Commentset:
-    proposal: Mapped[Proposal] = relationship(
-        Proposal, uselist=False, back_populates='commentset'
+    proposal_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('proposal.id', ondelete='CASCADE'), default=None, nullable=False
     )
-
-
-@reopen(Project)
-class __Project:
-    @property
-    def proposals_all(self):
-        if self.subprojects:
-            return Proposal.query.filter(
-                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
-            )
-        return self.proposals
-
-    @property
-    def proposals_by_state(self):
-        if self.subprojects:
-            basequery = Proposal.query.filter(
-                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
-            )
-        else:
-            basequery = Proposal.query.filter_by(project=self)
-        return Proposal.state.group(
-            basequery.filter(
-                ~(Proposal.state.DRAFT), ~(Proposal.state.DELETED)
-            ).order_by(sa.desc('created_at'))
-        )
-
-    @property
-    def proposals_by_confirmation(self):
-        if self.subprojects:
-            basequery = Proposal.query.filter(
-                Proposal.project_id.in_([self.id] + [s.id for s in self.subprojects])
-            )
-        else:
-            basequery = Proposal.query.filter_by(project=self)
-        return {
-            'confirmed': basequery.filter(Proposal.state.CONFIRMED)
-            .order_by(sa.desc('created_at'))
-            .all(),
-            'unconfirmed': basequery.filter(
-                ~(Proposal.state.CONFIRMED),
-                ~(Proposal.state.DRAFT),
-                ~(Proposal.state.DELETED),
-            )
-            .order_by(sa.desc('created_at'))
-            .all(),
-        }
-
-    # Whether the project has any featured proposals. Returns `None` instead of
-    # a boolean if the project does not have any proposal.
-    _has_featured_proposals: Mapped[bool | None] = sa.orm.column_property(
-        sa.exists()
-        .where(Proposal.project_id == Project.id)
-        .where(Proposal.featured.is_(True))
-        .correlate_except(Proposal),
-        deferred=True,
-    )
-
-    @property
-    def has_featured_proposals(self) -> bool:
-        return bool(self._has_featured_proposals)
-
-    with_roles(has_featured_proposals, read={'all'})
+    proposal: Mapped[Proposal] = relationship()
 
 
 # Tail imports
-# pylint: disable=wrong-import-position
-from .proposal_membership import ProposalMembership  # isort:skip
+from .comment import SET_TYPE, Commentset
+from .proposal_membership import ProposalMembership
+from .sponsor_membership import ProposalSponsorMembership
+
+if TYPE_CHECKING:
+    from .session import Session
diff --git a/funnel/models/proposal_membership.py b/funnel/models/proposal_membership.py
index fba987e46..a3b0ca86d 100644
--- a/funnel/models/proposal_membership.py
+++ b/funnel/models/proposal_membership.py
@@ -2,30 +2,20 @@
 
 from __future__ import annotations
 
+from typing import ClassVar
+
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import DynamicAssociationProxy, immutable, with_roles
-
-from . import DynamicMapped, Mapped, Model, backref, relationship, sa
-from .account import Account
-from .helpers import reopen
-from .membership_mixin import (
-    FrozenAttributionProtoMixin,
-    ImmutableUserMembershipMixin,
-    ReorderMembershipProtoMixin,
-)
-from .project import Project
+from coaster.sqlalchemy import immutable, with_roles
+
+from .base import Mapped, Model, relationship, sa, sa_orm
+from .membership_mixin import FrozenAttributionMixin, ReorderMembershipMixin
 from .proposal import Proposal
 
 __all__ = ['ProposalMembership']
 
 
-class ProposalMembership(  # type: ignore[misc]
-    ImmutableUserMembershipMixin,
-    FrozenAttributionProtoMixin,
-    ReorderMembershipProtoMixin,
-    Model,
-):
+class ProposalMembership(FrozenAttributionMixin, ReorderMembershipMixin, Model):
     """Users can be presenters or reviewers on proposals."""
 
     __tablename__ = 'proposal_membership'
@@ -75,47 +65,35 @@ class ProposalMembership(  # type: ignore[misc]
         },
     }
 
-    revoke_on_member_delete = False
+    revoke_on_member_delete: ClassVar[bool] = False
 
     proposal_id: Mapped[int] = with_roles(
-        sa.orm.mapped_column(
-            sa.Integer,
+        sa_orm.mapped_column(
             sa.ForeignKey('proposal.id', ondelete='CASCADE'),
+            default=None,
             nullable=False,
         ),
         read={'member', 'editor'},
     )
 
     proposal: Mapped[Proposal] = with_roles(
-        relationship(
-            Proposal,
-            backref=backref(
-                'all_memberships',
-                lazy='dynamic',
-                cascade='all',
-                passive_deletes=True,
-            ),
-        ),
+        relationship(back_populates='all_memberships'),
         read={'member', 'editor'},
         grants_via={None: {'editor'}},
     )
-    parent_id: Mapped[int] = sa.orm.synonym('proposal_id')
+    parent_id: Mapped[int] = sa_orm.synonym('proposal_id')
     parent_id_column = 'proposal_id'
-    parent: Mapped[Proposal] = sa.orm.synonym('proposal')
+    parent: Mapped[Proposal] = sa_orm.synonym('proposal')
 
     #: Uncredited members are not listed in the main display, but can edit and may be
     #: listed in a details section. Uncredited memberships are for support roles such
     #: as copy editors.
-    is_uncredited: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_uncredited: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     #: Optional label, indicating the member's role on the proposal
-    label = immutable(
-        sa.orm.mapped_column(
-            sa.Unicode,
-            sa.CheckConstraint("label <> ''", name='proposal_membership_label_check'),
-            nullable=True,
+    label: Mapped[str | None] = immutable(
+        sa_orm.mapped_column(
+            sa.CheckConstraint("label <> ''", name='proposal_membership_label_check')
         )
     )
 
@@ -124,88 +102,3 @@ def offered_roles(self) -> set[str]:
         """Roles offered by this membership record."""
         # This method is not used. See the `Proposal.memberships` relationship below.
         return {'submitter', 'editor'}
-
-
-# Project relationships
-@reopen(Proposal)
-class __Proposal:
-    created_by: Account
-
-    # This relationship does not use `lazy='dynamic'` because it is expected to contain
-    # <2 records on average, and won't exceed 50 in the most extreme cases
-    memberships: Mapped[list[ProposalMembership]] = with_roles(
-        relationship(
-            ProposalMembership,
-            primaryjoin=sa.and_(
-                ProposalMembership.proposal_id == Proposal.id,
-                ProposalMembership.is_active,
-            ),
-            order_by=ProposalMembership.seq,
-            viewonly=True,
-        ),
-        read={'all'},
-        # These grants are authoritative and used instead of `offered_roles` above
-        grants_via={'member': {'submitter', 'editor'}},
-    )
-
-    @property
-    def first_user(self) -> Account:
-        """Return the first credited member on the proposal, or creator if none."""
-        for membership in self.memberships:
-            if not membership.is_uncredited:
-                return membership.member
-        return self.created_by
-
-
-@reopen(Account)
-class __Account:
-    # pylint: disable=invalid-unary-operand-type
-
-    all_proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
-        ProposalMembership,
-        lazy='dynamic',
-        foreign_keys=[ProposalMembership.member_id],
-        viewonly=True,
-    )
-
-    noninvite_proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
-        ProposalMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProposalMembership.member_id == Account.id,
-            ~ProposalMembership.is_invite,
-        ),
-        viewonly=True,
-    )
-
-    proposal_memberships: DynamicMapped[ProposalMembership] = relationship(
-        ProposalMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProposalMembership.member_id == Account.id,
-            ProposalMembership.is_active,
-        ),
-        viewonly=True,
-    )
-
-    proposals = DynamicAssociationProxy('proposal_memberships', 'proposal')
-
-    @property
-    def public_proposal_memberships(self):
-        """Query for all proposal memberships to proposals that are public."""
-        return (
-            self.proposal_memberships.join(Proposal, ProposalMembership.proposal)
-            .join(Project, Proposal.project)
-            .filter(
-                ProposalMembership.is_uncredited.is_(False),
-                # TODO: Include proposal state filter (pending proposal workflow fix)
-            )
-        )
-
-    public_proposals = DynamicAssociationProxy(
-        'public_proposal_memberships', 'proposal'
-    )
-
-
-Account.__active_membership_attrs__.add('proposal_memberships')
-Account.__noninvite_membership_attrs__.add('noninvite_proposal_memberships')
diff --git a/funnel/models/reorder_mixin.py b/funnel/models/reorder_mixin.py
index 1453252ce..e8fc0df99 100644
--- a/funnel/models/reorder_mixin.py
+++ b/funnel/models/reorder_mixin.py
@@ -2,42 +2,43 @@
 
 from __future__ import annotations
 
-from datetime import datetime
-from typing import TYPE_CHECKING, ClassVar, TypeVar
-from uuid import UUID
+from typing import Any, Protocol, TypeVar
 
-from . import Mapped, QueryProperty, db, declarative_mixin, sa
+from .base import Mapped, db, declarative_mixin, sa, sa_orm
+from .typing import ModelIdProtocol
 
-__all__ = ['ReorderProtoMixin']
+__all__ = ['ReorderMixin']
 
 
 # Use of TypeVar for subclasses of ReorderMixin as defined in these mypy tickets:
 # https://github.com/python/mypy/issues/1212
 # https://github.com/python/mypy/issues/7191
-Reorderable = TypeVar('Reorderable', bound='ReorderProtoMixin')
+
+
+class ReorderSubclassProtocol(ModelIdProtocol, Protocol):
+    parent_id: Mapped[Any]
+    parent: Mapped[Any]
+    seq: Mapped[Any]
+
+    @property
+    def parent_scoped_reorder_query_filter(self) -> sa.ColumnElement[bool]:
+        ...
+
+    def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
+        ...
+
+
+Reorderable = TypeVar('Reorderable', bound='ReorderSubclassProtocol')
 
 
 @declarative_mixin
-class ReorderProtoMixin:
+class ReorderMixin:
     """Adds support for re-ordering sequences within a parent container."""
 
-    if TYPE_CHECKING:
-        #: Subclasses must have a created_at column
-        created_at: Mapped[datetime]
-        #: Subclass must have a primary key that is int or uuid
-        id: Mapped[int | UUID]  # noqa: A001
-        #: Subclass must declare a parent_id synonym to the parent model fkey column
-        parent_id: Mapped[int | UUID]
-        #: Subclass must declare a seq column or synonym, holding a sequence id. It
-        #: need not be unique, but reordering is meaningless when both items have the
-        #: same number
-        seq: Mapped[int]
-
-        #: Subclass must offer a SQLAlchemy query (this is standard from base classes)
-        query: ClassVar[QueryProperty]
-
     @property
-    def parent_scoped_reorder_query_filter(self: Reorderable) -> sa.ColumnElement[bool]:
+    def parent_scoped_reorder_query_filter(
+        self: ReorderSubclassProtocol,
+    ) -> sa.ColumnElement[bool]:
         """
         Return a query filter that includes a scope limitation to the parent.
 
@@ -81,14 +82,15 @@ def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
                 cls.seq >= min(self.seq, other.seq),
                 cls.seq <= max(self.seq, other.seq),
             )
+            .populate_existing()  # Force reload `.seq` into session cache
             .with_for_update(of=cls)  # Lock these rows to prevent a parallel update
-            .options(sa.orm.load_only(cls.id, cls.seq))
+            .options(sa_orm.load_only(cls.id_, cls.seq))
             .order_by(*order_columns)
             .all()
         )
 
         # Pop-off items that share a sequence number and don't need to be moved
-        while items_to_reorder[0].id != self.id:
+        while items_to_reorder[0].id_ != self.id_:
             items_to_reorder.pop(0)
 
         # Reordering! Move down the list (reversed if `before`), reassigning numbers.
@@ -100,14 +102,12 @@ def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
 
         new_seq_number = self.seq
         # Temporarily give self an out-of-bounds number
-        self.seq = (
-            sa.select(  # type: ignore[assignment]
-                sa.func.coalesce(sa.func.max(cls.seq) + 1, 1)
-            )
+        self.seq: Mapped[int] = (
+            sa.select(sa.func.coalesce(sa.func.max(cls.seq) + 1, 1))
             .where(self.parent_scoped_reorder_query_filter)
             .scalar_subquery()
         )
-        # Flush it so the db doesn't complain when there's a unique constraint
+        # Flush it so the db does not complain when there's a unique constraint
         db.session.flush()
         # Reassign all remaining sequence numbers
         for reorderable_item in items_to_reorder[1:]:  # Skip 0, which is self
@@ -116,7 +116,7 @@ def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
             # of SQLAlchemy 2.0.x. Should that behaviour change, a switch to
             # bulk_update_mappings will be required
             db.session.flush()
-            if reorderable_item.id == other.id:
+            if reorderable_item.id_ == other.id_:
                 # Don't bother reordering anything after `other`
                 break
         # Assign other's previous sequence number to self
diff --git a/funnel/models/rsvp.py b/funnel/models/rsvp.py
index 66026e9a5..6a6459a42 100644
--- a/funnel/models/rsvp.py
+++ b/funnel/models/rsvp.py
@@ -2,33 +2,33 @@
 
 from __future__ import annotations
 
-from typing import Literal, cast, overload
+from dataclasses import dataclass
+from enum import ReprEnum
+from typing import TYPE_CHECKING, Any, Literal, Self, overload
 
 from flask import current_app
-from werkzeug.utils import cached_property
 
 from baseframe import __
 from coaster.sqlalchemy import StateManager, with_roles
-from coaster.utils import LabeledEnum
+from coaster.utils import DataclassFromType, LabeledEnum
 
-from . import (
+from . import types
+from .account import Account, AccountEmail, AccountEmailClaim, AccountPhone
+from .base import (
     Mapped,
     Model,
     NoIdMixin,
-    Query,
     UuidMixin,
-    backref,
     db,
+    declared_attr,
     relationship,
     sa,
-    types,
+    sa_orm,
 )
-from .account import Account, AccountEmail, AccountEmailClaim, AccountPhone
-from .helpers import reopen
 from .project import Project
 from .project_membership import project_child_role_map
 
-__all__ = ['Rsvp', 'RSVP_STATUS']
+__all__ = ['RSVP_STATUS', 'RsvpStateEnum', 'Rsvp']
 
 
 class RSVP_STATUS(LabeledEnum):  # noqa: N801
@@ -40,52 +40,71 @@ class RSVP_STATUS(LabeledEnum):  # noqa: N801
     AWAITING = ('A', 'awaiting', __("Awaiting"))
 
 
+@dataclass(frozen=True)
+class _RsvpOptions(DataclassFromType, str):
+    """RSVP options."""
+
+    # The empty default is required for Mypy's enum plugin's `Enum.__call__` analysis
+    response: str = ''
+    label: str = ''
+
+
+class RsvpStateEnum(_RsvpOptions, ReprEnum):
+    YES = 'Y', __("Yes"), __("Going")
+    NO = 'N', __("No"), __("Not going")
+    MAYBE = 'M', __("Maybe"), __("Maybe")
+    AWAITING = 'A', __("Invite"), __("Awaiting")
+
+
 class Rsvp(UuidMixin, NoIdMixin, Model):
     __tablename__ = 'rsvp'
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False, primary_key=True
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False, primary_key=True
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, backref=backref('rsvps', cascade='all', lazy='dynamic')),
+        relationship(back_populates='rsvps'),
         read={'owner', 'project_promoter'},
         grants_via={None: project_child_role_map},
         datasets={'primary'},
     )
-    participant_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False, primary_key=True
+    participant_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False, primary_key=True
     )
     participant: Mapped[Account] = with_roles(
-        relationship(Account, backref=backref('rsvps', cascade='all', lazy='dynamic')),
+        relationship(back_populates='rsvps'),
         read={'owner', 'project_promoter'},
         grants={'owner'},
         datasets={'primary', 'without_parent'},
     )
     form: Mapped[types.jsonb | None] = with_roles(
-        sa.orm.mapped_column(),
+        sa_orm.mapped_column(),
         rw={'owner'},
         read={'project_promoter'},
         datasets={'primary', 'without_parent', 'related'},
     )
 
-    _state: Mapped[str] = sa.orm.mapped_column(
+    _state: Mapped[str] = sa_orm.mapped_column(
         'state',
         sa.CHAR(1),
-        StateManager.check_constraint('state', RSVP_STATUS),
-        default=RSVP_STATUS.AWAITING,
+        StateManager.check_constraint('state', RsvpStateEnum, sa.CHAR(1)),
+        default=RsvpStateEnum.AWAITING,
         nullable=False,
     )
     state = with_roles(
-        StateManager('_state', RSVP_STATUS, doc="RSVP answer"),
+        StateManager['Rsvp']('_state', RSVP_STATUS, doc="RSVP answer"),
         call={'owner', 'project_promoter'},
     )
 
+    if TYPE_CHECKING:
+        id_: declared_attr[Any]  # Fake entry for compatibility with ModelUuidProtocol
+
     __roles__ = {
         'owner': {'read': {'created_at', 'updated_at'}},
         'project_promoter': {'read': {'created_at', 'updated_at'}},
     }
 
     @property
-    def response(self):
+    def response(self) -> str:
         """Return RSVP response as a raw value."""
         return self._state
 
@@ -103,7 +122,7 @@ def response(self):
         message=__("Your response has been saved"),
         type='primary',
     )
-    def rsvp_yes(self):
+    def rsvp_yes(self) -> None:
         pass
 
     @with_roles(call={'owner'})
@@ -114,7 +133,7 @@ def rsvp_yes(self):
         message=__("Your response has been saved"),
         type='dark',
     )
-    def rsvp_no(self):
+    def rsvp_no(self) -> None:
         pass
 
     @with_roles(call={'owner'})
@@ -125,7 +144,7 @@ def rsvp_no(self):
         message=__("Your response has been saved"),
         type='accent',
     )
-    def rsvp_maybe(self):
+    def rsvp_maybe(self) -> None:
         pass
 
     @with_roles(call={'owner', 'project_promoter'})
@@ -134,7 +153,7 @@ def participant_email(self) -> AccountEmail | None:
         return self.participant.transport_for_email(self.project.account)
 
     @with_roles(call={'owner', 'project_promoter'})
-    def participant_phone(self) -> AccountEmail | None:
+    def participant_phone(self) -> AccountPhone | None:
         """Participant's preferred phone number for this registration."""
         return self.participant.transport_for_sms(self.project.account)
 
@@ -170,100 +189,31 @@ def migrate_account(cls, old_account: Account, new_account: Account) -> None:
 
     @overload
     @classmethod
-    def get_for(cls, project: Project, user: Account, create: Literal[True]) -> Rsvp:
+    def get_for(cls, project: Project, account: Account, create: Literal[True]) -> Self:
         ...
 
     @overload
     @classmethod
     def get_for(
         cls, project: Project, account: Account, create: Literal[False]
-    ) -> Rsvp | None:
+    ) -> Self | None:
         ...
 
     @overload
     @classmethod
     def get_for(
-        cls, project: Project, account: Account | None, create=False
-    ) -> Rsvp | None:
+        cls, project: Project, account: Account | None, create: bool = False
+    ) -> Self | None:
         ...
 
     @classmethod
     def get_for(
-        cls, project: Project, account: Account | None, create=False
-    ) -> Rsvp | None:
+        cls, project: Project, account: Account | None, create: bool = False
+    ) -> Self | None:
         if account is not None:
-            result = cls.query.get((project.id, account.id))
+            result = db.session.get(cls, (project.id, account.id))
             if not result and create:
                 result = cls(project=project, participant=account)
                 db.session.add(result)
             return result
         return None
-
-
-@reopen(Project)
-class __Project:
-    @property
-    def active_rsvps(self):
-        return self.rsvps.join(Account).filter(Rsvp.state.YES, Account.state.ACTIVE)
-
-    with_roles(
-        active_rsvps,
-        grants_via={Rsvp.participant: {'participant', 'project_participant'}},
-    )
-
-    @overload
-    def rsvp_for(self, account: Account, create: Literal[True]) -> Rsvp:
-        ...
-
-    @overload
-    def rsvp_for(self, account: Account | None, create: Literal[False]) -> Rsvp | None:
-        ...
-
-    def rsvp_for(self, account: Account | None, create=False) -> Rsvp | None:
-        return Rsvp.get_for(cast(Project, self), account, create)
-
-    def rsvps_with(self, status: str):
-        return (
-            cast(Project, self)
-            .rsvps.join(Account)
-            .filter(
-                Account.state.ACTIVE,
-                Rsvp._state == status,  # pylint: disable=protected-access
-            )
-        )
-
-    def rsvp_counts(self) -> dict[str, int]:
-        return dict(
-            db.session.query(
-                Rsvp._state,  # pylint: disable=protected-access
-                sa.func.count(Rsvp._state),  # pylint: disable=protected-access
-            )
-            .join(Account)
-            .filter(Account.state.ACTIVE, Rsvp.project == self)
-            .group_by(Rsvp._state)  # pylint: disable=protected-access
-            .all()
-        )
-
-    @cached_property
-    def rsvp_count_going(self) -> int:
-        return (
-            cast(Project, self)
-            .rsvps.join(Account)
-            .filter(Account.state.ACTIVE, Rsvp.state.YES)
-            .count()
-        )
-
-
-@reopen(Account)
-class __Account:
-    @property
-    def rsvp_followers(self) -> Query[Account]:
-        """All users with an active RSVP in a project."""
-        return (
-            Account.query.filter(Account.state.ACTIVE)
-            .join(Rsvp, Rsvp.participant_id == Account.id)
-            .join(Project, Rsvp.project_id == Project.id)
-            .filter(Rsvp.state.YES, Project.state.PUBLISHED, Project.account == self)
-        )
-
-    with_roles(rsvp_followers, grants={'follower'})
diff --git a/funnel/models/saved.py b/funnel/models/saved.py
index 48c9fb13a..53a30fc91 100644
--- a/funnel/models/saved.py
+++ b/funnel/models/saved.py
@@ -7,9 +7,8 @@
 
 from coaster.sqlalchemy import LazyRoleSet, with_roles
 
-from . import Mapped, Model, NoIdMixin, backref, db, relationship, sa
 from .account import Account
-from .helpers import reopen
+from .base import Mapped, Model, NoIdMixin, db, relationship, sa, sa_orm
 from .project import Project
 from .session import Session
 
@@ -18,44 +17,36 @@ class SavedProject(NoIdMixin, Model):
     __tablename__ = 'saved_project'
 
     #: User account that saved this project
-    account_id: Mapped[int] = sa.orm.mapped_column(
+    account_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('account.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
         primary_key=True,
     )
-    account: Mapped[Account] = relationship(
-        Account,
-        backref=backref('saved_projects', lazy='dynamic', passive_deletes=True),
+    account: Mapped[Account] = with_roles(
+        relationship(back_populates='saved_projects'), grants={'owner'}
     )
     #: Project that was saved
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
+    project_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('project.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
         primary_key=True,
         index=True,
     )
-    project: Mapped[Project] = relationship(
-        Project,
-        backref=backref('saved_by', lazy='dynamic', passive_deletes=True),
-    )
+    project: Mapped[Project] = relationship(back_populates='saves')
     #: Timestamp when the save happened
-    saved_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+    saved_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        insert_default=sa.func.utcnow(),
+        default=None,
     )
     #: User's plaintext note to self on why they saved this (optional)
-    description: Mapped[str | None] = sa.orm.mapped_column(
+    description: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
 
-    def roles_for(
-        self, actor: Account | None = None, anchors: Sequence = ()
-    ) -> LazyRoleSet:
-        roles = super().roles_for(actor, anchors)
-        if actor is not None and actor == self.account:
-            roles.add('owner')
-        return roles
-
     @classmethod
     def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         """Migrate one account's data to another when merging accounts."""
@@ -71,33 +62,31 @@ class SavedSession(NoIdMixin, Model):
     __tablename__ = 'saved_session'
 
     #: User account that saved this session
-    account_id: Mapped[int] = sa.orm.mapped_column(
+    account_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('account.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
         primary_key=True,
     )
-    account: Mapped[Account] = relationship(
-        Account,
-        backref=backref('saved_sessions', lazy='dynamic', passive_deletes=True),
-    )
+    account: Mapped[Account] = relationship(back_populates='saved_sessions')
     #: Session that was saved
-    session_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer,
+    session_id: Mapped[int] = sa_orm.mapped_column(
         sa.ForeignKey('session.id', ondelete='CASCADE'),
+        default=None,
         nullable=False,
         primary_key=True,
         index=True,
     )
-    session: Mapped[Session] = relationship(
-        Session,
-        backref=backref('saved_by', lazy='dynamic', passive_deletes=True),
-    )
+    session: Mapped[Session] = relationship(back_populates='saves')
     #: Timestamp when the save happened
-    saved_at: Mapped[datetime] = sa.orm.mapped_column(
-        sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.utcnow()
+    saved_at: Mapped[datetime] = sa_orm.mapped_column(
+        sa.TIMESTAMP(timezone=True),
+        nullable=False,
+        insert_default=sa.func.utcnow(),
+        default=None,
     )
     #: User's plaintext note to self on why they saved this (optional)
-    description: Mapped[str | None] = sa.orm.mapped_column(
+    description: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
 
@@ -112,26 +101,11 @@ def roles_for(
     @classmethod
     def migrate_account(cls, old_account: Account, new_account: Account) -> None:
         """Migrate one account's data to another when merging accounts."""
-        project_ids = {ss.project_id for ss in new_account.saved_sessions}
+        session_ids = {ss.session_id for ss in new_account.saved_sessions}
         for ss in old_account.saved_sessions:
-            if ss.project_id not in project_ids:
+            if ss.session_id not in session_ids:
                 ss.account = new_account
             else:
                 # TODO: `if ss.description`, don't discard, but add it to existing's
                 # description
                 db.session.delete(ss)
-
-
-@reopen(Account)
-class __Account:
-    def saved_sessions_in(self, project):
-        return self.saved_sessions.join(Session).filter(Session.project == project)
-
-
-@reopen(Project)
-class __Project:
-    @with_roles(call={'all'})
-    def is_saved_by(self, account: Account) -> bool:
-        return (
-            account is not None and self.saved_by.filter_by(account=account).notempty()
-        )
diff --git a/funnel/models/session.py b/funnel/models/session.py
index 1d1b9fdf1..4b775d5a7 100644
--- a/funnel/models/session.py
+++ b/funnel/models/session.py
@@ -2,19 +2,16 @@
 
 from __future__ import annotations
 
-from collections import OrderedDict, defaultdict
 from datetime import datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Self
 
-from flask_babel import format_date, get_locale
-from isoweek import Week
 from werkzeug.utils import cached_property
 
 from baseframe import localize_timezone
 from coaster.sqlalchemy import with_roles
-from coaster.utils import utcnow
 
-from . import (
+from .account import Account
+from .base import (
     BaseScopedIdNameMixin,
     DynamicMapped,
     Mapped,
@@ -22,83 +19,68 @@
     Query,
     TSVectorType,
     UuidMixin,
-    backref,
     db,
     hybrid_property,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
 from .helpers import (
     ImgeeType,
     MarkdownCompositeDocument,
     add_search_trigger,
-    reopen,
     visual_field_delimiter,
 )
 from .project import Project
 from .project_membership import project_child_role_map
 from .proposal import Proposal
-from .venue import VenueRoom
 from .video_mixin import VideoMixin
 
 __all__ = ['Session']
 
 
-class Session(UuidMixin, BaseScopedIdNameMixin, VideoMixin, Model):
+class Session(UuidMixin, BaseScopedIdNameMixin[int, Account], VideoMixin, Model):
     __tablename__ = 'session'
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(
-            Project, backref=backref('sessions', cascade='all', lazy='dynamic')
-        ),
+        relationship(back_populates='sessions'),
         grants_via={None: project_child_role_map},
     )
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
     description, description_text, description_html = MarkdownCompositeDocument.create(
         'description', default='', nullable=False
     )
-    proposal_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('proposal.id'), nullable=True, unique=True
-    )
-    proposal: Mapped[Proposal | None] = relationship(
-        Proposal, backref=backref('session', uselist=False, cascade='all')
+    proposal_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('proposal.id'), default=None, nullable=True, unique=True
     )
-    speaker: Mapped[str | None] = sa.orm.mapped_column(
+    proposal: Mapped[Proposal | None] = relationship(back_populates='session')
+    speaker: Mapped[str | None] = sa_orm.mapped_column(
         sa.Unicode(200), default=None, nullable=True
     )
-    start_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    start_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
-    end_at: Mapped[datetime | None] = sa.orm.mapped_column(
+    end_at: Mapped[datetime | None] = sa_orm.mapped_column(
         sa.TIMESTAMP(timezone=True), nullable=True, index=True
     )
-    venue_room_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('venue_room.id'), nullable=True
-    )
-    venue_room: Mapped[VenueRoom | None] = relationship(VenueRoom, backref='sessions')
-    is_break: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=False, nullable=False
+    venue_room_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('venue_room.id'), default=None, nullable=True
     )
-    featured: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=False, nullable=False
-    )
-    is_restricted_video: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=False, nullable=False
-    )
-    banner_image_url: Mapped[str | None] = sa.orm.mapped_column(
+    venue_room: Mapped[VenueRoom | None] = relationship(back_populates='sessions')
+    is_break: Mapped[bool] = sa_orm.mapped_column(default=False)
+    featured: Mapped[bool] = sa_orm.mapped_column(default=False)
+    is_restricted_video: Mapped[bool] = sa_orm.mapped_column(default=False)
+    banner_image_url: Mapped[str | None] = sa_orm.mapped_column(
         ImgeeType, nullable=True
     )
 
     #: Version number maintained by SQLAlchemy, used for vCal files, starting at 1
-    revisionid: Mapped[int] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=False), read={'all'}
-    )
+    revisionid: Mapped[int] = with_roles(sa_orm.mapped_column(), read={'all'})
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'title',
             'description_text',
@@ -120,6 +102,10 @@ class Session(UuidMixin, BaseScopedIdNameMixin, VideoMixin, Model):
         deferred=True,
     )
 
+    saves: DynamicMapped[SavedSession] = relationship(
+        lazy='dynamic', passive_deletes=True, back_populates='session'
+    )
+
     __table_args__ = (
         sa.UniqueConstraint('project_id', 'url_id'),
         sa.CheckConstraint(
@@ -129,7 +115,7 @@ class Session(UuidMixin, BaseScopedIdNameMixin, VideoMixin, Model):
                     start_at.is_not(None),
                     end_at.is_not(None),
                     end_at > start_at,
-                    end_at <= start_at + sa.text("INTERVAL '1 day'"),
+                    end_at <= start_at + timedelta(days=1),
                 ),
             ),
             'session_start_at_end_at_check',
@@ -237,7 +223,7 @@ def _scheduled_expression(cls) -> sa.ColumnElement[bool]:
     def start_at_localized(self) -> datetime | None:
         return (
             localize_timezone(self.start_at, tz=self.project.timezone)
-            if self.start_at
+            if self.start_at is not None
             else None
         )
 
@@ -245,7 +231,7 @@ def start_at_localized(self) -> datetime | None:
     def end_at_localized(self) -> datetime | None:
         return (
             localize_timezone(self.end_at, tz=self.project.timezone)
-            if self.end_at
+            if self.end_at is not None
             else None
         )
 
@@ -285,434 +271,15 @@ def make_unscheduled(self) -> None:
         self.end_at = None
 
     @classmethod
-    def all_public(cls) -> Query[Session]:
+    def all_public(cls) -> Query[Self]:
         return cls.query.join(Project).filter(Project.state.PUBLISHED, cls.scheduled)
 
 
 add_search_trigger(Session, 'search_vector')
 
 
-@reopen(VenueRoom)
-class __VenueRoom:
-    scheduled_sessions: Mapped[list[Session]] = relationship(
-        Session,
-        primaryjoin=sa.and_(
-            Session.venue_room_id == VenueRoom.id,
-            Session.scheduled,
-        ),
-        viewonly=True,
-    )
-
-
-@reopen(Project)
-class __Project:
-    # Project schedule column expressions. Guide:
-    # https://docs.sqlalchemy.org/en/13/orm/mapped_sql_expr.html#using-column-property
-    schedule_start_at: Mapped[datetime | None] = with_roles(
-        sa.orm.column_property(
-            sa.select(sa.func.min(Session.start_at))
-            .where(Session.start_at.is_not(None))
-            .where(Session.project_id == Project.id)
-            .correlate_except(Session)
-            .scalar_subquery()
-        ),
-        read={'all'},
-        datasets={'primary', 'without_parent'},
-    )
-
-    next_session_at: Mapped[datetime | None] = with_roles(
-        sa.orm.column_property(
-            sa.select(sa.func.min(sa.column('start_at')))
-            .select_from(
-                sa.select(sa.func.min(Session.start_at).label('start_at'))
-                .where(Session.start_at.is_not(None))
-                .where(Session.start_at >= sa.func.utcnow())
-                .where(Session.project_id == Project.id)
-                .correlate_except(Session)  # type: ignore[arg-type]
-                .union(
-                    sa.select(
-                        Project.start_at.label('start_at')  # type: ignore[has-type]
-                    )
-                    .where(Project.start_at.is_not(None))  # type: ignore[has-type]
-                    .where(
-                        Project.start_at >= sa.func.utcnow()  # type: ignore[has-type]
-                    )
-                    .correlate(Project)
-                )
-                .subquery()
-            )
-            .scalar_subquery()
-        ),
-        read={'all'},
-    )
-
-    schedule_end_at: Mapped[datetime | None] = with_roles(
-        sa.orm.column_property(
-            sa.select(sa.func.max(Session.end_at))
-            .where(Session.end_at.is_not(None))
-            .where(Session.project_id == Project.id)
-            .correlate_except(Session)
-            .scalar_subquery()
-        ),
-        read={'all'},
-        datasets={'primary', 'without_parent'},
-    )
-
-    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
-    @cached_property
-    def schedule_start_at_localized(self) -> datetime | None:
-        return (
-            localize_timezone(self.schedule_start_at, tz=self.timezone)
-            if self.schedule_start_at
-            else None
-        )
-
-    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
-    @cached_property
-    def schedule_end_at_localized(self) -> datetime | None:
-        return (
-            localize_timezone(self.schedule_end_at, tz=self.timezone)
-            if self.schedule_end_at
-            else None
-        )
-
-    @with_roles(read={'all'})
-    @cached_property
-    def session_count(self) -> int:
-        return self.sessions.filter(Session.start_at.is_not(None)).count()
-
-    featured_sessions: Mapped[list[Session]] = with_roles(
-        relationship(
-            Session,
-            order_by=Session.start_at.asc(),
-            primaryjoin=sa.and_(
-                Session.project_id == Project.id, Session.featured.is_(True)
-            ),
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-    scheduled_sessions: Mapped[list[Session]] = with_roles(
-        relationship(
-            Session,
-            order_by=Session.start_at.asc(),
-            primaryjoin=sa.and_(
-                Session.project_id == Project.id,
-                Session.scheduled,
-            ),
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-    unscheduled_sessions: Mapped[list[Session]] = with_roles(
-        relationship(
-            Session,
-            order_by=Session.start_at.asc(),
-            primaryjoin=sa.and_(
-                Session.project_id == Project.id,
-                Session.scheduled.is_not(True),
-            ),
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-
-    sessions_with_video: DynamicMapped[Session] = with_roles(
-        relationship(
-            Session,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                Project.id == Session.project_id,
-                Session.video_id.is_not(None),
-                Session.video_source.is_not(None),
-            ),
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-
-    @with_roles(read={'all'})
-    @cached_property
-    def has_sessions_with_video(self) -> bool:
-        return self.query.session.query(self.sessions_with_video.exists()).scalar()
-
-    def next_session_from(self, timestamp: datetime) -> Session | None:
-        """Find the next session in this project from given timestamp."""
-        return (
-            self.sessions.filter(
-                Session.start_at.is_not(None), Session.start_at >= timestamp
-            )
-            .order_by(Session.start_at.asc())
-            .first()
-        )
-
-    @with_roles(call={'all'})
-    def next_starting_at(  # type: ignore[misc]
-        self: Project, timestamp: datetime | None = None
-    ) -> datetime | None:
-        """
-        Return timestamp of next session from given timestamp.
-
-        Supplements :attr:`next_session_at` to also consider projects without sessions.
-        """
-        # If there's no `self.start_at`, there is no session either
-        if self.start_at is not None:
-            if timestamp is None:
-                timestamp = utcnow()
-            # If `self.start_at` is in the future, it is guaranteed to be the closest
-            # timestamp, so return it directly
-            if self.start_at >= timestamp:
-                return self.start_at
-            # In the past? Then look for a session and return that timestamp, if any
-            return (
-                db.session.query(sa.func.min(Session.start_at))
-                .filter(
-                    Session.start_at.is_not(None),
-                    Session.start_at >= timestamp,
-                    Session.project == self,
-                )
-                .scalar()
-            )
-
-        return None
-
-    @classmethod
-    def starting_at(  # type: ignore[misc]
-        cls: type[Project], timestamp: datetime, within: timedelta, gap: timedelta
-    ) -> Query[Project]:
-        """
-        Return projects that are about to start, for sending notifications.
-
-        :param datetime timestamp: The timestamp to look for new sessions at
-        :param timedelta within: Find anything at timestamp + within delta. Lookup will
-            be for sessions where timestamp >= start_at < timestamp+within
-        :param timedelta gap: A project will be considered to be starting if it has no
-            sessions ending within the gap period before the timestamp
-
-        Typical use of this method is from a background worker that calls it at
-        intervals of five minutes with parameters (timestamp, within 5m, 60m gap).
-        """
-        # As a rule, start_at is queried with >= and <, end_at with > and <= because
-        # they represent inclusive lower and upper bounds.
-
-        # Check project starting time before looking for individual sessions, as some
-        # projects will have no sessions
-        return (
-            cls.query.filter(
-                cls.id.in_(
-                    db.session.query(sa.func.distinct(Session.project_id)).filter(
-                        Session.start_at.is_not(None),
-                        Session.start_at >= timestamp,
-                        Session.start_at < timestamp + within,
-                        Session.project_id.notin_(
-                            db.session.query(
-                                sa.func.distinct(Session.project_id)
-                            ).filter(
-                                Session.start_at.is_not(None),
-                                sa.or_(
-                                    sa.and_(
-                                        Session.start_at >= timestamp - gap,
-                                        Session.start_at < timestamp,
-                                    ),
-                                    sa.and_(
-                                        Session.end_at > timestamp - gap,
-                                        Session.end_at <= timestamp,
-                                    ),
-                                ),
-                            )
-                        ),
-                    )
-                )
-            )
-            .join(Session.project)
-            .filter(cls.state.PUBLISHED)
-        ).union(
-            cls.query.filter(
-                cls.state.PUBLISHED,
-                cls.start_at.is_not(None),
-                cls.start_at >= timestamp,
-                cls.start_at < timestamp + within,
-            )
-        )
-
-    @with_roles(call={'all'})
-    def current_sessions(self) -> dict | None:
-        if self.start_at is None or (self.start_at > utcnow() + timedelta(minutes=30)):
-            return None
-
-        current_sessions = (
-            self.sessions.outerjoin(VenueRoom)
-            .filter(Session.start_at <= sa.func.utcnow() + timedelta(minutes=30))
-            .filter(Session.end_at > sa.func.utcnow())
-            .order_by(Session.start_at.asc(), VenueRoom.seq.asc())
-        )
-
-        return {
-            'sessions': [
-                session.current_access(datasets=('without_parent', 'related'))
-                for session in current_sessions
-            ],
-            'rooms': [
-                room.current_access(datasets=('without_parent', 'related'))
-                for room in self.rooms
-            ],
-        }
-
-    # TODO: Use TypedDict for return type
-    def calendar_weeks(self, leading_weeks: bool = True) -> dict[str, Any]:
-        # session_dates is a list of tuples in this format -
-        # (date, day_start_at, day_end_at, event_count)
-        if self.schedule_start_at:
-            session_dates = list(
-                db.session.query(
-                    sa.func.date_trunc(
-                        'day', sa.func.timezone(self.timezone.zone, Session.start_at)
-                    ).label('date'),
-                    sa.func.min(Session.start_at).label('day_start_at'),
-                    sa.func.max(Session.end_at).label('day_end_at'),
-                    sa.func.count().label('count'),
-                )
-                .select_from(Session)
-                .filter(
-                    Session.project == self,
-                    Session.start_at.is_not(None),
-                    Session.end_at.is_not(None),
-                )
-                .group_by('date')
-                .order_by('date')
-            )
-        elif self.start_at:
-            start_at = self.start_at_localized
-            end_at = self.end_at_localized
-            if start_at.date() == end_at.date():
-                session_dates = [(start_at, start_at, end_at, 1)]
-            else:
-                session_dates = [
-                    (
-                        start_at + timedelta(days=plusdays),
-                        start_at + timedelta(days=plusdays),
-                        end_at - timedelta(days=plusdays),
-                        1,
-                    )
-                    for plusdays in range(
-                        (
-                            end_at.replace(hour=1, minute=0, second=0, microsecond=0)
-                            - start_at.replace(
-                                hour=0, minute=0, second=0, microsecond=0
-                            )
-                        ).days
-                        + 1
-                    )
-                ]
-        else:
-            session_dates = []
-
-        session_dates_dict = {
-            date.date(): {
-                'day_start_at': day_start_at,
-                'day_end_at': day_end_at,
-                'count': count,
-            }
-            for date, day_start_at, day_end_at, count in session_dates
-        }
-
-        # FIXME: This doesn't work. This code needs to be tested in isolation
-        # session_dates = (
-        #     db.session.query(
-        #         sa.cast(
-        #             sa.func.date_trunc(
-        #                 'day', sa.func.timezone(self.timezone.zone, Session.start_at)
-        #             ),
-        #             sa.Date,
-        #         ).label('date'),
-        #         sa.func.count().label('count'),
-        #     )
-        #     .filter(Session.project == self, Session.scheduled)
-        #     .group_by(sa.text('date'))
-        #     .order_by(sa.text('date'))
-        # )
-
-        # if the project's week is within next 2 weeks, send current week as well
-        now = utcnow().astimezone(self.timezone)
-        current_week = Week.withdate(now)
-
-        if leading_weeks and self.schedule_start_at is not None:
-            schedule_start_week = Week.withdate(self.schedule_start_at)
-
-            # session_dates is a list of tuples in this format -
-            # (date, day_start_at, day_end_at, event_count)
-            # as these days dont have any event, day_start/end_at are None,
-            # and count is 0.
-            if (
-                schedule_start_week > current_week
-                and (schedule_start_week - current_week) <= 2
-            ):
-                if (schedule_start_week - current_week) == 2:
-                    # add this so that the next week's dates
-                    # are also included in the calendar.
-                    session_dates.insert(0, (now + timedelta(days=7), None, None, 0))
-                session_dates.insert(0, (now, None, None, 0))
-
-        weeks: dict[str, dict[str, Any]] = defaultdict(dict)
-        today = now.date()
-        for project_date, _day_start_at, _day_end_at, session_count in session_dates:
-            weekobj = Week.withdate(project_date)
-            weekid = weekobj.isoformat()
-            if weekid not in weeks:
-                weeks[weekid]['year'] = weekobj.year
-                # Order is important, and we need dict to count easily
-                weeks[weekid]['dates'] = OrderedDict()
-            for wdate in weekobj.days():
-                weeks[weekid]['dates'].setdefault(wdate, 0)
-                if project_date.date() == wdate:
-                    # If the event is over don't set upcoming for current week
-                    if wdate >= today and weekobj >= current_week and session_count > 0:
-                        weeks[weekid]['upcoming'] = True
-                    weeks[weekid]['dates'][wdate] += session_count
-                    if 'month' not in weeks[weekid]:
-                        weeks[weekid]['month'] = format_date(wdate, 'MMM')
-        # Extract sorted weeks as a list
-        weeks_list = [v for k, v in sorted(weeks.items())]
-
-        for week in weeks_list:
-            # Convering to JSON messes up dictionary key order even though we used
-            # OrderedDict. This turns the OrderedDict into a list of tuples and JSON
-            # preserves that order.
-            week['dates'] = [
-                {
-                    'isoformat': date.isoformat(),
-                    'day': format_date(date, 'd'),
-                    'count': count,
-                    'day_start_at': (
-                        session_dates_dict[date]['day_start_at']
-                        .astimezone(self.timezone)
-                        .strftime('%I:%M %p')
-                        if date in session_dates_dict.keys()
-                        else None
-                    ),
-                    'day_end_at': (
-                        session_dates_dict[date]['day_end_at']
-                        .astimezone(self.timezone)
-                        .strftime('%I:%M %p %Z')
-                        if date in session_dates_dict.keys()
-                        else None
-                    ),
-                }
-                for date, count in week['dates'].items()
-            ]
-        return {
-            'locale': get_locale(),
-            'weeks': weeks_list,
-            'today': now.date().isoformat(),
-            'days': [format_date(day, 'EEE') for day in Week.thisweek().days()],
-        }
-
-    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
-    @cached_property
-    def calendar_weeks_full(self) -> dict[str, Any]:  # TODO: Use TypedDict
-        return self.calendar_weeks(leading_weeks=True)
+# Tail imports
+from .venue import VenueRoom
 
-    @with_roles(read={'all'}, datasets={'primary', 'without_parent'})
-    @cached_property
-    def calendar_weeks_compact(self) -> dict[str, Any]:  # TODO: Use TypedDict
-        return self.calendar_weeks(leading_weeks=False)
+if TYPE_CHECKING:
+    from .saved import SavedSession
diff --git a/funnel/models/shortlink.py b/funnel/models/shortlink.py
index a30cecdd3..c36e6e04e 100644
--- a/funnel/models/shortlink.py
+++ b/funnel/models/shortlink.py
@@ -15,8 +15,18 @@
 
 from coaster.sqlalchemy import immutable, with_roles
 
-from . import Mapped, Model, NoIdMixin, UrlType, db, hybrid_property, relationship, sa
 from .account import Account
+from .base import (
+    Mapped,
+    Model,
+    NoIdMixin,
+    UrlType,
+    db,
+    hybrid_property,
+    relationship,
+    sa,
+    sa_orm,
+)
 from .helpers import profanity
 
 __all__ = ['Shortlink']
@@ -200,33 +210,31 @@ class Shortlink(NoIdMixin, Model):
     id: Mapped[int] = with_roles(  # noqa: A003
         # id cannot use the `immutable` wrapper because :meth:`new` changes the id when
         # handling collisions. This needs an "immutable after commit" handler
-        sa.orm.mapped_column(
+        sa_orm.mapped_column(
             sa.BigInteger, autoincrement=False, nullable=False, primary_key=True
         ),
         read={'all'},
     )
     #: URL target of this shortlink
     url: Mapped[furl] = with_roles(
-        immutable(sa.orm.mapped_column(UrlType, nullable=False, index=True)),
+        immutable(sa_orm.mapped_column(UrlType, nullable=False, index=True)),
         read={'all'},
     )
     #: Id of account that created this shortlink (optional)
-    created_by_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id', ondelete='SET NULL'), nullable=True
+    created_by_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id', ondelete='SET NULL'), default=None, nullable=True
     )
     #: Account that created this shortlink (optional)
-    created_by: Mapped[Account | None] = relationship(Account)
+    created_by: Mapped[Account | None] = relationship()
 
     #: Is this link enabled? If not, render 410 Gone
-    enabled: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=True
-    )
+    enabled: Mapped[bool] = sa_orm.mapped_column(default=True)
 
     @hybrid_property
     def name(self) -> str:
         """Return string representation of id, for use in short URLs."""
         if self.id is None:
-            return ''
+            return ''  # type: ignore[unreachable]
         return bigint_to_name(self.id)
 
     @name.inplace.setter
@@ -236,19 +244,19 @@ def _name_setter(self, value: str | bytes) -> None:
 
     @name.inplace.comparator
     @classmethod
-    def _name_comparator(cls):
+    def _name_comparator(cls) -> ShortLinkToBigIntComparator:
         """Compare name to id in a SQL expression."""
         return ShortLinkToBigIntComparator(cls.id)
 
     # --- Validators
 
-    @sa.orm.validates('id')
+    @sa_orm.validates('id')
     def _validate_id_not_zero(self, _key: str, value: int) -> int:
         if value == 0:
             raise ValueError("Id cannot be zero")
         return value
 
-    @sa.orm.validates('url')
+    @sa_orm.validates('url')
     def _validate_url(self, _key: str, value: str) -> str:
         value = str(normalize_url(value))
         # If URL hashes are added to the model, the value must be set here using
@@ -369,7 +377,7 @@ def name_available(cls, name: str) -> bool:
         try:
             existing = db.session.query(
                 cls.query.filter(cls.name == name)
-                .options(sa.orm.load_only(cls.id))
+                .options(sa_orm.load_only(cls.id))
                 .exists()
             ).scalar()
             return not existing
@@ -389,7 +397,7 @@ def get(cls, name: str | bytes, ignore_enabled: bool = False) -> Shortlink | Non
         except (ValueError, TypeError):
             return None
         obj = db.session.get(
-            cls, idv, options=[sa.orm.load_only(cls.id, cls.url, cls.enabled)]
+            cls, idv, options=[sa_orm.load_only(cls.id, cls.url, cls.enabled)]
         )
         if obj is not None and (ignore_enabled or obj.enabled):
             return obj
diff --git a/funnel/models/site_membership.py b/funnel/models/site_membership.py
index c1167435f..b82131676 100644
--- a/funnel/models/site_membership.py
+++ b/funnel/models/site_membership.py
@@ -4,15 +4,13 @@
 
 from werkzeug.utils import cached_property
 
-from . import Mapped, Model, declared_attr, relationship, sa
-from .account import Account
-from .helpers import reopen
-from .membership_mixin import ImmutableUserMembershipMixin
+from .base import Mapped, Model, declared_attr, sa, sa_orm
+from .membership_mixin import ImmutableMembershipMixin
 
 __all__ = ['SiteMembership']
 
 
-class SiteMembership(ImmutableUserMembershipMixin, Model):
+class SiteMembership(ImmutableMembershipMixin, Model):
     """Membership roles for users who are site administrators."""
 
     __tablename__ = 'site_membership'
@@ -40,36 +38,29 @@ class SiteMembership(ImmutableUserMembershipMixin, Model):
 
     #: SiteMembership doesn't have a container limiting its scope
     parent_id = None
-    parent_id_column = None
+    parent_id_column = ''  # Must be of type str, not None
     parent = None
 
     # Site admin roles (at least one must be True):
 
     #: Comment moderators can delete comments
-    is_comment_moderator: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_comment_moderator: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: User moderators can suspend users
-    is_user_moderator: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_user_moderator: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: Site editors can feature or reject projects
-    is_site_editor: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_site_editor: Mapped[bool] = sa_orm.mapped_column(default=False)
     #: Sysadmins can manage technical settings
-    is_sysadmin: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, nullable=False, default=False
-    )
+    is_sysadmin: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     @declared_attr.directive
     @classmethod
-    def __table_args__(cls) -> tuple:
+    def __table_args__(cls) -> tuple:  # type: ignore[override]
         """Table arguments."""
         try:
-            args = list(super().__table_args__)  # type: ignore[misc]
+            args = list(super().__table_args__)
         except AttributeError:
             args = []
+        kwargs = args.pop(-1) if args and isinstance(args[-1], dict) else None
         args.append(
             sa.CheckConstraint(
                 sa.or_(
@@ -81,6 +72,8 @@ def __table_args__(cls) -> tuple:
                 name='site_membership_has_role',
             )
         )
+        if kwargs:
+            args.append(kwargs)
         return tuple(args)
 
     def __repr__(self) -> str:
@@ -111,56 +104,3 @@ def offered_roles(self) -> set[str]:
         if self.is_sysadmin:
             roles.add('sysadmin')
         return roles
-
-
-@reopen(Account)
-class __Account:
-    # Singular, as only one can be active
-    active_site_membership: Mapped[SiteMembership] = relationship(
-        SiteMembership,
-        lazy='select',
-        primaryjoin=sa.and_(
-            SiteMembership.member_id == Account.id,  # type: ignore[has-type]
-            SiteMembership.is_active,
-        ),
-        viewonly=True,
-        uselist=False,
-    )
-
-    @cached_property
-    def is_comment_moderator(self) -> bool:
-        """Test if this user is a comment moderator."""
-        return (
-            self.active_site_membership is not None
-            and self.active_site_membership.is_comment_moderator
-        )
-
-    @cached_property
-    def is_user_moderator(self) -> bool:
-        """Test if this user is an account moderator."""
-        return (
-            self.active_site_membership is not None
-            and self.active_site_membership.is_user_moderator
-        )
-
-    @cached_property
-    def is_site_editor(self) -> bool:
-        """Test if this user is a site editor."""
-        return (
-            self.active_site_membership is not None
-            and self.active_site_membership.is_site_editor
-        )
-
-    @cached_property
-    def is_sysadmin(self) -> bool:
-        """Test if this user is a sysadmin."""
-        return (
-            self.active_site_membership is not None
-            and self.active_site_membership.is_sysadmin
-        )
-
-    # site_admin means user has one or more of above roles
-    @cached_property
-    def is_site_admin(self) -> bool:
-        """Test if this user has any site-level admin rights."""
-        return self.active_site_membership is not None
diff --git a/funnel/models/sponsor_membership.py b/funnel/models/sponsor_membership.py
index 52b8bd9de..4770f0b70 100644
--- a/funnel/models/sponsor_membership.py
+++ b/funnel/models/sponsor_membership.py
@@ -2,30 +2,21 @@
 
 from __future__ import annotations
 
+from typing import ClassVar
+
 from werkzeug.utils import cached_property
 
-from coaster.sqlalchemy import DynamicAssociationProxy, immutable, with_roles
+from coaster.sqlalchemy import immutable
 
-from . import DynamicMapped, Mapped, Model, backref, db, relationship, sa
-from .account import Account
-from .helpers import reopen
-from .membership_mixin import (
-    FrozenAttributionProtoMixin,
-    ImmutableUserMembershipMixin,
-    ReorderMembershipProtoMixin,
-)
+from .base import Mapped, Model, relationship, sa, sa_orm
+from .membership_mixin import FrozenAttributionMixin, ReorderMembershipMixin
 from .project import Project
 from .proposal import Proposal
 
 __all__ = ['ProjectSponsorMembership', 'ProposalSponsorMembership']
 
 
-class ProjectSponsorMembership(  # type: ignore[misc]
-    ImmutableUserMembershipMixin,
-    FrozenAttributionProtoMixin,
-    ReorderMembershipProtoMixin,
-    Model,
-):
+class ProjectSponsorMembership(FrozenAttributionMixin, ReorderMembershipMixin, Model):
     """Sponsor of a project."""
 
     __tablename__ = 'project_sponsor_membership'
@@ -80,36 +71,26 @@ class ProjectSponsorMembership(  # type: ignore[misc]
         },
     }
 
-    revoke_on_member_delete = False
+    revoke_on_member_delete: ClassVar[bool] = False
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id', ondelete='CASCADE'), nullable=False
-    )
-    project: Mapped[Project] = relationship(
-        Project,
-        backref=backref(
-            'all_sponsor_memberships',
-            lazy='dynamic',
-            cascade='all',
-            passive_deletes=True,
-        ),
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id', ondelete='CASCADE'), default=None, nullable=False
     )
-    parent_id: Mapped[int] = sa.orm.synonym('project_id')
+    project: Mapped[Project] = relationship(back_populates='all_sponsor_memberships')
+    parent_id: Mapped[int] = sa_orm.synonym('project_id')
     parent_id_column = 'project_id'
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
 
     #: Is this sponsor being promoted for commercial reasons? Projects may have a legal
     #: obligation to reveal this. This column records a declaration from the project.
-    is_promoted = immutable(sa.orm.mapped_column(sa.Boolean, nullable=False))
+    is_promoted: Mapped[bool] = immutable(sa_orm.mapped_column())
 
     #: Optional label, indicating the type of sponsor
-    label = immutable(
-        sa.orm.mapped_column(
-            sa.Unicode,
+    label: Mapped[str | None] = immutable(
+        sa_orm.mapped_column(
             sa.CheckConstraint(
                 "label <> ''", name='project_sponsor_membership_label_check'
-            ),
-            nullable=True,
+            )
         )
     )
 
@@ -124,38 +105,9 @@ def offered_roles(self) -> set[str]:
         return set()
 
 
-@reopen(Project)
-class __Project:
-    sponsor_memberships: DynamicMapped[ProjectSponsorMembership] = with_roles(
-        relationship(
-            ProjectSponsorMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                ProjectSponsorMembership.project_id == Project.id,
-                ProjectSponsorMembership.is_active,
-            ),
-            order_by=ProjectSponsorMembership.seq,
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-
-    @with_roles(read={'all'})
-    @cached_property
-    def has_sponsors(self) -> bool:
-        return db.session.query(self.sponsor_memberships.exists()).scalar()
-
-    sponsors = DynamicAssociationProxy('sponsor_memberships', 'member')
-
-
 # FIXME: Replace this with existing proposal collaborator as they're now both related
 # to "account"
-class ProposalSponsorMembership(  # type: ignore[misc]
-    FrozenAttributionProtoMixin,
-    ReorderMembershipProtoMixin,
-    ImmutableUserMembershipMixin,
-    Model,
-):
+class ProposalSponsorMembership(FrozenAttributionMixin, ReorderMembershipMixin, Model):
     """Sponsor of a proposal."""
 
     __tablename__ = 'proposal_sponsor_membership'
@@ -210,36 +162,26 @@ class ProposalSponsorMembership(  # type: ignore[misc]
         },
     }
 
-    revoke_on_member_delete = False
+    revoke_on_member_delete: ClassVar[bool] = False
 
-    proposal_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False
-    )
-    proposal: Mapped[Proposal] = relationship(
-        Proposal,
-        backref=backref(
-            'all_sponsor_memberships',
-            lazy='dynamic',
-            cascade='all',
-            passive_deletes=True,
-        ),
+    proposal_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('proposal.id', ondelete='CASCADE'), default=None, nullable=False
     )
-    parent_id: Mapped[int] = sa.orm.synonym('proposal_id')
+    proposal: Mapped[Proposal] = relationship(back_populates='all_sponsor_memberships')
+    parent_id: Mapped[int] = sa_orm.synonym('proposal_id')
     parent_id_column = 'proposal_id'
-    parent: Mapped[Proposal] = sa.orm.synonym('proposal')
+    parent: Mapped[Proposal] = sa_orm.synonym('proposal')
 
     #: Is this sponsor being promoted for commercial reasons? Proposals may have a legal
     #: obligation to reveal this. This column records a declaration from the proposal.
-    is_promoted = immutable(sa.orm.mapped_column(sa.Boolean, nullable=False))
+    is_promoted: Mapped[bool] = immutable(sa_orm.mapped_column())
 
     #: Optional label, indicating the type of sponsor
-    label = immutable(
-        sa.orm.mapped_column(
-            sa.Unicode,
+    label: Mapped[str | None] = immutable(
+        sa_orm.mapped_column(
             sa.CheckConstraint(
                 "label <> ''", name='proposal_sponsor_membership_label_check'
-            ),
-            nullable=True,
+            )
         )
     )
 
@@ -247,131 +189,3 @@ class ProposalSponsorMembership(  # type: ignore[misc]
     def offered_roles(self) -> set[str]:
         """Return empty set as this membership does not offer any roles on Proposal."""
         return set()
-
-
-@reopen(Proposal)
-class __Proposal:
-    sponsor_memberships: DynamicMapped[ProposalSponsorMembership] = with_roles(
-        relationship(
-            ProposalSponsorMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                ProposalSponsorMembership.proposal_id == Proposal.id,
-                ProposalSponsorMembership.is_active,
-            ),
-            order_by=ProposalSponsorMembership.seq,
-            viewonly=True,
-        ),
-        read={'all'},
-    )
-
-    @with_roles(read={'all'})
-    @cached_property
-    def has_sponsors(self) -> bool:
-        return db.session.query(self.sponsor_memberships.exists()).scalar()
-
-    sponsors = DynamicAssociationProxy('sponsor_memberships', 'member')
-
-
-@reopen(Account)
-class __Account:
-    # pylint: disable=invalid-unary-operand-type
-    noninvite_project_sponsor_memberships: DynamicMapped[
-        ProjectSponsorMembership
-    ] = relationship(
-        ProjectSponsorMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectSponsorMembership.member_id == Account.id,
-            ~ProjectSponsorMembership.is_invite,
-        ),
-        order_by=ProjectSponsorMembership.granted_at.desc(),
-        viewonly=True,
-    )
-
-    project_sponsor_memberships: DynamicMapped[ProjectSponsorMembership] = relationship(
-        ProjectSponsorMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProjectSponsorMembership.member_id == Account.id,
-            ProjectSponsorMembership.is_active,
-        ),
-        order_by=ProjectSponsorMembership.granted_at.desc(),
-        viewonly=True,
-    )
-
-    project_sponsor_membership_invites: DynamicMapped[
-        ProjectSponsorMembership
-    ] = with_roles(
-        relationship(
-            ProjectSponsorMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                ProjectSponsorMembership.member_id == Account.id,
-                ProjectSponsorMembership.is_invite,
-                ProjectSponsorMembership.revoked_at.is_(None),
-            ),
-            order_by=ProjectSponsorMembership.granted_at.desc(),
-            viewonly=True,
-        ),
-        read={'admin'},
-    )
-
-    noninvite_proposal_sponsor_memberships: DynamicMapped[
-        ProposalSponsorMembership
-    ] = relationship(
-        ProposalSponsorMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProposalSponsorMembership.member_id == Account.id,
-            ~ProposalSponsorMembership.is_invite,
-        ),
-        order_by=ProposalSponsorMembership.granted_at.desc(),
-        viewonly=True,
-    )
-
-    proposal_sponsor_memberships: DynamicMapped[
-        ProposalSponsorMembership
-    ] = relationship(
-        ProposalSponsorMembership,
-        lazy='dynamic',
-        primaryjoin=sa.and_(
-            ProposalSponsorMembership.member_id == Account.id,
-            ProposalSponsorMembership.is_active,
-        ),
-        order_by=ProposalSponsorMembership.granted_at.desc(),
-        viewonly=True,
-    )
-
-    proposal_sponsor_membership_invites: DynamicMapped[
-        ProposalSponsorMembership
-    ] = with_roles(
-        relationship(
-            ProposalSponsorMembership,
-            lazy='dynamic',
-            primaryjoin=sa.and_(
-                ProposalSponsorMembership.member_id == Account.id,
-                ProposalSponsorMembership.is_invite,
-                ProposalSponsorMembership.revoked_at.is_(None),
-            ),
-            order_by=ProposalSponsorMembership.granted_at.desc(),
-            viewonly=True,
-        ),
-        read={'admin'},
-    )
-
-    sponsored_projects = DynamicAssociationProxy(
-        'project_sponsor_memberships', 'project'
-    )
-
-    sponsored_proposals = DynamicAssociationProxy(
-        'proposal_sponsor_memberships', 'proposal'
-    )
-
-
-Account.__active_membership_attrs__.update(
-    {'project_sponsor_memberships', 'proposal_sponsor_memberships'}
-)
-Account.__noninvite_membership_attrs__.update(
-    {'noninvite_project_sponsor_memberships', 'noninvite_proposal_sponsor_memberships'}
-)
diff --git a/funnel/models/sync_ticket.py b/funnel/models/sync_ticket.py
index cef344296..d07b1e313 100644
--- a/funnel/models/sync_ticket.py
+++ b/funnel/models/sync_ticket.py
@@ -5,27 +5,24 @@
 import base64
 import os
 from collections.abc import Iterable, Sequence
-from typing import Any
+from typing import TYPE_CHECKING, Any, Self
 
-from coaster.sqlalchemy import LazyRoleSet
+from coaster.sqlalchemy import LazyRoleSet, with_roles
 
-from . import (
+from .account import Account, AccountEmail
+from .base import (
     BaseMixin,
     BaseScopedNameMixin,
     DynamicMapped,
     Mapped,
     Model,
-    Query,
     UuidMixin,
-    backref,
     db,
     relationship,
     sa,
-    with_roles,
+    sa_orm,
 )
-from .account import Account, AccountEmail
-from .email_address import EmailAddress, EmailAddressMixin
-from .helpers import reopen
+from .email_address import EmailAddress, OptionalEmailAddressMixin
 from .project import Project
 from .project_membership import project_child_role_map
 
@@ -39,15 +36,15 @@
 ]
 
 
-def make_key():
+def make_key() -> str:
     return base64.urlsafe_b64encode(os.urandom(128)).decode('utf-8')
 
 
-def make_public_key():
+def make_public_key() -> str:
     return make_key()[:8]
 
 
-def make_private_key():
+def make_private_key() -> str:
     return make_key()[:8]
 
 
@@ -76,7 +73,7 @@ class GetTitleMixin(BaseScopedNameMixin):
     @classmethod
     def get(
         cls, parent: Any, name: str | None = None, title: str | None = None
-    ) -> GetTitleMixin | None:
+    ) -> Self | None:
         if not bool(name) ^ bool(title):
             raise TypeError("Expects name xor title")
         if name:
@@ -89,8 +86,8 @@ def upsert(  # type: ignore[override]  # pylint: disable=arguments-renamed
         parent: Any,
         current_name: str | None = None,
         current_title: str | None = None,
-        **fields,
-    ) -> GetTitleMixin:
+        **fields: Any,
+    ) -> Self:
         instance = cls.get(parent, current_name, current_title)
         if instance is not None:
             instance._set_fields(fields)  # pylint: disable=protected-access
@@ -114,34 +111,35 @@ class TicketEvent(GetTitleMixin, Model):
 
     __tablename__ = 'ticket_event'
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, backref=backref('ticket_events', cascade='all')),
+        relationship(back_populates='ticket_events'),
         rw={'project_promoter'},
         grants_via={None: project_child_role_map},
     )
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
     ticket_types: Mapped[list[TicketType]] = with_roles(
         relationship(
-            'TicketType',
-            secondary=ticket_event_ticket_type,
-            back_populates='ticket_events',
+            secondary=ticket_event_ticket_type, back_populates='ticket_events'
         ),
         rw={'project_promoter'},
     )
     ticket_participants: DynamicMapped[TicketParticipant] = with_roles(
         relationship(
-            'TicketParticipant',
             secondary='ticket_event_participant',
-            backref='ticket_events',
             lazy='dynamic',
+            back_populates='ticket_events',
         ),
         rw={'project_promoter'},
     )
     badge_template: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(250), nullable=True), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(250), nullable=True), rw={'project_promoter'}
+    )
+
+    ticket_event_participants: Mapped[list[TicketEventParticipant]] = relationship(
+        back_populates='ticket_event', overlaps='ticket_events,ticket_participants'
     )
 
     __table_args__ = (
@@ -172,24 +170,22 @@ class TicketType(GetTitleMixin, Model):
 
     __tablename__ = 'ticket_type'
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, backref=backref('ticket_types', cascade='all')),
+        relationship(back_populates='ticket_types'),
         rw={'project_promoter'},
         grants_via={None: project_child_role_map},
     )
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
     ticket_events: Mapped[list[TicketEvent]] = with_roles(
-        relationship(
-            TicketEvent,
-            secondary=ticket_event_ticket_type,
-            back_populates='ticket_types',
-        ),
+        relationship(secondary=ticket_event_ticket_type, back_populates='ticket_types'),
         rw={'project_promoter'},
     )
 
+    sync_tickets: Mapped[list[SyncTicket]] = relationship(back_populates='ticket_type')
+
     __table_args__ = (
         sa.UniqueConstraint('project_id', 'name'),
         sa.UniqueConstraint('project_id', 'title'),
@@ -206,60 +202,67 @@ class TicketType(GetTitleMixin, Model):
     }
 
 
-class TicketParticipant(EmailAddressMixin, UuidMixin, BaseMixin, Model):
+class TicketParticipant(
+    OptionalEmailAddressMixin, UuidMixin, BaseMixin[int, Account], Model
+):
     """A participant in one or more events, synced from an external ticket source."""
 
     __tablename__ = 'ticket_participant'
-    __email_optional__ = True
     __email_for__ = 'participant'
 
     fullname: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False),
         read={'promoter', 'member', 'scanner'},
     )
     #: Unvalidated phone number
     phone: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=True),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=True),
         read={'promoter', 'member', 'scanner'},
     )
     #: Unvalidated Twitter id
     twitter: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=True),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=True),
         read={'promoter', 'member', 'scanner'},
     )
     #: Job title
     job_title: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=True),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=True),
         read={'promoter', 'member', 'scanner'},
     )
     #: Company
     company: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=True),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=True),
         read={'promoter', 'member', 'scanner'},
     )
     #: Participant's city
     city: Mapped[str | None] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=True),
+        sa_orm.mapped_column(sa.Unicode(80), nullable=True),
         read={'promoter', 'member', 'scanner'},
     )
     # public key
-    puk: Mapped[str] = sa.orm.mapped_column(
-        sa.Unicode(44), nullable=False, default=make_public_key, unique=True
-    )
-    key: Mapped[str] = sa.orm.mapped_column(
-        sa.Unicode(44), nullable=False, default=make_private_key, unique=True
+    puk: Mapped[str] = sa_orm.mapped_column(
+        sa.Unicode(44),
+        nullable=False,
+        insert_default=make_public_key,
+        default=None,
+        unique=True,
     )
-    badge_printed: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=False, nullable=False
+    key: Mapped[str] = sa_orm.mapped_column(
+        sa.Unicode(44),
+        nullable=False,
+        insert_default=make_private_key,
+        default=None,
+        unique=True,
     )
-    participant_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True
+    badge_printed: Mapped[bool] = sa_orm.mapped_column(default=False)
+    participant_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=True
     )
     participant: Mapped[Account | None] = relationship(
-        Account, backref=backref('ticket_participants', cascade='all')
+        back_populates='ticket_participants'
     )
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
         relationship(Project, back_populates='ticket_participants'),
@@ -267,6 +270,21 @@ class TicketParticipant(EmailAddressMixin, UuidMixin, BaseMixin, Model):
         grants_via={None: project_child_role_map},
     )
 
+    scanned_contacts: Mapped[ContactExchange] = relationship(
+        passive_deletes=True, back_populates='ticket_participant'
+    )
+
+    ticket_events: Mapped[list[TicketEvent]] = relationship(
+        secondary='ticket_event_participant', back_populates='ticket_participants'
+    )
+    ticket_event_participants: Mapped[list[TicketEventParticipant]] = relationship(
+        overlaps='ticket_events,ticket_participants',
+        back_populates='ticket_participant',
+    )
+    sync_tickets: Mapped[list[SyncTicket]] = relationship(
+        back_populates='ticket_participant'
+    )
+
     __table_args__ = (sa.UniqueConstraint('project_id', 'email_address_id'),)
 
     # Since 'email' comes from the mixin, it's not available to be annotated using
@@ -284,14 +302,18 @@ def roles_for(
         if actor is not None:
             if actor == self.participant:
                 roles.add('member')
-            cx = ContactExchange.query.get((actor.id, self.id))
+            cx = db.session.get(ContactExchange, (actor.id, self.id))
             if cx is not None:
                 roles.add('scanner')
         return roles
 
     @property
-    def avatar(self):
-        return self.participant.logo_url if self.participant else ''
+    def avatar(self) -> str:
+        return (
+            str(self.participant.logo_url)
+            if self.participant and self.participant.logo_url
+            else ''
+        )
 
     with_roles(avatar, read={'all'})
 
@@ -317,7 +339,7 @@ def get(
 
     @classmethod
     def upsert(
-        cls, current_project: Project, current_email: str, **fields
+        cls, current_project: Project, current_email: str, **fields: Any
     ) -> TicketParticipant:
         ticket_participant = cls.get(current_project, current_email)
         accountemail = AccountEmail.get(current_email)
@@ -393,38 +415,26 @@ def checkin_list(cls, ticket_event: TicketEvent) -> list:  # TODO: List type?
         return query.all()
 
 
-class TicketEventParticipant(BaseMixin, Model):
+class TicketEventParticipant(BaseMixin[int, Account], Model):
     """Join model between :class:`TicketParticipant` and :class:`TicketEvent`."""
 
     __tablename__ = 'ticket_event_participant'
 
-    ticket_participant_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('ticket_participant.id'), nullable=False
+    ticket_participant_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('ticket_participant.id'), default=None, nullable=False
     )
     ticket_participant: Mapped[TicketParticipant] = relationship(
-        TicketParticipant,
-        backref=backref(
-            'ticket_event_participants',
-            cascade='all',
-            overlaps='ticket_events,ticket_participants',
-        ),
+        back_populates='ticket_event_participants',
         overlaps='ticket_events,ticket_participants',
     )
-    ticket_event_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('ticket_event.id'), nullable=False
+    ticket_event_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('ticket_event.id'), default=None, nullable=False
     )
     ticket_event: Mapped[TicketEvent] = relationship(
-        TicketEvent,
-        backref=backref(
-            'ticket_event_participants',
-            cascade='all',
-            overlaps='ticket_events,ticket_participants',
-        ),
+        back_populates='ticket_event_participants',
         overlaps='ticket_events,ticket_participants',
     )
-    checked_in: Mapped[bool] = sa.orm.mapped_column(
-        sa.Boolean, default=False, nullable=False
-    )
+    checked_in: Mapped[bool] = sa_orm.mapped_column(default=False)
 
     __table_args__ = (
         # Uses a custom name that is not as per convention because the default name is
@@ -450,35 +460,39 @@ def get(
         )
 
 
-class TicketClient(BaseMixin, Model):
+class TicketClient(BaseMixin[int, Account], Model):
     __tablename__ = 'ticket_client'
     name: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
     )
     client_eventid: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
     )
     clientid: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
     )
     client_secret: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
     )
     client_access_token: Mapped[str] = with_roles(
-        sa.orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
+        sa_orm.mapped_column(sa.Unicode(80), nullable=False), rw={'project_promoter'}
     )
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, backref=backref('ticket_clients', cascade='all')),
+        relationship(back_populates='ticket_clients'),
         rw={'project_promoter'},
         grants_via={None: project_child_role_map},
     )
 
+    sync_tickets: Mapped[list[SyncTicket]] = relationship(
+        back_populates='ticket_client'
+    )
+
     __roles__ = {'all': {'call': {'url_for'}}}
 
-    def import_from_list(self, ticket_list):
+    def import_from_list(self, ticket_list: list[ExtTicketsDict]) -> None:
         """Batch upsert tickets and their associated ticket types and participants."""
         for ticket_dict in ticket_list:
             ticket_type = TicketType.upsert(
@@ -497,7 +511,7 @@ def import_from_list(self, ticket_list):
             )
 
             ticket = SyncTicket.get(
-                self, ticket_dict.get('order_no'), ticket_dict.get('ticket_no')
+                self, ticket_dict['order_no'], ticket_dict['ticket_no']
             )
             if ticket and (
                 ticket.ticket_participant != ticket_participant
@@ -510,8 +524,8 @@ def import_from_list(self, ticket_list):
             if ticket_dict.get('status') == 'confirmed':
                 ticket = SyncTicket.upsert(
                     self,
-                    ticket_dict.get('order_no'),
-                    ticket_dict.get('ticket_no'),
+                    ticket_dict['order_no'],
+                    ticket_dict['ticket_no'],
                     ticket_participant=ticket_participant,
                     ticket_type=ticket_type,
                 )
@@ -519,46 +533,41 @@ def import_from_list(self, ticket_list):
                 ticket.ticket_participant.add_events(ticket_type.ticket_events)
 
 
-class SyncTicket(BaseMixin, Model):
+class SyncTicket(BaseMixin[int, Account], Model):
     """Model for a ticket that was bought elsewhere, like Boxoffice or Explara."""
 
     __tablename__ = 'sync_ticket'
 
-    ticket_no: Mapped[str] = sa.orm.mapped_column(sa.Unicode(80), nullable=False)
-    order_no: Mapped[str] = sa.orm.mapped_column(sa.Unicode(80), nullable=False)
-    ticket_type_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('ticket_type.id'), nullable=False
-    )
-    ticket_type: Mapped[TicketType] = relationship(
-        TicketType, backref=backref('sync_tickets', cascade='all')
+    ticket_no: Mapped[str] = sa_orm.mapped_column(sa.Unicode(80), nullable=False)
+    order_no: Mapped[str] = sa_orm.mapped_column(sa.Unicode(80), nullable=False)
+    ticket_type_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('ticket_type.id'), default=None, nullable=False
     )
-    ticket_participant_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('ticket_participant.id'), nullable=False
+    ticket_type: Mapped[TicketType] = relationship(back_populates='sync_tickets')
+    ticket_participant_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('ticket_participant.id'), default=None, nullable=False
     )
     ticket_participant: Mapped[TicketParticipant] = relationship(
-        TicketParticipant,
-        backref=backref('sync_tickets', cascade='all'),
-    )
-    ticket_client_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('ticket_client.id'), nullable=False
+        back_populates='sync_tickets'
     )
-    ticket_client: Mapped[TicketClient] = relationship(
-        TicketClient, backref=backref('sync_tickets', cascade='all')
+    ticket_client_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('ticket_client.id'), default=None, nullable=False
     )
+    ticket_client: Mapped[TicketClient] = relationship(back_populates='sync_tickets')
     __table_args__ = (sa.UniqueConstraint('ticket_client_id', 'order_no', 'ticket_no'),)
 
     @classmethod
     def get(
         cls, ticket_client: TicketClient, order_no: str, ticket_no: str
-    ) -> SyncTicket | None:
+    ) -> Self | None:
         return cls.query.filter_by(
             ticket_client=ticket_client, order_no=order_no, ticket_no=ticket_no
         ).one_or_none()
 
     @classmethod
     def upsert(
-        cls, ticket_client: TicketClient, order_no: str, ticket_no: str, **fields
-    ) -> SyncTicket:
+        cls, ticket_client: TicketClient, order_no: str, ticket_no: str, **fields: Any
+    ) -> Self:
         """
         Update or insert ticket details.
 
@@ -584,42 +593,8 @@ def upsert(
         return ticket
 
 
-@reopen(Project)
-class __Project:
-    # XXX: This relationship exposes an edge case in RoleMixin. It previously expected
-    # TicketParticipant.participant to be unique per project, meaning one user could
-    # have one participant ticket only. This is not guaranteed by the model as tickets
-    # are unique per email address per ticket type, and one user can have (a) two email
-    # addresses with tickets, or (b) tickets of different types. RoleMixin has since
-    # been patched to look for the first matching record (.first() instead of .one()).
-    # This may expose a new edge case in future in case the TicketParticipant model adds
-    # an `offered_roles` method, as only the first matching record's method will be
-    # called
-    ticket_participants: DynamicMapped[TicketParticipant] = with_roles(
-        relationship(
-            TicketParticipant, lazy='dynamic', cascade='all', back_populates='project'
-        ),
-        grants_via={
-            'participant': {'participant', 'project_participant', 'ticket_participant'}
-        },
-    )
-
-
-@reopen(Account)
-class __Account:
-    @property
-    def ticket_followers(self) -> Query[Account]:
-        """All users with a ticket in a project."""
-        return (
-            Account.query.filter(Account.state.ACTIVE)
-            .join(TicketParticipant, TicketParticipant.participant_id == Account.id)
-            .join(Project, TicketParticipant.project_id == Project.id)
-            .filter(Project.state.PUBLISHED, Project.account == self)
-        )
-
-    with_roles(ticket_followers, grants={'follower'})
-
+# Tail imports
+from .contact_exchange import ContactExchange
 
-# Tail imports to avoid cyclic dependency errors, for symbols used only in methods
-# pylint: disable=wrong-import-position
-from .contact_exchange import ContactExchange  # isort:skip
+if TYPE_CHECKING:
+    from ..extapi.typing import ExtTicketsDict
diff --git a/funnel/models/types.py b/funnel/models/types.py
index dfd6abe64..95f9c5cf1 100644
--- a/funnel/models/types.py
+++ b/funnel/models/types.py
@@ -3,6 +3,7 @@
 from typing import Annotated, TypeAlias
 
 import sqlalchemy as sa
+import sqlalchemy.orm as sa_orm
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm import mapped_column
 from sqlalchemy_json import mutable_json_type
@@ -37,7 +38,7 @@
 text: TypeAlias = Annotated[str, mapped_column(sa.UnicodeText())]
 jsonb: TypeAlias = Annotated[
     dict,
-    sa.orm.mapped_column(
+    sa_orm.mapped_column(
         # FIXME: mutable_json_type assumes `dict|list`, not just `dict`
         mutable_json_type(
             dbtype=sa.JSON().with_variant(postgresql.JSONB, 'postgresql'), nested=True
@@ -46,7 +47,7 @@
 ]
 jsonb_dict: TypeAlias = Annotated[
     dict,
-    sa.orm.mapped_column(
+    sa_orm.mapped_column(
         # FIXME: mutable_json_type assumes `dict|list`, not just `dict`
         mutable_json_type(
             dbtype=sa.JSON().with_variant(postgresql.JSONB, 'postgresql'), nested=True
diff --git a/funnel/models/typing.py b/funnel/models/typing.py
index 694350b24..6c7e7eb48 100644
--- a/funnel/models/typing.py
+++ b/funnel/models/typing.py
@@ -1,49 +1,95 @@
 """Union types for models with shared functionality."""
 
-from typing import Union
-
-from .account import Account, AccountOldId, Team
-from .auth_client import AuthClient
-from .comment import Comment, Commentset
-from .label import Label
-from .login_session import LoginSession
-from .membership_mixin import ImmutableMembershipMixin
-from .moderation import CommentModeratorReport
-from .project import Project
-from .proposal import Proposal
-from .rsvp import Rsvp
-from .session import Session
-from .sync_ticket import TicketParticipant
-from .update import Update
-from .venue import Venue, VenueRoom
-
-__all__ = ['UuidModelUnion', 'SearchModelUnion', 'MarkdownModelUnion']
-
-# All models with a `uuid` attr
-UuidModelUnion = Union[
-    Account,
-    AccountOldId,
-    AuthClient,
-    Comment,
-    CommentModeratorReport,
-    Commentset,
-    ImmutableMembershipMixin,
-    LoginSession,
-    Project,
-    Proposal,
-    Rsvp,
-    Session,
-    Team,
-    TicketParticipant,
-    Update,
-    Venue,
-    VenueRoom,
-]
+from __future__ import annotations
+
+from collections.abc import Iterable, Iterator, Sequence
+from datetime import datetime
+from typing import Any, ClassVar, Literal, Protocol, overload, runtime_checkable
+from uuid import UUID
 
-# All models with a `search_vector` attr
-SearchModelUnion = Union[Account, Comment, Label, Project, Proposal, Session, Update]
+from sqlalchemy import Table
+from sqlalchemy.orm import Mapped, declared_attr
 
-# All models with one or more markdown composite columns
-MarkdownModelUnion = Union[
-    Account, Comment, Project, Proposal, Session, Update, Venue, VenueRoom
+from coaster.sqlalchemy import LazyRoleSet, QueryProperty
+from coaster.utils import InspectableSet
+
+__all__ = [
+    'ModelProtocol',
+    'ModelTimestampProtocol',
+    'ModelUrlProtocol',
+    'ModelRoleProtocol',
+    'ModelIdProtocol',
+    'ModelUuidProtocol',
+    'ModelSearchProtocol',
 ]
+
+
+class ModelProtocol(Protocol):
+    __tablename__: str
+    __table__: ClassVar[Table]
+    query: ClassVar[QueryProperty]
+
+
+class ModelTimestampProtocol(ModelProtocol, Protocol):
+    created_at: declared_attr[datetime]
+    updated_at: declared_attr[datetime]
+
+
+class ModelUrlProtocol(Protocol):
+    @property
+    def absolute_url(self) -> str | None:
+        ...
+
+    def url_for(self, action: str = 'view', **kwargs: Any) -> str:
+        ...
+
+
+class ModelRoleProtocol(Protocol):
+    def roles_for(
+        self, actor: Account | None = None, anchors: Sequence[Any] = ()
+    ) -> LazyRoleSet:
+        ...
+
+    @property
+    def current_roles(self) -> InspectableSet[LazyRoleSet]:
+        ...
+
+    @overload
+    def actors_with(
+        self, roles: Iterable[str], with_role: Literal[False] = False
+    ) -> Iterator[Account]:
+        ...
+
+    @overload
+    def actors_with(
+        self, roles: Iterable[str], with_role: Literal[True]
+    ) -> Iterator[tuple[Account, str]]:
+        ...
+
+    def actors_with(
+        self, roles: Iterable[str], with_role: bool = False
+    ) -> Iterator[Account | tuple[Account, str]]:
+        ...
+
+
+class ModelIdProtocol(
+    ModelTimestampProtocol, ModelUrlProtocol, ModelRoleProtocol, Protocol
+):
+    id_: declared_attr[Any]
+
+
+@runtime_checkable  # FIXME: This is never used, but needed to make type checkers happy
+class ModelUuidProtocol(ModelIdProtocol, Protocol):
+    uuid: declared_attr[UUID]
+
+
+class ModelSearchProtocol(ModelUuidProtocol, Protocol):
+    search_vector: Mapped[str]
+
+    @property
+    def title(self) -> Mapped[str] | declared_attr[str]:
+        ...
+
+
+# Tail imports
+from .account import Account
diff --git a/funnel/models/update.py b/funnel/models/update.py
index f579a386f..3919024df 100644
--- a/funnel/models/update.py
+++ b/funnel/models/update.py
@@ -4,31 +4,29 @@
 
 from collections.abc import Sequence
 from datetime import datetime
-
-from sqlalchemy.orm import Query as BaseQuery
+from typing import Any, Self
 
 from baseframe import __
 from coaster.sqlalchemy import LazyRoleSet, StateManager, auto_init_default, with_roles
 from coaster.utils import LabeledEnum
 
-from . import (
+from .account import Account
+from .base import (
     BaseScopedIdNameMixin,
     Mapped,
     Model,
     Query,
     TSVectorType,
     UuidMixin,
-    backref,
     db,
     relationship,
     sa,
+    sa_orm,
 )
-from .account import Account
 from .comment import SET_TYPE, Commentset
 from .helpers import (
     MarkdownCompositeDocument,
     add_search_trigger,
-    reopen,
     visual_field_delimiter,
 )
 from .project import Project
@@ -47,49 +45,50 @@ class VISIBILITY_STATE(LabeledEnum):  # noqa: N801
     RESTRICTED = (2, 'restricted', __("Restricted"))
 
 
-class Update(UuidMixin, BaseScopedIdNameMixin, Model):
+class Update(UuidMixin, BaseScopedIdNameMixin[int, Account], Model):
     __tablename__ = 'update'
 
-    _visibility_state: Mapped[int] = sa.orm.mapped_column(
+    _visibility_state: Mapped[int] = sa_orm.mapped_column(
         'visibility_state',
         sa.SmallInteger,
-        StateManager.check_constraint('visibility_state', VISIBILITY_STATE),
+        StateManager.check_constraint(
+            'visibility_state', VISIBILITY_STATE, sa.SmallInteger
+        ),
         default=VISIBILITY_STATE.PUBLIC,
         nullable=False,
         index=True,
     )
-    visibility_state = StateManager(
+    visibility_state = StateManager['Update'](
         '_visibility_state', VISIBILITY_STATE, doc="Visibility state"
     )
 
-    _state: Mapped[int] = sa.orm.mapped_column(
+    _state: Mapped[int] = sa_orm.mapped_column(
         'state',
         sa.SmallInteger,
-        StateManager.check_constraint('state', UPDATE_STATE),
+        StateManager.check_constraint('state', UPDATE_STATE, sa.SmallInteger),
         default=UPDATE_STATE.DRAFT,
         nullable=False,
         index=True,
     )
-    state = StateManager('_state', UPDATE_STATE, doc="Update state")
+    state = StateManager['Update']('_state', UPDATE_STATE, doc="Update state")
 
-    created_by_id: Mapped[int] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=False, index=True
+    created_by_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=False, index=True
     )
     created_by: Mapped[Account] = with_roles(
         relationship(
-            Account,
-            backref=backref('updates_created', lazy='dynamic'),
+            back_populates='created_updates',
             foreign_keys=[created_by_id],
         ),
         read={'all'},
         grants={'creator'},
     )
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False, index=True
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False, index=True
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, backref=backref('updates', lazy='dynamic')),
+        relationship(back_populates='updates'),
         read={'all'},
         datasets={'primary'},
         grants_via={
@@ -100,7 +99,7 @@ class Update(UuidMixin, BaseScopedIdNameMixin, Model):
             }
         },
     )
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
 
     # Relationship to project that exists only when the Update is not restricted, for
     # the purpose of inheriting the account_participant role. We do this because
@@ -111,7 +110,6 @@ class Update(UuidMixin, BaseScopedIdNameMixin, Model):
     # redefined in a subclass
     _project_when_unrestricted: Mapped[Project] = with_roles(
         relationship(
-            Project,
             viewonly=True,
             uselist=False,
             primaryjoin=sa.and_(
@@ -127,66 +125,56 @@ class Update(UuidMixin, BaseScopedIdNameMixin, Model):
 
     #: Update number, for Project updates, assigned when the update is published
     number: Mapped[int | None] = with_roles(
-        sa.orm.mapped_column(sa.Integer, nullable=True, default=None), read={'all'}
+        sa_orm.mapped_column(default=None), read={'all'}
     )
 
     #: Like pinned tweets. You can keep posting updates,
     #: but might want to pin an update from a week ago.
     is_pinned: Mapped[bool] = with_roles(
-        sa.orm.mapped_column(sa.Boolean, default=False, nullable=False), read={'all'}
+        sa_orm.mapped_column(default=False), read={'all'}
     )
 
-    published_by_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True, index=True
+    published_by_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=True, index=True
     )
     published_by: Mapped[Account | None] = with_roles(
         relationship(
-            Account,
-            backref=backref('published_updates', lazy='dynamic'),
+            back_populates='published_updates',
             foreign_keys=[published_by_id],
         ),
         read={'all'},
     )
     published_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True), read={'all'}
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True), read={'all'}
     )
 
-    deleted_by_id: Mapped[int | None] = sa.orm.mapped_column(
-        sa.ForeignKey('account.id'), nullable=True, index=True
+    deleted_by_id: Mapped[int | None] = sa_orm.mapped_column(
+        sa.ForeignKey('account.id'), default=None, nullable=True, index=True
     )
     deleted_by: Mapped[Account | None] = with_roles(
-        relationship(
-            Account,
-            backref=backref('deleted_updates', lazy='dynamic'),
-            foreign_keys=[deleted_by_id],
-        ),
+        relationship(back_populates='deleted_updates', foreign_keys=[deleted_by_id]),
         read={'reader'},
     )
     deleted_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True),
         read={'reader'},
     )
 
     edited_at: Mapped[datetime | None] = with_roles(
-        sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True), read={'all'}
+        sa_orm.mapped_column(sa.TIMESTAMP(timezone=True), nullable=True), read={'all'}
     )
 
-    commentset_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('commentset.id'), nullable=False
+    commentset_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('commentset.id'), default=None, nullable=False
     )
     commentset: Mapped[Commentset] = with_roles(
         relationship(
-            Commentset,
-            uselist=False,
-            lazy='joined',
-            cascade='all',
-            single_parent=True,
-            backref=backref('update', uselist=False),
+            uselist=False, lazy='joined', single_parent=True, back_populates='update'
         ),
         read={'all'},
     )
 
-    search_vector: Mapped[str] = sa.orm.mapped_column(
+    search_vector: Mapped[str] = sa_orm.mapped_column(
         TSVectorType(
             'name',
             'title',
@@ -249,7 +237,7 @@ class Update(UuidMixin, BaseScopedIdNameMixin, Model):
         'related': {'name', 'title', 'urls'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.commentset = Commentset(settype=SET_TYPE.UPDATE)
 
@@ -365,7 +353,7 @@ def roles_for(
         return roles
 
     @classmethod
-    def all_published_public(cls) -> Query[Update]:
+    def all_published_public(cls) -> Query[Self]:
         return cls.query.join(Project).filter(
             Project.state.PUBLISHED, cls.state.PUBLISHED, cls.visibility_state.PUBLIC
         )
@@ -404,32 +392,3 @@ def getprev(self) -> Update | None:
 add_search_trigger(Update, 'search_vector')
 auto_init_default(Update._visibility_state)  # pylint: disable=protected-access
 auto_init_default(Update._state)  # pylint: disable=protected-access
-
-
-@reopen(Project)
-class __Project:
-    updates: BaseQuery
-
-    @property
-    def published_updates(self) -> BaseQuery:
-        return self.updates.filter(Update.state.PUBLISHED).order_by(
-            Update.is_pinned.desc(), Update.published_at.desc()
-        )
-
-    with_roles(published_updates, read={'all'})
-
-    @property
-    def draft_updates(self) -> BaseQuery:
-        return self.updates.filter(Update.state.DRAFT).order_by(Update.created_at)
-
-    with_roles(draft_updates, read={'editor'})
-
-    @property
-    def pinned_update(self) -> Update | None:
-        return (
-            self.updates.filter(Update.state.PUBLISHED, Update.is_pinned.is_(True))
-            .order_by(Update.published_at.desc())
-            .first()
-        )
-
-    with_roles(pinned_update, read={'all'})
diff --git a/funnel/models/user_signals.py b/funnel/models/user_signals.py
index ef4d43e74..72475b20b 100644
--- a/funnel/models/user_signals.py
+++ b/funnel/models/user_signals.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from sqlalchemy import event
 
 from ..signals import (
@@ -25,100 +27,106 @@
     model_user_new,
 )
 from .account import (
-    Account,
     AccountEmail,
     AccountEmailClaim,
     AccountPhone,
     Organization,
     Team,
+    User,
 )
 
 
-@event.listens_for(Account, 'after_insert')
-def _user_new(_mapper, _connection, target):
+@event.listens_for(User, 'after_insert')
+def _user_new(_mapper: Any, _connection: Any, target: User) -> None:
     model_user_new.send(target)
 
 
-@event.listens_for(Account, 'after_update')
-def _user_edited(_mapper, _connection, target):
+@event.listens_for(User, 'after_update')
+def _user_edited(_mapper: Any, _connection: Any, target: User) -> None:
     model_user_edited.send(target)
 
 
-@event.listens_for(Account, 'after_delete')
-def _user_deleted(_mapper, _connection, target):
+@event.listens_for(User, 'after_delete')
+def _user_deleted(_mapper: Any, _connection: Any, target: User) -> None:
     model_user_deleted.send(target)
 
 
 @event.listens_for(Organization, 'after_insert')
-def _org_new(_mapper, _connection, target):
+def _org_new(_mapper: Any, _connection: Any, target: Organization) -> None:
     model_org_new.send(target)
 
 
 @event.listens_for(Organization, 'after_update')
-def _org_edited(_mapper, _connection, target):
+def _org_edited(_mapper: Any, _connection: Any, target: Organization) -> None:
     model_org_edited.send(target)
 
 
 @event.listens_for(Organization, 'after_delete')
-def _org_deleted(_mapper, _connection, target):
+def _org_deleted(_mapper: Any, _connection: Any, target: Organization) -> None:
     model_org_deleted.send(target)
 
 
 @event.listens_for(Team, 'after_insert')
-def _team_new(_mapper, _connection, target):
+def _team_new(_mapper: Any, _connection: Any, target: Team) -> None:
     model_team_new.send(target)
 
 
 @event.listens_for(Team, 'after_update')
-def _team_edited(_mapper, _connection, target):
+def _team_edited(_mapper: Any, _connection: Any, target: Team) -> None:
     model_team_edited.send(target)
 
 
 @event.listens_for(Team, 'after_delete')
-def _team_deleted(_mapper, _connection, target):
+def _team_deleted(_mapper: Any, _connection: Any, target: Team) -> None:
     model_team_deleted.send(target)
 
 
 @event.listens_for(AccountEmail, 'after_insert')
-def _accountemail_new(_mapper, _connection, target):
+def _accountemail_new(_mapper: Any, _connection: Any, target: AccountEmail) -> None:
     model_accountemail_new.send(target)
 
 
 @event.listens_for(AccountEmail, 'after_update')
-def _accountemail_edited(_mapper, _connection, target):
+def _accountemail_edited(_mapper: Any, _connection: Any, target: AccountEmail) -> None:
     model_accountemail_edited.send(target)
 
 
 @event.listens_for(AccountEmail, 'after_delete')
-def _accountemail_deleted(_mapper, _connection, target):
+def _accountemail_deleted(_mapper: Any, _connection: Any, target: AccountEmail) -> None:
     model_accountemail_deleted.send(target)
 
 
 @event.listens_for(AccountEmailClaim, 'after_insert')
-def _accountemailclaim_new(_mapper, _connection, target):
+def _accountemailclaim_new(
+    _mapper: Any, _connection: Any, target: AccountEmailClaim
+) -> None:
     model_accountemailclaim_new.send(target)
 
 
 @event.listens_for(AccountEmailClaim, 'after_update')
-def _accountemailclaim_edited(_mapper, _connection, target):
+def _accountemailclaim_edited(
+    _mapper: Any, _connection: Any, target: AccountEmailClaim
+) -> None:
     model_accountemailclaim_edited.send(target)
 
 
 @event.listens_for(AccountEmailClaim, 'after_delete')
-def _accountemailclaim_deleted(_mapper, _connection, target):
+def _accountemailclaim_deleted(
+    _mapper: Any, _connection: Any, target: AccountEmailClaim
+) -> None:
     model_accountemailclaim_deleted.send(target)
 
 
 @event.listens_for(AccountPhone, 'after_insert')
-def _accountphone_new(_mapper, _connection, target):
+def _accountphone_new(_mapper: Any, _connection: Any, target: AccountPhone) -> None:
     model_accountphone_new.send(target)
 
 
 @event.listens_for(AccountPhone, 'after_update')
-def _accountphone_edited(_mapper, _connection, target):
+def _accountphone_edited(_mapper: Any, _connection: Any, target: AccountPhone) -> None:
     model_accountphone_edited.send(target)
 
 
 @event.listens_for(AccountPhone, 'after_delete')
-def _accountphone_deleted(_mapper, _connection, target):
+def _accountphone_deleted(_mapper: Any, _connection: Any, target: AccountPhone) -> None:
     model_accountphone_deleted.send(target)
diff --git a/funnel/models/utils.py b/funnel/models/utils.py
index 3d7fa93f3..fb6014ef1 100644
--- a/funnel/models/utils.py
+++ b/funnel/models/utils.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Literal, NamedTuple, overload
+from typing import Literal, NamedTuple, TypeVar, overload
 
 import phonenumbers
 from sqlalchemy import PrimaryKeyConstraint, UniqueConstraint
@@ -16,10 +16,10 @@
     AccountExternalId,
     AccountPhone,
     Anchor,
-    Model,
-    db,
 )
+from .base import Model, db, sa
 from .phone_number import PHONE_LOOKUP_REGIONS
+from .typing import ModelIdProtocol
 
 __all__ = [
     'IncompleteUserMigrationError',
@@ -89,7 +89,7 @@ def getuser(name: str, anchor: bool = False) -> Account | AccountAndAnchor | Non
             return AccountAndAnchor(None, None)
         return None
     else:
-        # If it wasn't an email address or an @username, check if it's a phone number
+        # If it was not an email address or an @username, check if it's a phone number
         try:
             # Assume unprefixed numbers to be a local number in one of our supported
             # regions, in order of priority. Also see
@@ -107,9 +107,9 @@ def getuser(name: str, anchor: bool = False) -> Account | AccountAndAnchor | Non
                         if anchor:
                             return AccountAndAnchor(accountphone.account, accountphone)
                         return accountphone.account
-            # No matching accountphone? Continue to trying as a username
+            # No matching account phone? Continue to trying as a username
         except phonenumbers.NumberParseException:
-            # This was not a parseable phone number. Continue to trying as a username
+            # This was not a parsable phone number. Continue to trying as a username
             pass
 
     # Last guess: username
@@ -137,8 +137,15 @@ def getextid(service: str, userid: str) -> AccountExternalId | None:
     return AccountExternalId.get(service=service, userid=userid)
 
 
-def merge_accounts(current_account: Account, other_account: Account) -> Account | None:
+_A1 = TypeVar('_A1', bound=Account)
+_A2 = TypeVar('_A2', bound=Account)
+
+
+def merge_accounts(current_account: _A1, other_account: _A2) -> _A1 | _A2 | None:
     """Merge two user accounts and return the new user account."""
+    keep_account: _A1 | _A2
+    merge_account: _A1 | _A2
+
     app.logger.info(
         "Preparing to merge accounts %s and %s", current_account, other_account
     )
@@ -156,7 +163,7 @@ def merge_accounts(current_account: Account, other_account: Account) -> Account
     # keep_account.
     safe = do_migrate_instances(merge_account, keep_account, 'migrate_account')
     if safe:
-        # 2. Add merge_account's uuid to oldids and mark account as merged
+        # 2. Add merge_account's uuid to `oldids` and mark account as merged
         merge_account.mark_merged_into(keep_account)
         # 3. Transfer name and password if required
         if not keep_account.name:
@@ -188,8 +195,8 @@ def merge_accounts(current_account: Account, other_account: Account) -> Account
 
 
 def do_migrate_instances(
-    old_instance: Model,
-    new_instance: Model,
+    old_instance: ModelIdProtocol,
+    new_instance: ModelIdProtocol,
     helper_method: str | None = None,
 ) -> bool:
     """
@@ -211,7 +218,7 @@ def do_migrate_instances(
     migrated_tables: set[str] = set()
     safe_to_remove_instance = True
 
-    def do_migrate_table(table):
+    def do_migrate_table(table: sa.Table) -> bool:
         target_columns = []
         for column in table.columns:
             for fkey in column.foreign_keys:
@@ -270,8 +277,8 @@ def do_migrate_table(table):
         for column in target_columns:
             session.execute(
                 table.update()
-                .where(column == old_instance.id)
-                .values(**{column.name: new_instance.id})
+                .where(column == old_instance.id_)
+                .values(**{column.name: new_instance.id_})
             )
             session.flush()
 
diff --git a/funnel/models/venue.py b/funnel/models/venue.py
index 585dbd07b..23e6a1f00 100644
--- a/funnel/models/venue.py
+++ b/funnel/models/venue.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy.ext.orderinglist import OrderingList, ordering_list
 
 from coaster.sqlalchemy import add_primary_relationship, with_roles
 
-from . import (
+from .account import Account
+from .base import (
     BaseScopedNameMixin,
     CoordinatesMixin,
     Mapped,
@@ -14,54 +15,52 @@
     UuidMixin,
     relationship,
     sa,
+    sa_orm,
 )
-from .helpers import MarkdownCompositeBasic, reopen
+from .helpers import MarkdownCompositeBasic
 from .project import Project
 from .project_membership import project_child_role_map, project_child_role_set
 
 __all__ = ['Venue', 'VenueRoom']
 
 
-class Venue(UuidMixin, BaseScopedNameMixin, CoordinatesMixin, Model):
+class Venue(UuidMixin, BaseScopedNameMixin[int, Account], CoordinatesMixin, Model):
     __tablename__ = 'venue'
 
-    project_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('project.id'), nullable=False
+    project_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('project.id'), default=None, nullable=False
     )
     project: Mapped[Project] = with_roles(
-        relationship(Project, back_populates='venues'),
-        grants_via={None: project_child_role_map},
+        relationship(back_populates='venues'), grants_via={None: project_child_role_map}
     )
-    parent: Mapped[Project] = sa.orm.synonym('project')
+    parent: Mapped[Project] = sa_orm.synonym('project')
     description, description_text, description_html = MarkdownCompositeBasic.create(
         'description', default='', nullable=False
     )
-    address1: Mapped[str] = sa.orm.mapped_column(
+    address1: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(160), default='', nullable=False
     )
-    address2: Mapped[str] = sa.orm.mapped_column(
+    address2: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(160), default='', nullable=False
     )
-    city: Mapped[str] = sa.orm.mapped_column(sa.Unicode(30), default='', nullable=False)
-    state: Mapped[str] = sa.orm.mapped_column(
+    city: Mapped[str] = sa_orm.mapped_column(sa.Unicode(30), default='', nullable=False)
+    state: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(30), default='', nullable=False
     )
-    postcode: Mapped[str] = sa.orm.mapped_column(
+    postcode: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(20), default='', nullable=False
     )
-    country: Mapped[str] = sa.orm.mapped_column(
+    country: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(2), default='', nullable=False
     )
 
-    rooms: Mapped[list[VenueRoom]] = relationship(
-        'VenueRoom',
-        cascade='all',
-        order_by='VenueRoom.seq',
+    rooms: Mapped[OrderingList[VenueRoom]] = relationship(
+        order_by=lambda: VenueRoom.seq,
         collection_class=ordering_list('seq', count_from=1),
         back_populates='venue',
     )
 
-    seq: Mapped[int] = sa.orm.mapped_column(sa.Integer, nullable=False)
+    seq: Mapped[int] = sa_orm.mapped_column()
 
     __table_args__ = (sa.UniqueConstraint('project_id', 'name'),)
 
@@ -112,26 +111,35 @@ class Venue(UuidMixin, BaseScopedNameMixin, CoordinatesMixin, Model):
     }
 
 
-class VenueRoom(UuidMixin, BaseScopedNameMixin, Model):
+class VenueRoom(UuidMixin, BaseScopedNameMixin[int, Account], Model):
     __tablename__ = 'venue_room'
 
-    venue_id: Mapped[int] = sa.orm.mapped_column(
-        sa.Integer, sa.ForeignKey('venue.id'), nullable=False
+    venue_id: Mapped[int] = sa_orm.mapped_column(
+        sa.ForeignKey('venue.id'), default=None, nullable=False
     )
     venue: Mapped[Venue] = with_roles(
-        relationship(Venue, back_populates='rooms'),
+        relationship(back_populates='rooms'),
         # Since Venue already remaps Project roles, we just want the remapped role names
         grants_via={None: project_child_role_set},
     )
-    parent: Mapped[Venue] = sa.orm.synonym('venue')
+    parent: Mapped[Venue] = sa_orm.synonym('venue')
     description, description_text, description_html = MarkdownCompositeBasic.create(
         'description', default='', nullable=False
     )
-    bgcolor: Mapped[str] = sa.orm.mapped_column(
+    bgcolor: Mapped[str] = sa_orm.mapped_column(
         sa.Unicode(6), nullable=False, default='229922'
     )
 
-    seq: Mapped[int] = sa.orm.mapped_column(sa.Integer, nullable=False)
+    seq: Mapped[int] = sa_orm.mapped_column()
+
+    sessions: Mapped[list[Session]] = relationship(back_populates='venue_room')
+    scheduled_sessions: Mapped[list[Session]] = relationship(
+        primaryjoin=lambda: sa.and_(
+            Session.venue_room_id == VenueRoom.id,
+            Session.scheduled,  # type: ignore[has-type]  # FIXME
+        ),
+        viewonly=True,
+    )
 
     __table_args__ = (sa.UniqueConstraint('venue_id', 'name'),)
 
@@ -176,7 +184,7 @@ class VenueRoom(UuidMixin, BaseScopedNameMixin, Model):
     }
 
     @property
-    def scoped_name(self):
+    def scoped_name(self) -> str:
         return f'{self.parent.name}/{self.name}'
 
 
@@ -184,19 +192,5 @@ def scoped_name(self):
 with_roles(Project.primary_venue, read={'all'}, datasets={'primary', 'without_parent'})
 
 
-@reopen(Project)
-class __Project:
-    venues: Mapped[list[Venue]] = with_roles(
-        relationship(
-            Venue,
-            cascade='all',
-            order_by='Venue.seq',
-            collection_class=ordering_list('seq', count_from=1),
-            back_populates='project',
-        ),
-        read={'all'},
-    )
-
-    @property
-    def rooms(self):
-        return [room for venue in self.venues for room in venue.rooms]
+# Tail imports
+from .session import Session
diff --git a/funnel/models/video_mixin.py b/funnel/models/video_mixin.py
index 1775d2490..c53fc4eab 100644
--- a/funnel/models/video_mixin.py
+++ b/funnel/models/video_mixin.py
@@ -4,7 +4,7 @@
 
 from furl import furl
 
-from . import Mapped, declarative_mixin, sa
+from .base import Mapped, declarative_mixin, sa, sa_orm
 
 __all__ = ['VideoMixin', 'VideoError', 'parse_video_url']
 
@@ -75,8 +75,8 @@ def make_video_url(video_source: str, video_id: str) -> str:
 
 @declarative_mixin
 class VideoMixin:
-    video_id: Mapped[str | None] = sa.orm.mapped_column(sa.UnicodeText, nullable=True)
-    video_source: Mapped[str | None] = sa.orm.mapped_column(
+    video_id: Mapped[str | None] = sa_orm.mapped_column(sa.UnicodeText, nullable=True)
+    video_source: Mapped[str | None] = sa_orm.mapped_column(
         sa.UnicodeText, nullable=True
     )
 
@@ -87,7 +87,7 @@ def video_url(self) -> str | None:
         return None
 
     @video_url.setter
-    def video_url(self, value: str):
+    def video_url(self, value: str) -> None:
         if not value:
             self.video_source, self.video_id = None, None
         else:
diff --git a/funnel/proxies/__init__.py b/funnel/proxies/__init__.py
index a698f1212..4c9908fd6 100644
--- a/funnel/proxies/__init__.py
+++ b/funnel/proxies/__init__.py
@@ -1,9 +1,11 @@
 """Proxies for run-time access."""
 
+from flask import Flask
+
 from .request import request_wants, response_varies
 
 
-def init_app(app):
+def init_app(app: Flask) -> None:
     """Make proxies available in Jinja templates."""
     app.jinja_env.globals['request_wants'] = request_wants
     app.after_request(response_varies)
diff --git a/funnel/proxies/request.py b/funnel/proxies/request.py
index c709ebb7a..38c66548d 100644
--- a/funnel/proxies/request.py
+++ b/funnel/proxies/request.py
@@ -4,9 +4,10 @@
 
 from collections.abc import Callable
 from functools import wraps
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 from flask import has_request_context, request
+from flask.globals import request_ctx
 from werkzeug.local import LocalProxy
 from werkzeug.utils import cached_property
 
@@ -121,25 +122,23 @@ def hx_prompt(self) -> str | None:
 
         def _get_current_object(self) -> RequestWants:
             """Type hint for the LocalProxy wrapper method."""
+            return self
 
 
 def _get_request_wants() -> RequestWants:
     """Get request_wants from the request."""
-    # Flask 2.0 deprecated use of _request_ctx_stack.top and recommends using `g`.
-    # However, `g` is not suitable for us as we must cache results for a request only.
-    # Therefore we stick it in the request object itself.
     if has_request_context():
         # pylint: disable=protected-access
-        wants = getattr(request, '_request_wants', None)
+        wants = getattr(request_ctx, 'request_wants', None)
         if wants is None:
             wants = RequestWants()
-            request._request_wants = wants  # type: ignore[attr-defined]
+            request_ctx.request_wants = wants  # type: ignore[attr-defined]
         return wants
     # Return an empty handler
     return RequestWants()
 
 
-request_wants: RequestWants = LocalProxy(_get_request_wants)  # type: ignore[assignment]
+request_wants: RequestWants = cast(RequestWants, LocalProxy(_get_request_wants))
 
 
 def response_varies(response: ResponseType) -> ResponseType:
diff --git a/funnel/registry.py b/funnel/registry.py
index fe75600ea..3098ee147 100644
--- a/funnel/registry.py
+++ b/funnel/registry.py
@@ -7,7 +7,7 @@
 from collections.abc import Callable, Collection
 from dataclasses import dataclass
 from functools import wraps
-from typing import Any, NoReturn
+from typing import Any, cast
 
 from flask import Response, abort, jsonify, request
 from werkzeug.datastructures import MultiDict
@@ -16,7 +16,7 @@
 from baseframe.signals import exception_catchall
 
 from .models import AccountExternalId, AuthToken
-from .typing import P, ReturnResponse
+from .typing import ReturnResponse, ReturnView
 
 # Bearer token, as per
 # http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-15#section-2.1
@@ -32,7 +32,9 @@ def resource(
         description: str | None = None,
         trusted: bool = False,
         scope: str | None = None,
-    ) -> Callable[[Callable[P, Any]], Callable[[], ReturnResponse]]:
+    ) -> Callable[
+        [Callable[[AuthToken, MultiDict, MultiDict], Any]], Callable[[], ReturnResponse]
+    ]:
         """
         Decorate a resource function.
 
@@ -137,7 +139,7 @@ def wrapper() -> ReturnResponse:
                 'trusted': trusted,
                 'f': f,
             }
-            return wrapper
+            return cast(Callable[[], ReturnResponse], wrapper)
 
         return decorator
 
@@ -233,7 +235,7 @@ def __init__(
         secret: str,
         at_login: bool = True,
         icon: str | None = None,
-        **kwargs,
+        **kwargs: Any,
     ) -> None:
         self.name = name
         self.title = title
@@ -244,7 +246,7 @@ def __init__(
         for k, v in kwargs.items():
             setattr(self, k, v)
 
-    def do(self, callback_url: str) -> NoReturn:
+    def do(self, callback_url: str) -> ReturnView:
         """Initiate a login with this login provider."""
         raise NotImplementedError
 
diff --git a/funnel/templates/account_menu.html.jinja2 b/funnel/templates/account_menu.html.jinja2
index 4b533eba5..e864fde64 100644
--- a/funnel/templates/account_menu.html.jinja2
+++ b/funnel/templates/account_menu.html.jinja2
@@ -27,13 +27,32 @@
          class="header__dropdown__item header__dropdown__item--flex mui--text-dark nounderline mui--text-subhead mui--text-light"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='plus', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Add username{% endtrans %}</a>
     </li>
   {%- endif %}
-  {%- with orgmemlist = current_auth.user.views.recent_organization_memberships() %}
-    {%- if orgmemlist.recent|length -%}
+  <li>
+    <a href="{{ url_for('organizations') }}"
+       class="header__dropdown__item header__dropdown__item--flex mui--text-dark nounderline mui--text-subhead mui--text-light"
+       data-cy="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
+  </li>
+  {%- with orglist = current_auth.user.views.organizations_as_member %}
+    {%- for org in orglist %}
       <li>
-        <a href="{{ url_for('organizations') }}"
-           class="header__dropdown__item header__dropdown__item--flex mui--text-dark nounderline mui--text-subhead mui--text-light"
-           data-testid="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
+        <a href="{{ org.url_for() }}"
+           class="header__dropdown__item header__dropdown__item--flex header__dropdown__item--morepadding mui--text-dark nounderline" data-testid="org">
+          <span class="profile-avatar margin-right">
+            {%- if org.logo_url.url %}
+              <img src="{{ org.logo_url.resize(img_size.profile_logo_small) }}"
+                   alt="{{ org.title }}"/>
+            {% else %}
+              <img src="{{ url_for('static', filename='img/default-profile-logo.png') }}"
+                   alt="{{ org.title }}"/>
+            {% endif %}
+          </span>
+          <span class="mui--text-body2 profile-avatar-title profile-avatar-title--prewrap mui--text-dark">{{ org.title }}</span><span class="chip chip--bg-success margin-left text-bold mui--text-body2">{{ faicon(icon='crown-solid', baseline=true, icon_size='body2', css_class="mui--text-success fa-icon--right-margin") }}{% trans %}Member{% endtrans %}</span>
+        </a>
       </li>
+    {%- endfor %}
+  {%- endwith %}
+  {%- with orgmemlist = current_auth.user.views.recent_organization_memberships() %}
+    {%- if orgmemlist.recent|length -%}
       {%- for orgmem in orgmemlist.recent %}
         <li>
           <a href="{{ orgmem.account.url_for() }}"
@@ -81,13 +100,6 @@
       <a href="{{ url_for('notification_preferences') }}"
          class="header__dropdown__item header__dropdown__item--flex mui--text-subhead mui--text-light nounderline"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='bell', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Notification settings{% endtrans %}</a>
     </li>
-    {%- if not orgmemlist.recent|length -%}
-      <li>
-        <a href="{{ url_for('organizations') }}"
-           class="header__dropdown__item header__dropdown__item--flex mui--text-subhead mui--text-light nounderline"
-           data-testid="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='subhead', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
-      </li>
-    {%- endif %}
   {%- endwith %}
   <li>
     <a href="{{ url_for('saved') }}"
diff --git a/funnel/templates/index.html.jinja2 b/funnel/templates/index.html.jinja2
index 60504b759..f18854c81 100644
--- a/funnel/templates/index.html.jinja2
+++ b/funnel/templates/index.html.jinja2
@@ -76,7 +76,11 @@
           <ul class="grid projects flex-wrapper flex-wrapper--nowrap" role="list">
             {% for account in featured_accounts %}
               <li class="grid__col-12 grid-no-right-padding" role="listitem">
-                {{ profilecard(account) }}
+                {%- if account.current_roles.member %}
+                  {{ profilecard(account, snippet_html=false, is_member=true) }}
+                {%- else %}
+                  {{ profilecard(account) }}
+                {% endif %}
               </li>
             {%- endfor -%}
           </ul>
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 173521eee..2731129ab 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -446,7 +446,7 @@
   {%- endif %}
 {%- endmacro %}
 
-{% macro profilecard(account, snippet_html) %}
+{% macro profilecard(account, snippet_html, is_member) %}
   <div class="card profile-card">
     <div class="card__body">
       <div>
@@ -465,6 +465,9 @@
       {%- if snippet_html %}
         <p class="mui--text-body2 mui--text-light zero-top-margin search-snippets">{{ faicon(icon='search', css_class="search-icon", baseline=false) }} {{ snippet_html }}</p>
       {% endif %}
+      {%- if is_member %}
+        <div class="mui--text-dark mui--text-subhead text-bold nounderline margin-auto"><span class="chip chip--bg-success text-bold">{{ faicon(icon='crown-solid', baseline=true, css_class="mui--text-success fa-icon--right-margin") }}{% trans %}Member{% endtrans %}</span></div>
+      {% endif %}
       <div class="profile-card__btn-wrapper">
         <p class=" mui--text-center mui--text-caption mui--text-light top-padding margin-bottom">{% trans tcount=account.published_project_count, count=account.published_project_count|numberformat %}One project{% pluralize tcount %}{{ count }} projects{% endtrans %}</p>
         <a class="mui-btn mui-btn--primary mui-btn--raised full-width-btn" href="{{ account.url_for() }} ">{% trans %}Explore{% endtrans %}</a>
diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2
index f31a831a7..ccc05a963 100644
--- a/funnel/templates/project_layout.html.jinja2
+++ b/funnel/templates/project_layout.html.jinja2
@@ -51,7 +51,7 @@
 
 {% macro project_header(project) %}
   {%- if project.livestream_urls %}
-    {% if (project.is_restricted_video and project.current_roles.participant) or not project.is_restricted_video %}
+    {% if (project.is_restricted_video and project.current_roles.account_member) or not project.is_restricted_video %}
       <div class="livestream-box project-banner__left" id="livestream">
         {% if project.livestream_urls|length >= 2 %}
         <ul class="mui-tabs__bar project-banner__box" role="tablist">
@@ -86,12 +86,15 @@
     {%- else %}
       <div class="project-banner__box project-banner__box--banner project-banner__left  subproject-page__hide">
         <div class="bg-primary-dark embed-video-wrapper">
-          <div class="video_txt">
-            <p class="video__thumbnail__icon">{{ faicon(icon='lock-alt', icon_size='headline', baseline=false) }}</p>
-            <p class="mui--text-title mui--text-light">{% trans -%}
-            The livestream is for members only. If you are a member, login with the
-            email address on your membership.
-            {%- endtrans %}</p>
+          <div class="embed-video-wrapper__restricted">
+            <img src="{{ url_for('static', filename='img/error-403.svg') }}" class="embed-video-wrapper__restricted__img" alt="{% trans %}Unavailable{% endtrans %}"/>
+            <div class="embed-video-wrapper__restricted__content">
+              <p class="embed-video-wrapper__restricted__content__text margin-bottom">{% trans -%}This livestream is restricted{%- endtrans %}</p>
+              <div class="register-block">{{ buy_button(project, false) }}</div>
+            </div>
+          </div>
+          <div class="embed-video-wrapper__bottom-note">
+            <p class="mui--text-caption mui--text-light text-italics zero-bottom-margin">{% trans -%}Already a member? Login with your membership email address{%- endtrans %}</p>
           </div>
         </div>
       </div>
@@ -125,7 +128,7 @@
           </a>
         {% endif %}
         <a href="{{ project.account.url_for() }}" class="mui--text-dark mui--text-subhead text-bold nounderline project-banner__profile-details__text" data-testid="profile-link">{{ project.account.title }}</a>
-        {% if project.features.subscription and project.current_roles.participant %}
+        {% if project.features.subscription and project.current_roles.account_member %}
           <span class="chip chip--bg-success project-banner__profile-details__badge text-bold">{{ faicon(icon='crown-solid', baseline=true, css_class="mui--text-success fa-icon--right-margin") }}{% trans %}Member{% endtrans %}</span>
         {% elif project.features.subscription %}
           <span class="chip project-banner__profile-details__badge text-bold">{{ faicon(icon='lock-alt', baseline=true, css_class="fa-icon--right-margin") }}{% trans %}For members{% endtrans %}</span>
@@ -137,6 +140,21 @@
   </div>
 {% endmacro %}
 
+{% macro buy_button(project, include_eyebrow_text=true) %}
+  <div class="register-block__content">
+    {% if include_eyebrow_text %}<span class="register-block__content__txt mui--text-light">{% trans %}Hybrid access (members only){% endtrans %}</span>{% endif %}
+    <button class="js-open-ticket-widget register-block__btn mui-btn mui-btn--primary">
+      {% if project.features.subscription %}
+        <span class="register-block__btn__txt" data-cy="buy-membership">{% trans %}Become a member{% endtrans %}</span>
+      {%- else %}
+        <span class="register-block__btn__txt" data-cy="buy-ticket">{% trans %}Get tickets{% endtrans %}</span>
+      {% endif %}
+      <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt js-tickets-available"><span class="js-ticket-price"></span></span>
+      <span class="register-block__btn__txt register-block__btn__txt--smaller mui--text-light js-tickets-not-available mui--hide">{% trans %}Sales closed{% endtrans %}</span>
+    </button>
+  </div>
+{% endmacro %}
+
 {% macro registerblock(project) %}
   <div class="register-block">
     {%- if project.features.rsvp_registered %}
@@ -167,7 +185,7 @@
         {%- if current_auth.is_anonymous %}
           <a class="mui-btn mui-btn--raised {% if project.features.show_tickets %} mui-btn--dark {%- else %} mui-btn--primary {%- endif %} register-block__btn" id="register-nav" href="{{ url_for('login', next=request.path + '#register-modal', modal='register-modal') }}" rel="modal:open" aria-haspopup="true" data-register-modal="register-modal">{{ project.views.register_button_text() }}</a>
         {% elif project.features.rsvp_unregistered -%}
-          {% if not project.features.follow_mode and not project.features.rsvp_for_members %}<span class="register-block__content__txt mui--text-light">{% trans %}This is a free event{% endtrans %}</span>{% endif %}
+          {% if not project.features.follow_mode and not project.features.rsvp_for_members %}<span class="register-block__content__txt mui--text-light">{% trans %}In-person access (free){% endtrans %}</span>{% endif %}
           <a id="rsvp-btn" class="mui-btn mui-btn--raised mui-btn--dark register-block__btn js-register-btn" href="{{ project.url_for('rsvp_modal') }}" rel="modal:open" role="button" aria-haspopup="true" data-testid="member-rsvp">
             <span class="register-block__btn__txt" data-testid="unregistered">{{ project.views.register_button_text() }}</span>
             <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt">{{ project.views.registration_text() }}</span>
@@ -186,17 +204,7 @@
     {% if project.current_roles.account_member %}
       <div class="register-block__content"><button class="mui-btn mui-btn--accent register-block__btn mui--is-disabled" data-testid="project-member">{% trans %}You are a member{% endtrans %}</button></div>
     {% elif project.features.show_tickets %}
-      <div class="register-block__content">
-          <button class="js-open-ticket-widget register-block__btn mui-btn mui-btn--primary">
-            {% if project.features.subscription %}
-              <span class="register-block__btn__txt" data-testid="unregistered">{% trans %}Join{% endtrans %}</span>
-            {%- else %}
-              <span class="register-block__btn__txt" data-testid="unregistered">{% trans %}Get tickets{% endtrans %}</span>
-            {% endif %}
-            <span class="register-block__btn__txt register-block__btn__txt--smaller primary-color-lighter-txt js-tickets-available"><span class="js-ticket-price"></span></span>
-            <span class="register-block__btn__txt register-block__btn__txt--smaller mui--text-light js-tickets-not-available mui--hide">{% trans %}Sales closed{% endtrans %}</span>
-          </button>
-      </div>
+      {{ buy_button(project) }}
     {%- endif %}
   </div>
 {% endmacro %}
diff --git a/funnel/templates/rsvp_modal.html.jinja2 b/funnel/templates/rsvp_modal.html.jinja2
index f432fba0d..2624fc21b 100644
--- a/funnel/templates/rsvp_modal.html.jinja2
+++ b/funnel/templates/rsvp_modal.html.jinja2
@@ -1,3 +1,4 @@
+{% from "forms.html.jinja2" import ajaxform %}
 {% from "macros.html.jinja2" import faicon, csrf_tag %}
 {%- from "js/json_form.js.jinja2" import json_form_template %}
 
@@ -22,6 +23,7 @@
   {{ json_form_template() }}
 </div>
 <script src="{{ manifest('rsvp_form_modal.js') }}" type="text/javascript"></script>
+{{ ajaxform('rsvp-form', request) }}
 <script type="text/javascript">
   $(function() {
     var jsonSchema = {{ json_schema|tojson }};
diff --git a/funnel/transports/__init__.py b/funnel/transports/__init__.py
index 7fbcf41f9..311c30ea8 100644
--- a/funnel/transports/__init__.py
+++ b/funnel/transports/__init__.py
@@ -1,6 +1,7 @@
 """Transport layer for communication with users (email, SMS, others)."""
 
-from __future__ import annotations
+# This file is NOT autogenerated using `mkinit`. Beware when modifying Makefile's
+# `initpy` sections.
 
 from . import email, sms, telegram, webpush, whatsapp
 from .base import init, platform_transports
diff --git a/funnel/transports/base.py b/funnel/transports/base.py
index 22eb85d2a..5eb495e40 100644
--- a/funnel/transports/base.py
+++ b/funnel/transports/base.py
@@ -17,7 +17,7 @@
 }
 
 
-def init():
+def init() -> None:
     if app.config.get('MAIL_SERVER'):
         platform_transports['email'] = True
     if sms_init():
diff --git a/funnel/transports/email/__init__.py b/funnel/transports/email/__init__.py
index 8ed167abc..c35af226b 100644
--- a/funnel/transports/email/__init__.py
+++ b/funnel/transports/email/__init__.py
@@ -1,7 +1,26 @@
 """Email transport support."""
-# flake8: noqa
 
-from __future__ import annotations
+__protected__ = ['aws_ses']
 
-from . import aws_ses
-from .send import *
+# --- Everything below this line is auto-generated using `make initpy` -----------------
+
+from . import aws_ses, send
+from .send import (
+    EmailAttachment,
+    jsonld_confirm_action,
+    jsonld_event_reservation,
+    jsonld_view_action,
+    process_recipient,
+    send_email,
+)
+
+__all__ = [
+    "EmailAttachment",
+    "aws_ses",
+    "jsonld_confirm_action",
+    "jsonld_event_reservation",
+    "jsonld_view_action",
+    "process_recipient",
+    "send",
+    "send_email",
+]
diff --git a/funnel/transports/email/aws_ses/__init__.py b/funnel/transports/email/aws_ses/__init__.py
index a0c6c61e9..1f1bfcc43 100644
--- a/funnel/transports/email/aws_ses/__init__.py
+++ b/funnel/transports/email/aws_ses/__init__.py
@@ -1,7 +1,34 @@
 """AWS SES email support."""
-# flake8: noqa
 
-from __future__ import annotations
+# --- Everything below this line is auto-generated using `make initpy` -----------------
 
-from .ses_messages import *
-from .sns_notifications import *
+from . import ses_messages, sns_notifications
+from .ses_messages import (
+    SesBounce,
+    SesComplaint,
+    SesDelivery,
+    SesDeliveryDelay,
+    SesEvent,
+    SesProcessorAbc,
+)
+from .sns_notifications import (
+    SnsNotificationType,
+    SnsValidator,
+    SnsValidatorChecks,
+    SnsValidatorError,
+)
+
+__all__ = [
+    "SesBounce",
+    "SesComplaint",
+    "SesDelivery",
+    "SesDeliveryDelay",
+    "SesEvent",
+    "SesProcessorAbc",
+    "SnsNotificationType",
+    "SnsValidator",
+    "SnsValidatorChecks",
+    "SnsValidatorError",
+    "ses_messages",
+    "sns_notifications",
+]
diff --git a/funnel/transports/email/send.py b/funnel/transports/email/send.py
index a2de80964..c83e0b542 100644
--- a/funnel/transports/email/send.py
+++ b/funnel/transports/email/send.py
@@ -5,7 +5,7 @@
 import smtplib
 from dataclasses import dataclass
 from email.utils import formataddr, getaddresses, make_msgid, parseaddr
-from typing import Optional, Union
+from typing import Union
 
 from flask import current_app
 from flask_mailman import EmailMultiAlternatives
@@ -30,14 +30,14 @@
 ]
 
 # Email recipient type
-EmailRecipient = Union[Account, tuple[Optional[str], str], str]
+EmailRecipient = Union[Account, tuple[str | None, str], str]
 
 
 @dataclass
 class EmailAttachment:
     """An email attachment. Must have content, filename and mimetype."""
 
-    content: str
+    content: bytes
     filename: str
     mimetype: str
 
@@ -74,7 +74,6 @@ def jsonld_confirm_action(description: str, url: str, title: str) -> dict[str, o
 def jsonld_event_reservation(rsvp: Rsvp) -> dict[str, object]:
     """Schema.org JSON-LD markup for an event reservation."""
     location: str | dict[str, object]
-    event_mode: str
     venue = rsvp.project.primary_venue
     if venue is not None:
         location = {
@@ -91,13 +90,11 @@ def jsonld_event_reservation(rsvp: Rsvp) -> dict[str, object]:
                 'addressCountry': venue.country,
             }
             location['address'] = postal_address
-        event_mode = "https://schema.org/OfflineEventAttendanceMode"
     else:
         location = {
             "@type": "VirtualLocation",
             "url": rsvp.project.absolute_url,
         }
-        event_mode = "https://schema.org/OnlineEventAttendanceMode"
     return {
         '@context': 'https://schema.org',
         '@type': 'EventReservation',
@@ -109,7 +106,6 @@ def jsonld_event_reservation(rsvp: Rsvp) -> dict[str, object]:
             if rsvp.state.NO
             else 'https://schema.org/ReservationPending'
         ),
-        "eventAttendanceMode": event_mode,
         'underName': {
             '@type': 'Person',
             'name': rsvp.participant.fullname,
@@ -127,6 +123,7 @@ def jsonld_event_reservation(rsvp: Rsvp) -> dict[str, object]:
             },
         },
         'modifyReservationUrl': rsvp.project.absolute_url,
+        'modifiedTime': rsvp.updated_at,
         'numSeats': '1',
     }
 
diff --git a/funnel/transports/sms/__init__.py b/funnel/transports/sms/__init__.py
index 069fa32f8..1853bd7cf 100644
--- a/funnel/transports/sms/__init__.py
+++ b/funnel/transports/sms/__init__.py
@@ -1,7 +1,40 @@
 """SMS transport support."""
-# flake8: noqa
 
-from __future__ import annotations
+# --- Everything below this line is auto-generated using `make initpy` -----------------
 
-from .send import *
-from .template import *
+from . import send, template
+from .send import (
+    init,
+    make_exotel_token,
+    send_sms,
+    send_via_exotel,
+    send_via_twilio,
+    validate_exotel_token,
+)
+from .template import (
+    DLT_VAR_MAX_LENGTH,
+    MessageTemplate,
+    OneLineTemplate,
+    SmsPriority,
+    SmsTemplate,
+    TwoLineTemplate,
+    WebOtpTemplate,
+)
+
+__all__ = [
+    "DLT_VAR_MAX_LENGTH",
+    "MessageTemplate",
+    "OneLineTemplate",
+    "SmsPriority",
+    "SmsTemplate",
+    "TwoLineTemplate",
+    "WebOtpTemplate",
+    "init",
+    "make_exotel_token",
+    "send",
+    "send_sms",
+    "send_via_exotel",
+    "send_via_twilio",
+    "template",
+    "validate_exotel_token",
+]
diff --git a/funnel/transports/sms/template.py b/funnel/transports/sms/template.py
index 65b0d55bf..a9ae13af5 100644
--- a/funnel/transports/sms/template.py
+++ b/funnel/transports/sms/template.py
@@ -6,6 +6,7 @@
 from enum import Enum
 from re import Pattern
 from string import Formatter
+from types import SimpleNamespace
 from typing import Any, ClassVar, cast
 
 from flask import Flask
@@ -249,7 +250,9 @@ def __getattr__(self, attr: str) -> Any:
         try:
             return self._format_kwargs[attr]
         except KeyError as exc:
-            raise AttributeError(attr) from exc
+            raise AttributeError(
+                attr, name=attr, obj=SimpleNamespace(**self._format_kwargs)
+            ) from exc
 
     def __getitem__(self, key: str) -> Any:
         """Get a format variable via dictionary access, defaulting to ''."""
diff --git a/funnel/utils/__init__.py b/funnel/utils/__init__.py
index 4a71fe9c4..63973e7f4 100644
--- a/funnel/utils/__init__.py
+++ b/funnel/utils/__init__.py
@@ -1,6 +1,56 @@
 """Utility functions."""
-# flake8: noqa
 
-from .markdown import *
-from .misc import *
-from .mustache import *
+__ignore__ = ['base', 'escape', 'tabs']  # Unwanted exports from markdown sub-package
+
+# --- Everything below this line is auto-generated using `make initpy` -----------------
+
+from . import markdown, misc, mustache
+from .markdown import (
+    MarkdownConfig,
+    MarkdownPlugin,
+    MarkdownString,
+    markdown_basic,
+    markdown_document,
+    markdown_escape,
+    markdown_inline,
+    markdown_mailer,
+    mdit_plugins,
+)
+from .misc import (
+    abort_null,
+    blake2b160_hex,
+    extract_twitter_handle,
+    format_twitter_handle,
+    make_qrcode,
+    make_redirect_url,
+    mask_email,
+    mask_phone,
+    split_name,
+)
+from .mustache import mustache_html, mustache_md
+
+__all__ = [
+    "MarkdownConfig",
+    "MarkdownPlugin",
+    "MarkdownString",
+    "abort_null",
+    "blake2b160_hex",
+    "extract_twitter_handle",
+    "format_twitter_handle",
+    "make_qrcode",
+    "make_redirect_url",
+    "markdown",
+    "markdown_basic",
+    "markdown_document",
+    "markdown_escape",
+    "markdown_inline",
+    "markdown_mailer",
+    "mask_email",
+    "mask_phone",
+    "mdit_plugins",
+    "misc",
+    "mustache",
+    "mustache_html",
+    "mustache_md",
+    "split_name",
+]
diff --git a/funnel/utils/markdown/__init__.py b/funnel/utils/markdown/__init__.py
index d7a1fbcca..cff6615a0 100644
--- a/funnel/utils/markdown/__init__.py
+++ b/funnel/utils/markdown/__init__.py
@@ -1,5 +1,31 @@
 """Markdown parser using markdown-it-py."""
-# flake8: noqa
 
-from .base import *
-from .escape import *
+__protected__ = ['mdit_plugins', 'tabs']
+
+# --- Everything below this line is auto-generated using `make initpy` -----------------
+
+from . import base, escape, mdit_plugins, tabs
+from .base import (
+    MarkdownConfig,
+    MarkdownPlugin,
+    markdown_basic,
+    markdown_document,
+    markdown_inline,
+    markdown_mailer,
+)
+from .escape import MarkdownString, markdown_escape
+
+__all__ = [
+    "MarkdownConfig",
+    "MarkdownPlugin",
+    "MarkdownString",
+    "base",
+    "escape",
+    "markdown_basic",
+    "markdown_document",
+    "markdown_escape",
+    "markdown_inline",
+    "markdown_mailer",
+    "mdit_plugins",
+    "tabs",
+]
diff --git a/funnel/utils/markdown/base.py b/funnel/utils/markdown/base.py
index 960a67557..ea9aeed8c 100644
--- a/funnel/utils/markdown/base.py
+++ b/funnel/utils/markdown/base.py
@@ -53,7 +53,7 @@ class MarkdownPlugin:
     config: dict[str, Any] | None = None
 
     @classmethod
-    def register(cls, name: str, *args, **kwargs) -> Self:
+    def register(cls, name: str, *args: Any, **kwargs: Any) -> Self:
         """Create a new instance and add it to the registry."""
         if name in cls.registry:
             raise NameError(f"MarkdownPlugin {name} has already been registered")
@@ -103,7 +103,7 @@ def __post_init__(self) -> None:
             raise TypeError(f"Unknown Markdown plugin {exc.args[0]}") from None
 
     @classmethod
-    def register(cls, name: str, *args, **kwargs) -> Self:
+    def register(cls, name: str, *args: Any, **kwargs: Any) -> Self:
         """Create a new instance and add it to the registry."""
         if name in cls.registry:
             raise NameError(f"MarkdownConfig {name} has already been registered")
diff --git a/funnel/utils/markdown/escape.py b/funnel/utils/markdown/escape.py
index 208a8ed2b..12ca20e9d 100644
--- a/funnel/utils/markdown/escape.py
+++ b/funnel/utils/markdown/escape.py
@@ -6,22 +6,15 @@
 import string
 from collections.abc import Callable, Iterable, Mapping
 from functools import wraps
-from typing import Any, Concatenate, ParamSpec, Protocol, Self, SupportsIndex, TypeVar
+from typing import Any, Concatenate, ParamSpec, Self, SupportsIndex, TypeVar, cast
 
-__all__ = ['HasMarkdown', 'MarkdownString', 'markdown_escape']
+__all__ = ['MarkdownString', 'markdown_escape']
 
 
 _P = ParamSpec('_P')
 _ListOrDict = TypeVar('_ListOrDict', list, dict)
 
 
-class HasMarkdown(Protocol):
-    """Protocol for a class implementing :meth:`__markdown__`."""
-
-    def __markdown__(self) -> str:
-        """Return a Markdown string."""
-
-
 #: Based on the ASCII punctuation list in the CommonMark spec at
 #: https://spec.commonmark.org/0.30/#backslash-escapes
 markdown_escape_re = re.compile(r"""([\[\\\]{|}\(\)`~!@#$%^&*=+;:'"<>/,.?_-])""")
@@ -82,7 +75,9 @@ def __float__(self) -> float:
 
 
 def _escape_argspec(
-    obj: _ListOrDict, iterable: Iterable[Any], escape: Callable[[Any], MarkdownString]
+    obj: _ListOrDict,
+    iterable: Iterable[tuple[Any, object]],
+    escape: Callable[[Any], MarkdownString],
 ) -> _ListOrDict:
     """Escape all arguments."""
     for key, value in iterable:
@@ -93,15 +88,15 @@ def _escape_argspec(
 
 
 def _simple_escaping_wrapper(
-    func: Callable[Concatenate[str, _P], str]
-) -> Callable[Concatenate[MarkdownString, _P], MarkdownString]:
+    func: Callable[Concatenate[Any, _P], str]
+) -> Callable[Concatenate[Any, _P], MarkdownString]:
     @wraps(func)
     def wrapped(
         self: MarkdownString, *args: _P.args, **kwargs: _P.kwargs
     ) -> MarkdownString:
-        arg_list = _escape_argspec(list(args), enumerate(args), self.escape)
+        _escape_argspec(cast(list, args), enumerate(args), self.escape)
         _escape_argspec(kwargs, kwargs.items(), self.escape)
-        return self.__class__(func(self, *arg_list, **kwargs))
+        return self.__class__(func(self, *args, **kwargs))
 
     return wrapped
 
@@ -139,23 +134,23 @@ def unescape(self) -> str:
         return markdown_unescape_re.sub(r'\1', str(self))
 
     @classmethod
-    def escape(cls, text: str | HasMarkdown, silent: bool = True) -> Self:
+    def escape(cls, text: str, silent: bool = True) -> Self:
         """Escape a string, for internal use only. Use :func:`markdown_escape`."""
         if silent and text is None:
             return cls('')  # type: ignore[unreachable]
-        if hasattr(text, '__markdown__'):
-            return cls(text.__markdown__())
+        if callable(dunder_markdown := getattr(text, '__markdown__', None)):
+            return cls(dunder_markdown())
         return cls(markdown_escape_re.sub(r'\\\1', text))
 
     # These additional methods are borrowed from the implementation in markupsafe
 
-    def __add__(self, other: str | HasMarkdown) -> Self:
+    def __add__(self, other: Any) -> Self:
         if isinstance(other, str) or hasattr(other, '__markdown__'):
             return self.__class__(super().__add__(self.escape(other)))
 
         return NotImplemented
 
-    def __radd__(self, other: str | HasMarkdown) -> Self:
+    def __radd__(self, other: Any) -> Self:
         if isinstance(other, str) or hasattr(other, '__markdown__'):
             return self.escape(other).__add__(self)
 
@@ -186,7 +181,7 @@ def __mod__(self, arg: Any) -> Self:
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}({super().__repr__()})'
 
-    def join(self, iterable: Iterable[str | HasMarkdown]) -> Self:
+    def join(self, iterable: Iterable[str]) -> Self:
         return self.__class__(super().join(map(self.escape, iterable)))
 
     join.__doc__ = str.join.__doc__
@@ -212,7 +207,7 @@ def splitlines(  # type: ignore[override]
 
     splitlines.__doc__ = str.splitlines.__doc__
 
-    __getitem__ = _simple_escaping_wrapper(str.__getitem__)  # type: ignore[assignment]
+    __getitem__ = _simple_escaping_wrapper(str.__getitem__)
     capitalize = _simple_escaping_wrapper(str.capitalize)  # type: ignore[assignment]
     title = _simple_escaping_wrapper(str.title)  # type: ignore[assignment]
     lower = _simple_escaping_wrapper(str.lower)  # type: ignore[assignment]
diff --git a/funnel/utils/markdown/mdit_plugins/__init__.py b/funnel/utils/markdown/mdit_plugins/__init__.py
index e88dac2c3..f23520f59 100644
--- a/funnel/utils/markdown/mdit_plugins/__init__.py
+++ b/funnel/utils/markdown/mdit_plugins/__init__.py
@@ -1,14 +1,53 @@
 """Plugins for markdown-it-py."""
-# flake8: noqa
 
-from .abbr import *
-from .block_code_ext import *
-from .del_tag import *
-from .embeds import *
-from .footnote_ext import *
-from .heading_anchors_fix import *
-from .ins_tag import *
-from .mark_tag import *
-from .sub_tag import *
-from .sup_tag import *
-from .toc import *
+# --- Everything below this line is auto-generated using `make initpy` -----------------
+
+from . import (
+    abbr,
+    block_code_ext,
+    del_tag,
+    embeds,
+    footnote_ext,
+    heading_anchors_fix,
+    ins_tag,
+    mark_tag,
+    sub_tag,
+    sup_tag,
+    toc,
+)
+from .abbr import abbr_plugin
+from .block_code_ext import block_code_extend_plugin
+from .del_tag import del_plugin
+from .embeds import embeds_plugin
+from .footnote_ext import footnote_extend_plugin
+from .heading_anchors_fix import heading_anchors_fix_plugin
+from .ins_tag import ins_plugin
+from .mark_tag import mark_plugin
+from .sub_tag import sub_plugin
+from .sup_tag import sup_plugin
+from .toc import toc_plugin
+
+__all__ = [
+    "abbr",
+    "abbr_plugin",
+    "block_code_ext",
+    "block_code_extend_plugin",
+    "del_plugin",
+    "del_tag",
+    "embeds",
+    "embeds_plugin",
+    "footnote_ext",
+    "footnote_extend_plugin",
+    "heading_anchors_fix",
+    "heading_anchors_fix_plugin",
+    "ins_plugin",
+    "ins_tag",
+    "mark_plugin",
+    "mark_tag",
+    "sub_plugin",
+    "sub_tag",
+    "sup_plugin",
+    "sup_tag",
+    "toc",
+    "toc_plugin",
+]
diff --git a/funnel/utils/markdown/mdit_plugins/block_code_ext.py b/funnel/utils/markdown/mdit_plugins/block_code_ext.py
index 49ccf0726..c02cf170c 100644
--- a/funnel/utils/markdown/mdit_plugins/block_code_ext.py
+++ b/funnel/utils/markdown/mdit_plugins/block_code_ext.py
@@ -3,10 +3,14 @@
 from __future__ import annotations
 
 from collections.abc import MutableMapping, Sequence
+from typing import Any
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
+
+__all__ = ['block_code_extend_plugin']
 
 
 def fence(
@@ -33,7 +37,7 @@ def code_block(
     return output
 
 
-def block_code_extend_plugin(md: MarkdownIt, **opts) -> None:
+def block_code_extend_plugin(md: MarkdownIt, **opts: Any) -> None:
     """Add CSS class ``language-none`` for code fences with no language identifier."""
     md.add_render_rule('fence', fence)
     md.add_render_rule('code_block', code_block)
diff --git a/funnel/utils/markdown/mdit_plugins/del_tag.py b/funnel/utils/markdown/mdit_plugins/del_tag.py
index 7e29c1cf8..6a1583ae0 100644
--- a/funnel/utils/markdown/mdit_plugins/del_tag.py
+++ b/funnel/utils/markdown/mdit_plugins/del_tag.py
@@ -5,8 +5,9 @@
 from collections.abc import MutableMapping, Sequence
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 __all__ = ['del_plugin']
 
diff --git a/funnel/utils/markdown/mdit_plugins/embeds.py b/funnel/utils/markdown/mdit_plugins/embeds.py
index 95de85600..ebea0444e 100644
--- a/funnel/utils/markdown/mdit_plugins/embeds.py
+++ b/funnel/utils/markdown/mdit_plugins/embeds.py
@@ -13,9 +13,12 @@
 
 from markdown_it import MarkdownIt
 from markdown_it.common.utils import charCodeAt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_block import StateBlock
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
+
+__all__ = ['embeds_plugin']
 
 LOADING_PLACEHOLDER = {
     'markmap': 'Mindmap',
diff --git a/funnel/utils/markdown/mdit_plugins/footnote_ext.py b/funnel/utils/markdown/mdit_plugins/footnote_ext.py
index 2b48f986c..85bd41d02 100644
--- a/funnel/utils/markdown/mdit_plugins/footnote_ext.py
+++ b/funnel/utils/markdown/mdit_plugins/footnote_ext.py
@@ -3,12 +3,16 @@
 from __future__ import annotations
 
 from collections.abc import MutableMapping, Sequence
+from typing import Any
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 from mdit_py_plugins.footnote.index import render_footnote_caption
 
+__all__ = ['footnote_extend_plugin']
+
 
 def caption(
     renderer: RendererHTML,
@@ -21,7 +25,7 @@ def caption(
     return output.replace('[', '').replace(']', '')
 
 
-def footnote_extend_plugin(md: MarkdownIt, **opts) -> None:
+def footnote_extend_plugin(md: MarkdownIt, **opts: Any) -> None:
     if 'footnote_ref' not in md.get_active_rules()['inline']:
         return
     md.add_render_rule('footnote_caption', caption)
diff --git a/funnel/utils/markdown/mdit_plugins/heading_anchors_fix.py b/funnel/utils/markdown/mdit_plugins/heading_anchors_fix.py
index be19ed338..38470045e 100644
--- a/funnel/utils/markdown/mdit_plugins/heading_anchors_fix.py
+++ b/funnel/utils/markdown/mdit_plugins/heading_anchors_fix.py
@@ -2,44 +2,48 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from markdown_it import MarkdownIt
 from markdown_it.rules_core import StateCore
+from markdown_it.token import Token
 
 __all__ = ['heading_anchors_fix_plugin']
 
 
 def heading_anchors_fix(state: StateCore) -> None:
-    prev_token = None
+    prev_token: Token | None = None
 
     for token in state.tokens:
         if prev_token is None:
             prev_token = token
             continue
-        if token.type == 'inline' and prev_token.type == 'heading_open':  # type: ignore[unreachable]
+        if token.type == 'inline' and prev_token.type == 'heading_open':
             tree = token.children
-            header_anchor_index = 0
-            for inline_token in tree:
-                if (
-                    inline_token.type == 'link_open'
-                    and inline_token.attrGet('class') == 'header-anchor'
-                ):
-                    break
-                header_anchor_index += 1
-            if header_anchor_index < len(tree):
-                popped = tree.pop(header_anchor_index)
-                tree.insert(0, popped)
-                anchor_index = 1
-                while anchor_index < len(tree) - 1:
-                    node = tree[anchor_index]
-                    if node.type in ['link_open', 'link_close']:
-                        tree.pop(anchor_index)
-                    else:
-                        anchor_index += 1
-                tree[0].attrs.pop('class')
-                tree.pop(len(tree) - 2)
+            if tree is not None:
+                header_anchor_index = 0
+                for inline_token in tree:
+                    if (
+                        inline_token.type == 'link_open'
+                        and inline_token.attrGet('class') == 'header-anchor'
+                    ):
+                        break
+                    header_anchor_index += 1
+                if header_anchor_index < len(tree):
+                    popped = tree.pop(header_anchor_index)
+                    tree.insert(0, popped)
+                    anchor_index = 1
+                    while anchor_index < len(tree) - 1:
+                        node = tree[anchor_index]
+                        if node.type in ['link_open', 'link_close']:
+                            tree.pop(anchor_index)
+                        else:
+                            anchor_index += 1
+                    tree[0].attrs.pop('class')
+                    tree.pop(len(tree) - 2)
         prev_token = token
 
 
-def heading_anchors_fix_plugin(md: MarkdownIt, **opts) -> None:
+def heading_anchors_fix_plugin(md: MarkdownIt, **opts: Any) -> None:
     if 'anchor' in md.get_active_rules()['core']:
         md.core.ruler.after('anchor', 'heading_anchors_fix', heading_anchors_fix)
diff --git a/funnel/utils/markdown/mdit_plugins/ins_tag.py b/funnel/utils/markdown/mdit_plugins/ins_tag.py
index f4087c7d2..d6076cfa6 100644
--- a/funnel/utils/markdown/mdit_plugins/ins_tag.py
+++ b/funnel/utils/markdown/mdit_plugins/ins_tag.py
@@ -9,10 +9,11 @@
 from collections.abc import MutableMapping, Sequence
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.rules_inline.state_inline import Delimiter
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 __all__ = ['ins_plugin']
 
diff --git a/funnel/utils/markdown/mdit_plugins/mark_tag.py b/funnel/utils/markdown/mdit_plugins/mark_tag.py
index f2d2fb63a..c21801304 100644
--- a/funnel/utils/markdown/mdit_plugins/mark_tag.py
+++ b/funnel/utils/markdown/mdit_plugins/mark_tag.py
@@ -9,10 +9,11 @@
 from collections.abc import MutableMapping, Sequence
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.rules_inline.state_inline import Delimiter
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 __all__ = ['mark_plugin']
 
diff --git a/funnel/utils/markdown/mdit_plugins/sub_tag.py b/funnel/utils/markdown/mdit_plugins/sub_tag.py
index c70823eeb..582e131be 100644
--- a/funnel/utils/markdown/mdit_plugins/sub_tag.py
+++ b/funnel/utils/markdown/mdit_plugins/sub_tag.py
@@ -11,9 +11,10 @@
 from collections.abc import MutableMapping, Sequence
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 __all__ = ['sub_plugin']
 
diff --git a/funnel/utils/markdown/mdit_plugins/sup_tag.py b/funnel/utils/markdown/mdit_plugins/sup_tag.py
index 767892115..c60f97741 100644
--- a/funnel/utils/markdown/mdit_plugins/sup_tag.py
+++ b/funnel/utils/markdown/mdit_plugins/sup_tag.py
@@ -11,9 +11,10 @@
 from collections.abc import MutableMapping, Sequence
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 __all__ = ['sup_plugin']
 
diff --git a/funnel/utils/markdown/mdit_plugins/toc.py b/funnel/utils/markdown/mdit_plugins/toc.py
index 221736060..d7f07d61e 100644
--- a/funnel/utils/markdown/mdit_plugins/toc.py
+++ b/funnel/utils/markdown/mdit_plugins/toc.py
@@ -15,13 +15,14 @@
 import re
 from collections.abc import MutableMapping, Sequence
 from functools import reduce
-from typing import TypedDict
+from typing import Any, TypedDict
 
 from markdown_it import MarkdownIt
-from markdown_it.renderer import OptionsDict, RendererHTML
+from markdown_it.renderer import RendererHTML
 from markdown_it.rules_core import StateCore
 from markdown_it.rules_inline import StateInline
 from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
 
 from coaster.utils import make_name
 
@@ -188,7 +189,7 @@ def toc_item_to_html(item: TocItem, options: dict, md: MarkdownIt) -> str:
     return html
 
 
-def toc_plugin(md: MarkdownIt, **opts) -> None:
+def toc_plugin(md: MarkdownIt, **opts: Any) -> None:
     opts = {
         **defaults,
         **opts,
diff --git a/funnel/utils/misc.py b/funnel/utils/misc.py
index 99a3b36fd..11388698c 100644
--- a/funnel/utils/misc.py
+++ b/funnel/utils/misc.py
@@ -143,7 +143,7 @@ def extract_twitter_handle(handle: str) -> str | None:
     )
 
 
-def format_twitter_handle(handle: str) -> str:
+def format_twitter_handle(handle: str | None) -> str:
     """Format twitter handle as an @ mention."""
     return f"@{handle}" if handle else ""
 
diff --git a/funnel/views/account.py b/funnel/views/account.py
index a28a7f8bc..f9d96dcdb 100644
--- a/funnel/views/account.py
+++ b/funnel/views/account.py
@@ -21,11 +21,11 @@
 
 from baseframe import _, forms
 from baseframe.forms import render_delete_sqla, render_form, render_message
-from coaster.auth import current_auth
 from coaster.sqlalchemy import RoleAccessProxy
 from coaster.views import ClassView, get_next_url, render_with, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     AccountDeleteForm,
     AccountForm,
@@ -106,9 +106,8 @@ def user_locale(obj: Account) -> str:
 @Account.views('timezone')
 def user_timezone(obj: Account) -> str:
     """Human-friendly identifier for user's timezone, defaulting to timezone name."""
-    return timezone_identifiers.get(
-        str(obj.timezone) if obj.timezone else '', obj.timezone
-    )
+    timezone = str(u_tz) if (u_tz := obj.timezone) is not None else ''
+    return timezone_identifiers.get(timezone, timezone)
 
 
 @Account.views()
@@ -117,7 +116,7 @@ def organizations_as_admin(
     owner: bool = False,
     limit: int | None = None,
     order_by_grant: bool = False,
-) -> list[RoleAccessProxy]:
+) -> list[RoleAccessProxy[AccountMembership]]:
     """Return organizations that the user is an admin of."""
     if owner:
         orgmems = obj.active_organization_owner_memberships
@@ -139,7 +138,7 @@ def organizations_as_admin(
 @Account.views()
 def organizations_as_owner(
     obj: Account, limit: int | None = None, order_by_grant: bool = False
-) -> list[RoleAccessProxy]:
+) -> list[RoleAccessProxy[Account]]:
     """Return organizations that the user is an owner of."""
     return obj.views.organizations_as_admin(
         owner=True, limit=limit, order_by_grant=order_by_grant
@@ -173,6 +172,18 @@ def recent_organization_memberships(
     )
 
 
+@Account.views(cached_property=True)
+def organizations_as_member(obj: Account) -> list[RoleAccessProxy[Account]]:
+    """Return organizations that the user has a membership in."""
+    return [
+        acc.access_for(actor=obj, datasets=('primary', 'related'))
+        for acc in Account.query.filter(
+            Account.name_in(app.config['FEATURED_ACCOUNTS'])
+        ).all()
+        if 'member' in acc.roles_for(obj)
+    ]
+
+
 @Account.views('avatar_color_code', cached_property=True)
 def avatar_color_code(obj: Account) -> int:
     """Return a colour code for the user's autogenerated avatar image."""
@@ -278,20 +289,15 @@ def login_session_service(obj: LoginSession) -> str | None:
     return None
 
 
-@route('/account')
+@route('/account', init_app=app)
 class AccountView(ClassView):
     """Account management views."""
 
     __decorators__ = [requires_login]
 
-    obj: Account
     current_section = 'account'  # needed for showing active tab
     SavedProjectForm = SavedProjectForm
 
-    def loader(self, **kwargs) -> Account:
-        """Return current user."""
-        return current_auth.user
-
     @route('', endpoint='account')
     @render_with('account.html.jinja2')
     def account(self) -> ReturnRenderWith:
@@ -842,7 +848,7 @@ def remove_extid(self, service: str, userid: str) -> ReturnView:
 
     @route('delete', methods=['GET', 'POST'], endpoint='account_delete')
     @requires_sudo
-    def delete(self):
+    def delete(self) -> ReturnView:
         """Delete user account."""
         # Perform sanity checks: can this user account be deleted?
         objection = current_auth.user.views.validate_account_delete()
@@ -870,9 +876,6 @@ def delete(self):
         )
 
 
-AccountView.init_app(app)
-
-
 # --- Compatibility routes -------------------------------------------------------------
 
 
diff --git a/funnel/views/account_reset.py b/funnel/views/account_reset.py
index c945bd73c..3ee8fba35 100644
--- a/funnel/views/account_reset.py
+++ b/funnel/views/account_reset.py
@@ -109,7 +109,7 @@ def reset() -> ReturnView:
 
 @app.route('/account/reset/<token>')
 @requestargs(('cookietest', getbool))
-def reset_with_token(token: str, cookietest=False) -> ReturnView:
+def reset_with_token(token: str, cookietest: bool = False) -> ReturnView:
     """Move token into session cookie and redirect to a token-free URL."""
     if not cookietest:
         session['reset_token'] = token
diff --git a/funnel/views/api/account.py b/funnel/views/api/account.py
index fa386929c..0aebafe44 100644
--- a/funnel/views/api/account.py
+++ b/funnel/views/api/account.py
@@ -7,9 +7,9 @@
 from flask import request
 
 from baseframe import _
-from coaster.auth import current_auth
 
 from ... import app
+from ...auth import current_auth
 from ...forms import PasswordPolicyForm, UsernameAvailableForm
 from ...typing import ReturnView
 from ..helpers import progressive_rate_limit_validator, validate_rate_limit
@@ -19,7 +19,7 @@
 def password_policy_check() -> ReturnView:
     """Check if a password meets policy criteria (strength, embedded personal info)."""
     form = PasswordPolicyForm(edit_user=current_auth.user)
-    form.form_nonce.data = form.form_nonce.default()
+    form.form_nonce.data = form.form_nonce.get_default()
 
     if form.validate_on_submit():
         return {
@@ -78,7 +78,9 @@ def account_username_availability() -> ReturnView:
     # Allow user or source IP to check for up to 20 usernames every 10 minutes (600s)
     validate_rate_limit(
         'account_username-available',
-        current_auth.actor.uuid_b58 if current_auth.actor else request.remote_addr,
+        current_auth.actor.uuid_b58
+        if current_auth.actor
+        else (request.remote_addr or 'unknown-ipaddr'),
         # 20 username candidates
         20,
         # per every 10 minutes (600s)
diff --git a/funnel/views/api/geoname.py b/funnel/views/api/geoname.py
index 00c90c463..9d2db4715 100644
--- a/funnel/views/api/geoname.py
+++ b/funnel/views/api/geoname.py
@@ -2,22 +2,24 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 from coaster.utils import getbool
 from coaster.views import requestargs
 
 from ... import app
-from ...models import GeoName
-from ...typing import ReturnRenderWith
+from ...models import GeoName, db
+from ...typing import ReturnView
 
 
 @app.route('/api/1/geo/get_by_name')
 @requestargs('name', ('related', getbool), ('alternate_titles', getbool))
 def geo_get_by_name(
     name: str, related: bool = False, alternate_titles: bool = False
-) -> ReturnRenderWith:
+) -> ReturnView:
     """Get a geoname record given a single URL stub name or geoname id."""
     if name.isdigit():
-        geoname = GeoName.query.get(int(name))
+        geoname = db.session.get(GeoName, int(name))
     else:
         geoname = GeoName.get(name)
     return (
@@ -36,12 +38,12 @@ def geo_get_by_name(
 @requestargs('name[]', ('related', getbool), ('alternate_titles', getbool))
 def geo_get_by_names(
     name: list[str], related: bool = False, alternate_titles: bool = False
-) -> ReturnRenderWith:
+) -> ReturnView:
     """Get geoname records matching given URL stub names or geonameids."""
     geonames = []
     for n in name:
         if n.isdigit():
-            geoname = GeoName.query.get(int(n))
+            geoname = db.session.get(GeoName, int(n))
         else:
             geoname = GeoName.get(n)
         if geoname:
@@ -57,7 +59,7 @@ def geo_get_by_names(
 
 @app.route('/api/1/geo/get_by_title')
 @requestargs('title[]', 'lang')
-def geo_get_by_title(title: list[str], lang: str | None = None) -> ReturnRenderWith:
+def geo_get_by_title(title: list[str], lang: str | None = None) -> ReturnView:
     """Get locations matching given titles."""
     return {
         'status': 'ok',
@@ -73,9 +75,9 @@ def geo_parse_location(
     lang: str | None = None,
     bias: list[str] | None = None,
     alternate_titles: bool = False,
-) -> ReturnRenderWith:
+) -> ReturnView:
     """Parse locations from a string of locations."""
-    result = GeoName.parse_locations(q, special, lang, bias)
+    result = cast(list[dict], GeoName.parse_locations(q, special, lang, bias))
     for item in result:
         if 'geoname' in item:
             item['geoname'] = item['geoname'].as_dict(alternate_titles=alternate_titles)
@@ -84,9 +86,7 @@ def geo_parse_location(
 
 @app.route('/api/1/geo/autocomplete')
 @requestargs('q', 'lang', ('limit', int))
-def geo_autocomplete(
-    q: str, lang: str | None = None, limit: int = 100
-) -> ReturnRenderWith:
+def geo_autocomplete(q: str, lang: str | None = None, limit: int = 100) -> ReturnView:
     """Autocomplete a geoname record."""
     return {
         'status': 'ok',
diff --git a/funnel/views/api/oauth.py b/funnel/views/api/oauth.py
index 945ae619d..7362dcba7 100644
--- a/funnel/views/api/oauth.py
+++ b/funnel/views/api/oauth.py
@@ -2,17 +2,24 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
-from typing import Optional, cast
-
-from flask import get_flashed_messages, jsonify, redirect, render_template, request
+from collections.abc import Collection, Iterable
+from typing import Any, cast
+
+from flask import (
+    abort,
+    get_flashed_messages,
+    jsonify,
+    redirect,
+    render_template,
+    request,
+)
 
 from baseframe import _, forms
-from coaster.auth import current_auth
 from coaster.sqlalchemy import failsafe_add
 from coaster.utils import newsecret
 
 from ... import app
+from ...auth import current_auth
 from ...models import (
     Account,
     AuthClient,
@@ -178,8 +185,8 @@ def oauth_authorize() -> ReturnView:
     form = forms.Form()
 
     response_type = request.args.get('response_type')
-    client_id = cast(Optional[str], request.args.get('client_id'))
-    redirect_uri = cast(Optional[str], request.args.get('redirect_uri'))
+    client_id = request.args.get('client_id')
+    redirect_uri = request.args.get('redirect_uri')
     scope = cast(str, request.args.get('scope', '')).split(' ')
     state = cast(str, request.args.get('state', ''))
 
@@ -196,7 +203,11 @@ def oauth_authorize() -> ReturnView:
 
     # Validation 1.2.1: Is the client active?
     if not auth_client.active:
-        return oauth_auth_error(auth_client.redirect_uri, state, 'unauthorized_client')
+        if auth_client.redirect_uri:
+            return oauth_auth_error(
+                auth_client.redirect_uri, state, 'unauthorized_client'
+            )
+        abort(422)
 
     # Validation 1.3: Cross-check redirect_uri
     if not redirect_uri:
@@ -207,7 +218,7 @@ def oauth_authorize() -> ReturnView:
         redirect_uri
     ):
         return oauth_auth_error(
-            auth_client.redirect_uri,
+            redirect_uri,
             state,
             'invalid_request',
             _("Redirect URI hostname doesn't match"),
@@ -216,7 +227,7 @@ def oauth_authorize() -> ReturnView:
     # Validation 1.4: AuthClient allows access for this user
     if not auth_client.allow_access_for(current_auth.user):
         return oauth_auth_error(
-            auth_client.redirect_uri,
+            redirect_uri,
             state,
             'invalid_scope',
             _("You do not have access to this application"),
@@ -349,7 +360,7 @@ def oauth_token_error(
 def oauth_make_token(
     user: Account | None,
     auth_client: AuthClient,
-    scope: Iterable,
+    scope: Collection[str],
     login_session: LoginSession | None = None,
 ) -> AuthToken:
     """Make an OAuth2 token for the given user, client, scope and optional session."""
@@ -364,35 +375,32 @@ def oauth_make_token(
         if auth_client.confidential:
             if user is None:
                 raise ValueError("User not provided")
-            token = AuthToken(  # nosec
+            token = AuthToken(  # nosec B106
                 account=user, auth_client=auth_client, scope=scope, token_type='bearer'
             )
-            token = cast(
-                AuthToken,
-                failsafe_add(db.session, token, account=user, auth_client=auth_client),
+            token = failsafe_add(
+                db.session, token, account=user, auth_client=auth_client
             )
+
         elif login_session is not None:
-            token = AuthToken(  # nosec
+            token = AuthToken(  # nosec B106
                 login_session=login_session,
                 auth_client=auth_client,
                 scope=scope,
                 token_type='bearer',
             )
-            token = cast(
-                AuthToken,
-                failsafe_add(
-                    db.session,
-                    token,
-                    login_session=login_session,
-                    auth_client=auth_client,
-                ),
+            token = failsafe_add(
+                db.session,
+                token,
+                login_session=login_session,
+                auth_client=auth_client,
             )
         else:
             raise ValueError("login_session not provided")
     return token
 
 
-def oauth_token_success(token: AuthToken, **params) -> ReturnView:
+def oauth_token_success(token: AuthToken, **params: Any) -> ReturnView:
     """Return an OAuth2 token after successful validation and token generation."""
     params['access_token'] = token.token
     params['token_type'] = token.token_type
@@ -415,21 +423,18 @@ def oauth_token_success(token: AuthToken, **params) -> ReturnView:
 def oauth_token() -> ReturnView:
     """Provide token endpoint for OAuth2 server."""
     # Always required parameters
-    grant_type = cast(Optional[str], request.form.get('grant_type'))
+    grant_type = request.form.get('grant_type')
     auth_client = current_auth.auth_client  # Provided by @requires_client_login
     scope = request.form.get('scope', '').split(' ')
     # if grant_type == 'authorization_code' (POST)
-    code = cast(Optional[str], request.form.get('code'))
-    redirect_uri = cast(Optional[str], request.form.get('redirect_uri'))
+    code = request.form.get('code')
+    redirect_uri = request.form.get('redirect_uri')
     # if grant_type == 'password' (POST)
-    username = cast(Optional[str], request.form.get('username'))
-    password = cast(Optional[str], request.form.get('password'))
+    username = request.form.get('username')
+    password = request.form.get('password')
     # if grant_type == 'client_credentials'
-    buid = cast(
-        Optional[str],
-        # XXX: Deprecated userid parameter
-        request.form.get('buid') or request.form.get('userid'),
-    )
+    # XXX: Deprecated userid parameter
+    buid = request.form.get('buid') or request.form.get('userid')
 
     # Validations 1: Required parameters
     if not grant_type:
@@ -483,12 +488,12 @@ def oauth_token() -> ReturnView:
             db.session.delete(authcode)
             db.session.commit()
             return oauth_token_error('invalid_grant', _("Expired auth code"))
-        # Validations 3.1: scope in authcode
+        # Validations 3.1: scope in auth code
         if not scope or scope[0] == '':
             return oauth_token_error('invalid_scope', _("Scope is blank"))
         if not set(scope).issubset(set(authcode.scope)):
             return oauth_token_error('invalid_scope', _("Scope expanded"))
-        # Scope not exceeded. Use whatever the authcode allows
+        # Scope not exceeded. Use whatever the auth code allows
         scope = list(authcode.scope)
         if redirect_uri != authcode.redirect_uri:
             return oauth_token_error('invalid_client', _("redirect_uri does not match"))
diff --git a/funnel/views/api/resource.py b/funnel/views/api/resource.py
index 22226b961..ff108d445 100644
--- a/funnel/views/api/resource.py
+++ b/funnel/views/api/resource.py
@@ -3,17 +3,17 @@
 from __future__ import annotations
 
 from collections.abc import Container
-from typing import Any, Literal, cast
+from typing import Any, Literal
 
 from flask import abort, jsonify, render_template, request
 from werkzeug.datastructures import MultiDict
 
 from baseframe import __
-from coaster.auth import current_auth
 from coaster.utils import getbool
 from coaster.views import jsonp, requestargs
 
 from ... import app
+from ...auth import current_auth
 from ...models import (
     Account,
     AuthClient,
@@ -100,7 +100,9 @@ def get_userinfo(
     return userinfo
 
 
-def resource_error(error, description=None, uri=None) -> Response:
+def resource_error(
+    error: str, description: str | None = None, uri: str | None = None
+) -> Response:
     """Return an error response."""
     params = {'status': 'error', 'error': error}
     if description:
@@ -547,7 +549,7 @@ def resource_login_providers(
     response = {}
     for extid in authtoken.effective_user.externalids:
         if service is None or extid.service == service:
-            response[cast(str, extid.service)] = {
+            response[extid.service] = {
                 'userid': str(extid.userid),
                 'username': str(extid.username),
                 'oauth_token': str(extid.oauth_token),
diff --git a/funnel/views/api/shortlink.py b/funnel/views/api/shortlink.py
index 68c657d41..4a020a4f2 100644
--- a/funnel/views/api/shortlink.py
+++ b/funnel/views/api/shortlink.py
@@ -4,11 +4,11 @@
 from furl import furl
 
 from baseframe import _
-from coaster.auth import current_auth
 from coaster.utils import getbool
 from coaster.views import requestform
 
 from ... import app, shortlinkapp
+from ...auth import current_auth
 from ...models import Shortlink, db
 from ..helpers import app_url_for, validate_is_app_url
 
diff --git a/funnel/views/api/sms_events.py b/funnel/views/api/sms_events.py
index 22053843d..932db32aa 100644
--- a/funnel/views/api/sms_events.py
+++ b/funnel/views/api/sms_events.py
@@ -9,10 +9,10 @@
 
 from ... import app
 from ...models import (
-    SMS_STATUS,
     PhoneNumber,
     PhoneNumberError,
     SmsMessage,
+    SmsStatusEnum,
     canonical_phone_number,
     db,
     sa,
@@ -69,26 +69,26 @@ def process_twilio_event() -> ReturnView:
 
     if request.form['MessageStatus'] == 'queued':
         if sms_message:
-            sms_message.status = SMS_STATUS.QUEUED
+            sms_message.status = SmsStatusEnum.QUEUED
     elif request.form['MessageStatus'] == 'sent':
         if phone_number:
             phone_number.msg_sms_sent_at = sa.func.utcnow()
         if sms_message:
-            sms_message.status = SMS_STATUS.PENDING
+            sms_message.status = SmsStatusEnum.PENDING
     elif request.form['MessageStatus'] == 'failed':
         if phone_number:
             phone_number.msg_sms_failed_at = sa.func.utcnow()
         if sms_message:
-            sms_message.status = SMS_STATUS.FAILED
+            sms_message.status = SmsStatusEnum.FAILED
     elif request.form['MessageStatus'] == 'delivered':
         if phone_number:
             phone_number.msg_sms_delivered_at = sa.func.utcnow()
             phone_number.mark_has_sms(True)
         if sms_message:
-            sms_message.status = SMS_STATUS.DELIVERED
+            sms_message.status = SmsStatusEnum.DELIVERED
     else:
         if sms_message:
-            sms_message.status = SMS_STATUS.UNKNOWN
+            sms_message.status = SmsStatusEnum.UNKNOWN
     db.session.commit()
 
     current_app.logger.info(
@@ -158,26 +158,26 @@ def process_exotel_event(secret_token: str) -> ReturnView:
 
     if request.form['Status'] == 'queued':
         if sms_message:
-            sms_message.status = SMS_STATUS.QUEUED
+            sms_message.status = SmsStatusEnum.QUEUED
     elif request.form['Status'] in ('sending', 'submitted'):
         if phone_number:
             phone_number.msg_sms_sent_at = sa.func.utcnow()
         if sms_message:
-            sms_message.status = SMS_STATUS.PENDING
+            sms_message.status = SmsStatusEnum.PENDING
     elif request.form['Status'] in ('failed', 'failed_dnd'):
         if phone_number:
             phone_number.msg_sms_failed_at = sa.func.utcnow()
         if sms_message:
-            sms_message.status = SMS_STATUS.FAILED
+            sms_message.status = SmsStatusEnum.FAILED
     elif request.form['Status'] == 'sent':
         if phone_number:
             phone_number.msg_sms_delivered_at = sa.func.utcnow()
             phone_number.mark_has_sms(True)
         if sms_message:
-            sms_message.status = SMS_STATUS.DELIVERED
+            sms_message.status = SmsStatusEnum.DELIVERED
     else:
         if sms_message:
-            sms_message.status = SMS_STATUS.UNKNOWN
+            sms_message.status = SmsStatusEnum.UNKNOWN
     db.session.commit()
 
     current_app.logger.info(
diff --git a/funnel/views/api/support.py b/funnel/views/api/support.py
index d495ae2af..6a314cf39 100644
--- a/funnel/views/api/support.py
+++ b/funnel/views/api/support.py
@@ -52,7 +52,7 @@ def support_callerid(number: str) -> tuple[dict[str, Any], int]:
             'error_description': _("Unknown phone number"),
         }, 422
 
-    info = {
+    info: dict[str, Any] = {
         'number': phone_number.number,
         'created_at': phone_number.created_at,
         'active_at': phone_number.active_at,
diff --git a/funnel/views/auth_client.py b/funnel/views/auth_client.py
index 558d526c2..364ff9c9b 100644
--- a/funnel/views/auth_client.py
+++ b/funnel/views/auth_client.py
@@ -6,7 +6,6 @@
 
 from baseframe import _
 from baseframe.forms import render_delete_sqla, render_form
-from coaster.auth import current_auth
 from coaster.views import (
     ClassView,
     ModelView,
@@ -17,6 +16,7 @@
 )
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     AuthClientCredentialForm,
     AuthClientForm,
@@ -64,7 +64,7 @@ def available_client_owners() -> list[tuple[str, str]]:
     return choices
 
 
-@route('/apps/new', methods=['GET', 'POST'])
+@route('/apps/new', methods=['GET', 'POST'], init_app=app)
 class AuthClientCreateView(ClassView):
     @route('', endpoint='authclient_new')
     @requires_login
@@ -93,15 +93,10 @@ def new(self) -> ReturnView:
         )
 
 
-AuthClientCreateView.init_app(app)
-
-
 @AuthClient.views('main')
-@route('/apps/info/<client>')
-class AuthClientView(UrlForView, ModelView):
-    model = AuthClient
+@route('/apps/info/<client>', init_app=app)
+class AuthClientView(UrlForView, ModelView[AuthClient]):
     route_model_map = {'client': 'buid'}
-    obj: AuthClient
 
     def loader(self, client: str) -> AuthClient:
         return AuthClient.query.filter(AuthClient.buid == client).one_or_404()
@@ -255,17 +250,13 @@ def permission_user_new(self) -> ReturnView:
         )
 
 
-AuthClientView.init_app(app)
-
 # --- Routes: client credentials ----------------------------------------------
 
 
 @AuthClientCredential.views('main')
-@route('/apps/info/<client>/cred/<name>')
-class AuthClientCredentialView(UrlForView, ModelView):
-    model = AuthClientCredential
+@route('/apps/info/<client>/cred/<name>', init_app=app)
+class AuthClientCredentialView(UrlForView, ModelView[AuthClientCredential]):
     route_model_map = {'client': 'auth_client.buid', 'name': 'name'}
-    obj: AuthClientCredential
 
     def loader(self, client: str, name: str) -> AuthClientCredential:
         return (
@@ -290,18 +281,13 @@ def delete(self) -> ReturnView:
         )
 
 
-AuthClientCredentialView.init_app(app)
-
-
 # --- Routes: client app permissions ------------------------------------------
 
 
 @AuthClientPermissions.views('main')
-@route('/apps/info/<client>/perms/u/<account>')
-class AuthClientPermissionsView(UrlForView, ModelView):
-    model = AuthClientPermissions
+@route('/apps/info/<client>/perms/u/<account>', init_app=app)
+class AuthClientPermissionsView(UrlForView, ModelView[AuthClientPermissions]):
     route_model_map = {'client': 'auth_client.buid', 'account': 'account.buid'}
-    obj: AuthClientPermissions
 
     def loader(self, client: str, account: str) -> AuthClientPermissions:
         return (
@@ -363,22 +349,17 @@ def delete(self) -> ReturnView:
             ).format(
                 pname=self.obj.account.pickername, title=self.obj.auth_client.title
             ),
-            success=_("You have revoked permisions for user {pname}").format(
+            success=_("You have revoked permissions for user {pname}").format(
                 pname=self.obj.account.pickername
             ),
             next=self.obj.auth_client.url_for(),
         )
 
 
-AuthClientPermissionsView.init_app(app)
-
-
 @AuthClientTeamPermissions.views('main')
-@route('/apps/info/<client>/perms/t/<team>')
-class AuthClientTeamPermissionsView(UrlForView, ModelView):
-    model = AuthClientTeamPermissions
+@route('/apps/info/<client>/perms/t/<team>', init_app=app)
+class AuthClientTeamPermissionsView(UrlForView, ModelView[AuthClientTeamPermissions]):
     route_model_map = {'client': 'auth_client.buid', 'team': 'team.buid'}
-    obj: AuthClientTeamPermissions
 
     def loader(self, client: str, team: str) -> AuthClientTeamPermissions:
         return (
@@ -438,11 +419,8 @@ def delete(self) -> ReturnView:
             message=_(
                 "Remove all permissions assigned to team ‘{pname}’ for app ‘{title}’?"
             ).format(pname=self.obj.team.title, title=self.obj.auth_client.title),
-            success=_("You have revoked permisions for team {title}").format(
+            success=_("You have revoked permissions for team {title}").format(
                 title=self.obj.team.title
             ),
             next=self.obj.auth_client.url_for(),
         )
-
-
-AuthClientTeamPermissionsView.init_app(app)
diff --git a/funnel/views/auth_notify.py b/funnel/views/auth_notify.py
index 2162ee0e5..61ed7f03c 100644
--- a/funnel/views/auth_notify.py
+++ b/funnel/views/auth_notify.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from ..models import Account, AuthToken, LoginSession, Organization, Team
+from ..models import Account, AuthClient, AuthToken, LoginSession, Team
 from ..signals import (
     org_data_changed,
     session_revoked,
@@ -41,7 +41,7 @@ def notify_session_revoked(session: LoginSession) -> None:
 
 
 @user_data_changed.connect
-def notify_user_data_changed(user: Account, changes) -> None:
+def notify_user_data_changed(user: Account, changes: list[str]) -> None:
     """Send notifications to trusted auth clients about relevant user data changes."""
     if user_changes_to_notify & set(changes):
         # We have changes that apps need to hear about
@@ -93,7 +93,7 @@ def notify_user_data_changed(user: Account, changes) -> None:
 
 @org_data_changed.connect
 def notify_org_data_changed(
-    org: Organization, user: Account, changes, team: Team | None = None
+    org: Account, user: Account, changes: list[str], team: Team | None = None
 ) -> None:
     """
     Send notifications to trusted auth clients about org data changes.
@@ -101,7 +101,7 @@ def notify_org_data_changed(
     Like :func:`notify_user_data_changed`, except also looks at all other owners of this
     org to find apps that need to be notified.
     """
-    client_users = {}
+    client_users: dict[AuthClient, list[Account]] = {}
     for token in AuthToken.all(accounts=org.admin_users):
         if (
             token.auth_client.trusted
@@ -118,7 +118,7 @@ def notify_org_data_changed(
             notify_user = user
         else:
             notify_user = users[0]  # First user available
-        if auth_client.trusted:
+        if auth_client.trusted and auth_client.notification_uri:
             send_auth_client_notice.queue(
                 auth_client.notification_uri,
                 data={
@@ -133,7 +133,7 @@ def notify_org_data_changed(
 
 
 @team_data_changed.connect
-def notify_team_data_changed(team: Team, user: Account, changes) -> None:
+def notify_team_data_changed(team: Team, user: Account, changes: list[str]) -> None:
     """Notify :func:`notify_org_data_changed` for changes to the team."""
     notify_org_data_changed(
         team.account, user=user, changes=['team-' + c for c in changes], team=team
diff --git a/funnel/views/comment.py b/funnel/views/comment.py
index ccbebf2cc..2664645ae 100644
--- a/funnel/views/comment.py
+++ b/funnel/views/comment.py
@@ -6,7 +6,7 @@
 
 from baseframe import _, forms
 from baseframe.forms import Form, render_form
-from coaster.auth import current_auth
+from coaster.sqlalchemy import RoleAccessProxy
 from coaster.views import (
     ClassView,
     ModelView,
@@ -18,6 +18,7 @@
 )
 
 from .. import app
+from ..auth import current_auth
 from ..forms import CommentForm, CommentsetSubscribeForm
 from ..models import (
     Account,
@@ -63,7 +64,7 @@ def update_proposal_commentset_membership(
 
 
 @Comment.views('url')
-def comment_url(obj):
+def comment_url(obj: Comment) -> str | None:
     url = None
     commentset_url = obj.commentset.views.url()
     if commentset_url is not None:
@@ -72,7 +73,7 @@ def comment_url(obj):
 
 
 @Commentset.views('json_comments')
-def commentset_json(obj):
+def commentset_json(obj: Commentset) -> list[RoleAccessProxy[Comment]]:
     toplevel_comments = obj.toplevel_comments.order_by(Comment.created_at.desc())
     return [
         comment.current_access(datasets=('json', 'related'))
@@ -82,7 +83,7 @@ def commentset_json(obj):
 
 
 @Commentset.views('url')
-def parent_comments_url(obj):
+def parent_comments_url(obj: Commentset) -> str | None:
     url = None  # project or proposal object
     if obj.project is not None:
         url = obj.project.url_for('comments', _external=True)
@@ -92,14 +93,14 @@ def parent_comments_url(obj):
 
 
 @Commentset.views('last_comment', cached_property=True)
-def last_comment(obj: Commentset) -> Comment | None:
+def last_comment(obj: Commentset) -> RoleAccessProxy[Comment] | None:
     comment = obj.last_comment
     if comment:
         return comment.current_access(datasets=('primary', 'related'))
     return None
 
 
-@route('/comments')
+@route('/comments', init_app=app)
 class AllCommentsView(ClassView):
     """View for index of commentsets."""
 
@@ -143,9 +144,6 @@ def view(self, page: int = 1, per_page: int = 20) -> ReturnRenderWith:
         return result
 
 
-AllCommentsView.init_app(app)
-
-
 def do_post_comment(
     commentset: Commentset,
     actor: Account,
@@ -164,13 +162,11 @@ def do_post_comment(
     return comment
 
 
-@route('/comments/<commentset>')
-class CommentsetView(UrlForView, ModelView):
+@route('/comments/<commentset>', init_app=app)
+class CommentsetView(UrlForView, ModelView[Commentset]):
     """Views for commentset display within a host document."""
 
-    model = Commentset
     route_model_map = {'commentset': 'uuid_b58'}
-    obj: Commentset
 
     def loader(self, commentset: str) -> Commentset:
         return Commentset.query.filter(Commentset.uuid_b58 == commentset).one_or_404()
@@ -223,7 +219,7 @@ def new(self) -> ReturnView:
     @requires_login
     def subscribe(self) -> ReturnView:
         subscribe_form = CommentsetSubscribeForm()
-        subscribe_form.form_nonce.data = subscribe_form.form_nonce.default()
+        subscribe_form.form_nonce.data = subscribe_form.form_nonce.get_default()
         if subscribe_form.validate_on_submit():
             if subscribe_form.subscribe.data:
                 self.obj.add_subscriber(
@@ -269,38 +265,26 @@ def update_last_seen_at(self) -> ReturnRenderWith:
         }, 422
 
 
-CommentsetView.init_app(app)
-
-
-@route('/comments/<commentset>/<comment>')
-class CommentView(UrlForView, ModelView):
+@route('/comments/<commentset>/<comment>', init_app=app)
+class CommentView(UrlForView, ModelView[Comment]):
     """Views for a single comment."""
 
-    model = Comment
     route_model_map = {'commentset': 'commentset.uuid_b58', 'comment': 'uuid_b58'}
-    obj: Comment
 
-    def loader(self, commentset: str, comment: str) -> Comment | Commentset:
-        comment = (
+    def load(self, commentset: str, comment: str) -> ReturnView | None:
+        obj = (
             Comment.query.join(Commentset)
             .filter(Commentset.uuid_b58 == commentset, Comment.uuid_b58 == comment)
             .one_or_none()
         )
-        if comment is None:
-            # if the comment doesn't exist or deleted, return the commentset,
-            # `after_loader()` will redirect to the commentset instead.
-            return Commentset.query.filter(
-                Commentset.uuid_b58 == commentset
-            ).one_or_404()
-        return comment
-
-    def after_loader(self) -> ReturnView | None:
-        if isinstance(self.obj, Commentset):
-            flash(
-                _("That comment could not be found. It may have been deleted"), 'error'
-            )
-            return render_redirect(self.obj.url_for())
-        return super().after_loader()
+        if obj is not None:
+            self.obj = obj
+            return None
+        commentset_obj = Commentset.query.filter(
+            Commentset.uuid_b58 == commentset
+        ).one_or_404()
+        flash(_("That comment could not be found. It may have been deleted"), 'error')
+        return render_redirect(commentset_obj.url_for())
 
     @route('')
     @requires_roles({'reader'})
@@ -446,6 +430,3 @@ def report_spam(self) -> ReturnView:
             with_chrome=False,
         ).get_data(as_text=True)
         return {'status': 'ok', 'form': reportspamform_html}
-
-
-CommentView.init_app(app)
diff --git a/funnel/views/contact.py b/funnel/views/contact.py
index 43064c7ac..0d2b19f02 100644
--- a/funnel/views/contact.py
+++ b/funnel/views/contact.py
@@ -3,19 +3,21 @@
 from __future__ import annotations
 
 import csv
+from collections.abc import Iterable
 from datetime import datetime, timedelta
 from io import StringIO
 
 from flask import Response, current_app, render_template, request
+from pytz import BaseTzInfo
 from sqlalchemy.exc import IntegrityError
 
 from baseframe import _
-from coaster.auth import current_auth
 from coaster.utils import getbool, make_name, midnight_to_utc, utcnow
 from coaster.views import ClassView, render_with, requestargs, route
 
 from .. import app
-from ..models import ContactExchange, Project, TicketParticipant, db, sa
+from ..auth import current_auth
+from ..models import ContactExchange, Project, TicketParticipant, db, sa_orm
 from ..typing import ReturnRenderWith, ReturnView
 from ..utils import format_twitter_handle
 from .login_session import requires_login
@@ -31,14 +33,14 @@ def contact_details(ticket_participant: TicketParticipant) -> dict[str, str | No
     }
 
 
-@route('/account/contacts')
+@route('/account/contacts', init_app=app)
 class ContactView(ClassView):
     current_section = 'account'
 
-    def get_project(self, uuid_b58):
+    def get_project(self, uuid_b58: str) -> Project:
         return (
             Project.query.filter_by(uuid_b58=uuid_b58)
-            .options(sa.orm.load_only(Project.id, Project.uuid, Project.title))
+            .options(sa_orm.load_only(Project.id, Project.uuid, Project.title))
             .one_or_404()
         )
 
@@ -47,14 +49,16 @@ def get_project(self, uuid_b58):
     @render_with('contacts.html.jinja2')
     def contacts(self) -> ReturnRenderWith:
         """Return contacts grouped by project and date."""
-        archived = getbool(request.args.get('archived'))
+        archived = getbool(request.args.get('archived')) or False
         return {
             'contacts': ContactExchange.grouped_counts_for(
                 current_auth.user, archived=archived
             )
         }
 
-    def contacts_to_csv(self, contacts, timezone, filename):
+    def contacts_to_csv(
+        self, contacts: Iterable[ContactExchange], timezone: BaseTzInfo, filename: str
+    ) -> Response:
         """Return a CSV of given contacts."""
         outfile = StringIO(newline='')
         out = csv.writer(outfile)
@@ -104,7 +108,7 @@ def contacts_to_csv(self, contacts, timezone, filename):
     @requires_login
     def project_date_csv(self, uuid_b58: str, datestr: str) -> ReturnView:
         """Return contacts for a given project and date in CSV format."""
-        archived = getbool(request.args.get('archived'))
+        archived = getbool(request.args.get('archived')) or False
         project = self.get_project(uuid_b58)
         date = datetime.strptime(datestr, '%Y-%m-%d').date()
 
@@ -121,7 +125,7 @@ def project_date_csv(self, uuid_b58: str, datestr: str) -> ReturnView:
     @requires_login
     def project_csv(self, uuid_b58: str) -> ReturnView:
         """Return contacts for a given project in CSV format."""
-        archived = getbool(request.args.get('archived'))
+        archived = getbool(request.args.get('archived')) or False
         project = self.get_project(uuid_b58)
 
         contacts = ContactExchange.contacts_for_project(
@@ -182,6 +186,3 @@ def connect(self, puk: str, key: str) -> ReturnView:
             'error': '403',
             'message': _("Unauthorized contact exchange"),
         }, 403
-
-
-ContactView.init_app(app)
diff --git a/funnel/views/decorators.py b/funnel/views/decorators.py
index b4d98767a..b001c4adc 100644
--- a/funnel/views/decorators.py
+++ b/funnel/views/decorators.py
@@ -6,13 +6,12 @@
 from datetime import datetime, timedelta
 from functools import wraps
 from hashlib import blake2b
-from typing import cast
 
 from flask import Response, make_response, request, url_for
 
 from baseframe import cache
-from coaster.auth import current_auth
 
+from ..auth import current_auth
 from ..proxies import request_wants
 from ..typing import P, ReturnResponse, ReturnView, T
 from .helpers import compress_response, render_redirect
@@ -59,7 +58,7 @@ def etag_cache_for_user(
     timeout: int,
     max_age: int | None = None,
     query_params: set | None = None,
-) -> Callable[[Callable[P, ReturnView]], Callable[P, Response]]:
+) -> Callable[[Callable[P, ReturnView]], Callable[P, ReturnView]]:
     """
     Cache and compress a response, and add an ETag header for browser cache.
 
@@ -72,9 +71,9 @@ def etag_cache_for_user(
     if max_age is None:
         max_age = timeout
 
-    def decorator(f: Callable[P, ReturnView]) -> Callable[P, Response]:
+    def decorator(f: Callable[P, ReturnView]) -> Callable[P, ReturnView]:
         @wraps(f)
-        def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnResponse:
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnView:
             # No ETag or cache storage if the request is not GET or HEAD
             if request.method not in ('GET', 'HEAD'):
                 return f(*args, **kwargs)
@@ -87,7 +86,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnResponse:
             # Hash of request args, query parameters and common headers that influence
             # output. May need to be expanded to also add headers from Vary (which must
             # be specified in the decorator)
-            rhash = blake2b(
+            request_hash = blake2b(
                 '\n'.join(
                     [
                         request.headers.get('Accept', ''),
@@ -112,14 +111,12 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnResponse:
             ).hexdigest()
 
             # 2. Get existing data from cache. There may be multiple copies of data,
-            # for each distinct rhash. Look for the one matching our rhash
+            # for each distinct request_hash. Look for the one matching our request_hash
 
-            # XXX: Typing for cache.get is incorrectly specified as returning
-            # Optional[str]
-            cache_data: dict | None = cache.get(cache_key)  # type: ignore[assignment]
+            cache_data: dict | None = cache.get(cache_key)
             response_data = None
             if cache_data:
-                rhash_data = cache_data.get(rhash, {})
+                rhash_data = cache_data.get(request_hash, {})
                 try:
                     response_data = rhash_data['response_data']
                     content_encoding = rhash_data['content_encoding']
@@ -156,10 +153,10 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnResponse:
                 chash = blake2b(response.get_data()).hexdigest()
                 etag = blake2b(
                     f'{identifier}/{view_version}/{current_auth.user.uuid_b64}'
-                    f'/{chash}/{rhash}'.encode()
+                    f'/{chash}/{request_hash}'.encode()
                 ).hexdigest()
                 last_modified = datetime.utcnow()
-                cache_data[rhash] = {
+                cache_data[request_hash] = {
                     'response_data': response_data,
                     'content_encoding': content_encoding,
                     'cash': chash,
@@ -178,7 +175,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnResponse:
             response.cache_control.max_age = max_age
             response.expires = (
                 response.last_modified or datetime.utcnow()
-            ) + timedelta(seconds=cast(int, max_age))
+            ) + timedelta(seconds=max_age)
 
             return response.make_conditional(request)
 
diff --git a/funnel/views/errors.py b/funnel/views/errors.py
index 4d5eb550d..bdda81e7c 100644
--- a/funnel/views/errors.py
+++ b/funnel/views/errors.py
@@ -2,9 +2,12 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 from flask import current_app, json, redirect, render_template, request
 from werkzeug.exceptions import HTTPException, MethodNotAllowed, NotFound
 from werkzeug.routing import RequestRedirect
+from werkzeug.wrappers import Response
 
 from .. import app
 from ..models import db
@@ -27,7 +30,7 @@ def handle_error(exc: HTTPException) -> ReturnView:
     """Render all errors with a custom template."""
     db.session.rollback()
     json_response = request_wants.json or request.path.startswith('/api/')
-    response = exc.get_response()
+    response = cast(Response, exc.get_response())
     if json_response:
         response.data = json.dumps(
             {
diff --git a/funnel/views/helpers.py b/funnel/views/helpers.py
index c87755592..6ae6ebbb1 100644
--- a/funnel/views/helpers.py
+++ b/funnel/views/helpers.py
@@ -6,13 +6,13 @@
 import zlib
 import zoneinfo
 from base64 import urlsafe_b64encode
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from contextlib import nullcontext
 from datetime import datetime, timedelta
 from hashlib import blake2b
 from importlib import resources
 from os import urandom
-from typing import Any
+from typing import Any, ContextManager
 from urllib.parse import quote, unquote, urljoin, urlsplit
 
 import brotli
@@ -30,16 +30,17 @@
     url_for,
 )
 from furl import furl
-from pytz import timezone as pytz_timezone, utc
+from pytz import BaseTzInfo, timezone as pytz_timezone, utc
 from werkzeug.exceptions import MethodNotAllowed, NotFound
 from werkzeug.routing import BuildError, RequestRedirect
+from werkzeug.wrappers import Response as BaseResponse
 
 from baseframe import cache, statsd
-from coaster.auth import current_auth
 from coaster.sqlalchemy import RoleMixin
 from coaster.utils import utcnow
 
 from .. import app, shortlinkapp
+from ..auth import current_auth
 from ..forms import supported_locales
 from ..models import Account, Shortlink, db, profanity
 from ..proxies import request_wants
@@ -53,9 +54,11 @@
 # --- Timezone data --------------------------------------------------------------------
 
 # Get all known timezones from zoneinfo and make a lowercased lookup table
-valid_timezones = {tz.lower(): tz for tz in zoneinfo.available_timezones()}
+valid_timezones = {_tz.lower(): _tz for _tz in zoneinfo.available_timezones()}
 # Get timezone aliases from tzinfo.zi and place them in the lookup table
-with resources.open_text('tzdata.zoneinfo', 'tzdata.zi') as _tzdata:
+with (resources.files('tzdata.zoneinfo') / 'tzdata.zi').open(
+    'r', encoding='utf-8', errors='strict'
+) as _tzdata:
     for _tzline in _tzdata.readlines():
         if _tzline.startswith('L'):
             _tzlink, _tznew, _tzold = _tzline.strip().split()
@@ -71,7 +74,7 @@ class SessionTimeouts(dict[str, timedelta]):
     Use the :attr:`session_timeouts` instance instead of this class.
     """
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Create a dictionary that separately tracks {key}_at keys."""
         super().__init__(*args, **kwargs)
         self.keys_at = {f'{key}_at' for key in self.keys()}
@@ -90,19 +93,41 @@ def __delitem__(self, key: str) -> None:
         self.keys_at.remove(f'{key}_at')
         super().__delitem__(key)
 
-    def has_intersection(self, other: Any) -> bool:
+    def has_overlap_with(self, other: Mapping) -> bool:
         """Check for intersection with other dictionary-like object."""
         okeys = other.keys()
         return not (self.keys_at.isdisjoint(okeys) and self.keys().isdisjoint(okeys))
 
+    def crosscheck_session(self, response: ResponseType) -> ResponseType:
+        """Add timestamps to timed values in session, and remove expired values."""
+        # Process timestamps only if there is at least one match. Most requests will
+        # have no match.
+        if self.has_overlap_with(session):
+            now = utcnow()
+            for var, delta in self.items():
+                var_at = f'{var}_at'
+                if var in session:
+                    if var_at not in session:
+                        # Session has var but not timestamp, so add a timestamp
+                        session[var_at] = now
+                    elif session[var_at] < now - delta:
+                        # Session var has expired, so remove var and timestamp
+                        session.pop(var)
+                        session.pop(var_at)
+                elif var_at in session:
+                    # Timestamp present without var, so remove it
+                    session.pop(var_at)
+        return response
+
 
 #: Temporary values that must be periodically expunged from the cookie session
 session_timeouts = SessionTimeouts()
+app.after_request(session_timeouts.crosscheck_session)
 
 # --- Utilities ------------------------------------------------------------------------
 
 
-def app_context():
+def app_context() -> ContextManager:
     """Return an app context if one is not active."""
     if current_app:
         return nullcontext()
@@ -116,7 +141,7 @@ def str_pw_set_at(user: Account) -> str:
     return 'None'
 
 
-def metarefresh_redirect(url: str):
+def metarefresh_redirect(url: str) -> Response:
     """Redirect using a non-standard Refresh header in a Meta tag."""
     return Response(render_template('meta_refresh.html.jinja2', url=url))
 
@@ -140,7 +165,11 @@ def app_url_for(
     The provided app must have `SERVER_NAME` in its config for URL construction to work.
     """
     # pylint: disable=protected-access
-    if current_app and current_app._get_current_object() is target_app:
+    if (
+        current_app
+        and current_app._get_current_object()  # type: ignore[attr-defined]
+        is target_app
+    ):
         return url_for(
             endpoint,
             _external=_external,
@@ -171,14 +200,16 @@ def app_url_for(
 def validate_is_app_url(url: str | furl, method: str = 'GET') -> bool:
     """Confirm if an external URL is served by the current app (runtime-only)."""
     # Parse or copy URL and remove username and password before further analysis
-    parsed_url = furl(url).remove(username=True, password=True)
+    if isinstance(url, str):
+        url = furl(url)
+    parsed_url = url.remove(username=True, password=True)
     if not parsed_url.host or not parsed_url.scheme:
         return False  # This validator requires a full URL
 
     if current_app.url_map.host_matching:
         # This URL adapter matches explicit hosts, so we just give it the URL as its
         # server_name
-        server_name = parsed_url.netloc
+        server_name = parsed_url.netloc or ''  # Fallback blank str for type checking
         subdomain = None
     else:
         # Next, validate whether the URL's host/netloc is valid for this app's config
@@ -192,6 +223,7 @@ def validate_is_app_url(url: str | furl, method: str = 'GET') -> bool:
                 parsed_url.netloc == server_name
                 or (
                     current_app.subdomain_matching
+                    and parsed_url.netloc is not None
                     and parsed_url.netloc.endswith(f'.{server_name}')
                 )
             ):
@@ -209,13 +241,13 @@ def validate_is_app_url(url: str | furl, method: str = 'GET') -> bool:
                 return False
             server_name = request.host
 
-        # Host is validated, now make an adapter to match the path
-        adapter = current_app.url_map.bind(
-            server_name,
-            subdomain=subdomain,
-            script_name=current_app.config['APPLICATION_ROOT'],
-            url_scheme=current_app.config['PREFERRED_URL_SCHEME'],
-        )
+    # Host is validated, now make an adapter to match the path
+    adapter = current_app.url_map.bind(
+        server_name,
+        subdomain=subdomain,
+        script_name=current_app.config['APPLICATION_ROOT'],
+        url_scheme=current_app.config['PREFERRED_URL_SCHEME'],
+    )
 
     while True:  # Keep looping on redirects
         try:
@@ -226,15 +258,21 @@ def validate_is_app_url(url: str | furl, method: str = 'GET') -> bool:
             return False
 
 
-def localize_micro_timestamp(timestamp, from_tz=utc, to_tz=utc):
+def localize_micro_timestamp(
+    timestamp: float, from_tz: BaseTzInfo | str = utc, to_tz: BaseTzInfo | str = utc
+) -> datetime:
     return localize_timestamp(int(timestamp) / 1000, from_tz, to_tz)
 
 
-def localize_timestamp(timestamp, from_tz=utc, to_tz=utc):
+def localize_timestamp(
+    timestamp: float, from_tz: BaseTzInfo | str = utc, to_tz: BaseTzInfo | str = utc
+) -> datetime:
     return localize_date(datetime.fromtimestamp(int(timestamp)), from_tz, to_tz)
 
 
-def localize_date(date, from_tz=utc, to_tz=utc):
+def localize_date(
+    date: datetime, from_tz: BaseTzInfo | str = utc, to_tz: BaseTzInfo | str = utc
+) -> datetime:
     if from_tz and to_tz:
         if isinstance(from_tz, str):
             from_tz = pytz_timezone(from_tz)
@@ -265,7 +303,7 @@ def autoset_timezone_and_locale() -> None:
             if remapped_timezone is not None:
                 user.timezone = remapped_timezone  # type: ignore[assignment]
     if user.auto_locale or not user.locale or str(user.locale) not in supported_locales:
-        user.locale = (
+        user.locale = (  # pyright: ignore[reportGeneralTypeIssues]
             request.accept_languages.best_match(  # type: ignore[assignment]
                 supported_locales.keys()
             )
@@ -311,7 +349,7 @@ def validate_rate_limit(
     timeout: int,
     token: str | None = None,
     validator: Callable[[str, str | None], tuple[bool, bool]] | None = None,
-):
+) -> None:
     """
     Validate a rate limit on API-endpoint resources.
 
@@ -333,10 +371,11 @@ def validate_rate_limit(
     :func:`progressive_rate_limit_validator` and its users.
     """
     # statsd.set requires an ASCII string. The identifier parameter is typically UGC,
-    # meaning it can contain just about any character and any length. The identifier
-    # is hashed using BLAKE2b here to bring it down to a meaningful length. It is not
+    # meaning it can contain just about any character and any length. The identifier is
+    # hashed using BLAKE2b here to bring it down to a meaningful length. It is not
     # reversible should that be needed for debugging, but the obvious alternative Base64
-    # encoding (for convering to 7-bit ASCII) cannot be used as it does not limit length
+    # encoding (for converting to 7-bit ASCII) cannot be used as it does not limit
+    # length
     statsd.set(
         'rate_limit',
         blake2b(identifier.encode(), digest_size=32).hexdigest(),
@@ -344,10 +383,7 @@ def validate_rate_limit(
         tags={'resource': resource},
     )
     cache_key = f'rate_limit/v1/{resource}/{identifier}'
-    # XXX: Typing for cache.get is incorrectly specified as returning Optional[str]
-    cache_value: tuple[int, str] | None = cache.get(  # type: ignore[assignment]
-        cache_key
-    )
+    cache_value: tuple[int, str] | None = cache.get(cache_key)
     if cache_value is None:
         count, cache_token = None, None
         statsd.incr('rate_limit', tags={'resource': resource, 'status_code': 201})
@@ -435,8 +471,7 @@ def make_cached_token(payload: dict, timeout: int = 24 * 60 * 60) -> str:
 
 def retrieve_cached_token(token: str) -> dict | None:
     """Retrieve cached data given a token generated using :func:`make_cached_token`."""
-    # XXX: Typing for cache.get is incorrectly specified as returning Optional[str]
-    return cache.get(TEXT_TOKEN_PREFIX + token)  # type: ignore[return-value]
+    return cache.get(TEXT_TOKEN_PREFIX + token)
 
 
 def delete_cached_token(token: str) -> bool:
@@ -474,7 +509,7 @@ def decompress(data: bytes, algorithm: str) -> bytes:
     raise ValueError("Unknown compression algorithm")
 
 
-def compress_response(response: ResponseType) -> None:
+def compress_response(response: BaseResponse) -> None:
     """
     Conditionally compress a response based on request parameters.
 
@@ -530,7 +565,7 @@ def render_redirect(url: str, code: int = 303) -> ReturnResponse:
 def html_in_json(template: str) -> dict[str, str | Callable[[dict], ReturnView]]:
     """Render a HTML fragment in a JSON wrapper, for use with ``@render_with``."""
 
-    def render_json_with_status(kwargs) -> ReturnResponse:
+    def render_json_with_status(kwargs: dict[str, Any]) -> ReturnResponse:
         """Render plain JSON."""
         return jsonify(
             status='ok',
@@ -542,7 +577,7 @@ def render_json_with_status(kwargs) -> ReturnResponse:
             },
         )
 
-    def render_html_in_json(kwargs) -> ReturnResponse:
+    def render_html_in_json(kwargs: dict[str, Any]) -> ReturnResponse:
         """Render HTML fragment in JSON."""
         resp = jsonify({'status': 'ok', 'html': render_template(template, **kwargs)})
         resp.content_type = 'application/x.html+json; charset=utf-8'
@@ -559,13 +594,13 @@ def render_html_in_json(kwargs) -> ReturnResponse:
 
 
 @app.template_filter('url_join')
-def url_join(base, url=''):
+def url_join(base: str, url: str = '') -> str:
     """Join URLs in a template filter."""
     return urljoin(base, url)
 
 
 @app.template_filter('cleanurl')
-def cleanurl_filter(url):
+def cleanurl_filter(url: str | furl) -> str:
     """Clean a URL in a template filter."""
     if not isinstance(url, furl):
         url = furl(url)
@@ -593,7 +628,7 @@ def shortlink(url: str, actor: Account | None = None, shorter: bool = True) -> s
 
 
 @app.before_request
-def no_null_in_form():
+def no_null_in_form() -> None:
     """Disallow NULL characters in any form submit (but don't scan file attachments)."""
     if request.method == 'POST':
         for values in request.form.listvalues():
@@ -613,29 +648,6 @@ def commit_db_session(response: ResponseType) -> ResponseType:
     return response
 
 
-@app.after_request
-def track_temporary_session_vars(response: ResponseType) -> ResponseType:
-    """Add timestamps to timed values in session, and remove expired values."""
-    # Process timestamps only if there is at least one match. Most requests will
-    # have no match.
-    if session_timeouts.has_intersection(session):
-        for var, delta in session_timeouts.items():
-            var_at = f'{var}_at'
-            if var in session:
-                if var_at not in session:
-                    # Session has var but not timestamp, so add a timestamp
-                    session[var_at] = utcnow()
-                elif session[var_at] < utcnow() - delta:
-                    # Session var has expired, so remove var and timestamp
-                    session.pop(var)
-                    session.pop(var_at)
-            elif var_at in session:
-                # Timestamp present without var, so remove it
-                session.pop(var_at)
-
-    return response
-
-
 @app.after_request
 def cache_expiry_headers(response: ResponseType) -> ResponseType:
     if response.expires is None:
diff --git a/funnel/views/index.py b/funnel/views/index.py
index 31d789c7f..7b176628c 100644
--- a/funnel/views/index.py
+++ b/funnel/views/index.py
@@ -38,7 +38,7 @@ class PolicyPage:
 ]
 
 
-@route('/')
+@route('/', init_app=app)
 class IndexView(ClassView):
     current_section = 'home'
     SavedProjectForm = SavedProjectForm
@@ -127,7 +127,9 @@ def home(self) -> ReturnRenderWith:
         featured_account_sort_key = {
             _n.lower(): _i for _i, _n in enumerate(app.config['FEATURED_ACCOUNTS'])
         }
-        featured_accounts.sort(key=lambda a: featured_account_sort_key[a.name.lower()])
+        featured_accounts.sort(
+            key=lambda a: featured_account_sort_key[(a.name or a.title).lower()]
+        )
 
         return {
             'all_projects': [
@@ -151,40 +153,38 @@ def home(self) -> ReturnRenderWith:
             'featured_project_sessions': scheduled_sessions_list,
             'featured_project_schedule': featured_project_schedule,
             'featured_accounts': [
-                p.access_for(roles={'all'}, datasets=('primary', 'related'))
+                p.current_access(datasets=('primary', 'related'))
                 for p in featured_accounts
             ],
         }
 
-
-IndexView.init_app(app)
-
-
-@app.route('/past.projects', endpoint='past_projects')
-@requestargs(('page', int), ('per_page', int))
-@render_with('past_projects_section.html.jinja2')
-def past_projects(page: int = 1, per_page: int = 10) -> ReturnView:
-    g.account = None
-    projects = Project.all_unsorted()
-    pagination = (
-        projects.filter(Project.state.PAST)
-        .order_by(Project.start_at.desc())
-        .paginate(page=page, per_page=per_page)
-    )
-    return {
-        'status': 'ok',
-        'next_page': pagination.page + 1 if pagination.page < pagination.pages else '',
-        'total_pages': pagination.pages,
-        'past_projects': [
-            {
-                'title': p.title,
-                'datetime': date_filter(p.end_at_localized, format='dd MMM yyyy'),
-                'venue': p.primary_venue.city if p.primary_venue else p.location,
-                'url': p.url_for(),
-            }
-            for p in pagination.items
-        ],
-    }
+    @route('past.projects', endpoint='past_projects')
+    @render_with('past_projects_section.html.jinja2')
+    @requestargs(('page', int), ('per_page', int))
+    def past_projects(self, page: int = 1, per_page: int = 10) -> ReturnRenderWith:
+        g.account = None
+        projects = Project.all_unsorted()
+        pagination = (
+            projects.filter(Project.state.PAST)
+            .order_by(Project.start_at.desc())
+            .paginate(page=page, per_page=per_page)
+        )
+        return {
+            'status': 'ok',
+            'next_page': pagination.page + 1
+            if pagination.page < pagination.pages
+            else '',
+            'total_pages': pagination.pages,
+            'past_projects': [
+                {
+                    'title': p.title,
+                    'datetime': date_filter(p.end_at_localized, format='dd MMM yyyy'),
+                    'venue': p.primary_venue.city if p.primary_venue else p.location,
+                    'url': p.url_for(),
+                }
+                for p in pagination.items
+            ],
+        }
 
 
 @app.route('/about')
diff --git a/funnel/views/jobs.py b/funnel/views/jobs.py
index 6282f1821..26fb86726 100644
--- a/funnel/views/jobs.py
+++ b/funnel/views/jobs.py
@@ -5,7 +5,7 @@
 from collections import defaultdict
 from collections.abc import Callable
 from functools import wraps
-from typing import Protocol
+from typing import Any, Protocol, cast
 
 import requests
 from flask import g
@@ -43,7 +43,7 @@ def queue(self, *args: P.args, **kwargs: P.kwargs) -> None:
 
 
 def rqjob(
-    queue: str = 'funnel', **rqargs
+    queue: str = 'funnel', **rqargs: Any
 ) -> Callable[[Callable[P, T_co]], RqJobProtocol[P, T_co]]:
     """Decorate an RQ job with app context."""
 
@@ -53,7 +53,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T_co:
             with app_context():
                 return f(*args, **kwargs)
 
-        return rq.job(queue, **rqargs)(wrapper)
+        return cast(RqJobProtocol, rq.job(queue, **rqargs)(wrapper))
 
     return decorator
 
@@ -61,7 +61,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T_co:
 @rqjob()
 def import_tickets(ticket_client_id: int) -> None:
     """Import tickets from Boxoffice."""
-    ticket_client = TicketClient.query.get(ticket_client_id)
+    ticket_client = db.session.get(TicketClient, ticket_client_id)
     if ticket_client is not None:
         if ticket_client.name.lower() == 'explara':
             ticket_list = ExplaraAPI(
@@ -78,21 +78,17 @@ def import_tickets(ticket_client_id: int) -> None:
 
 @rqjob()
 def tag_locations(project_id: int) -> None:
-    """
-    Tag a project with geoname locations.
-
-    This function used to retrieve data from Hascore, which has been merged into Funnel
-    and is available directly as the GeoName model. This code continues to operate with
-    the legacy Hascore data structure, and is pending rewrite.
-    """
-    project = Project.query.get(project_id)
+    """Tag a project with geoname locations. This is legacy code pending a rewrite."""
+    project = db.session.get(Project, project_id)
+    if project is None:
+        return
     if not project.location:
         return
     results = GeoName.parse_locations(
         project.location, special=["Internet", "Online"], bias=['IN', 'US']
     )
-    geonames = defaultdict(dict)
-    tokens = []
+    geonames: dict[str, dict] = defaultdict(dict)
+    tokens: list[dict] = []
     for item in results:
         if 'geoname' in item:
             geoname = item['geoname'].as_dict(alternate_titles=False)
@@ -120,7 +116,7 @@ def tag_locations(project_id: int) -> None:
     project.parsed_location = {'tokens': tokens}
 
     for locdata in geonames.values():
-        loc = ProjectLocation.query.get((project_id, locdata['geonameid']))
+        loc = db.session.get(ProjectLocation, (project_id, locdata['geonameid']))
         if loc is None:
             loc = ProjectLocation(project=project, geonameid=locdata['geonameid'])
             db.session.add(loc)
@@ -134,7 +130,12 @@ def tag_locations(project_id: int) -> None:
 
 # TODO: Deprecate this method and the AuthClient notification system
 @rqjob()
-def send_auth_client_notice(url, params=None, data=None, method='POST'):
+def send_auth_client_notice(
+    url: str,
+    params: dict[str, Any] | None = None,
+    data: dict[str, Any] | None = None,
+    method: str = 'POST',
+) -> None:
     """Send notice to AuthClient when some data changes."""
     requests.request(method, url, params=params, data=data, timeout=30)
 
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 962c468fe..71dc80157 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -15,12 +15,12 @@
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import render_redirect
 from .login_session import requires_login, requires_sudo
-from .mixins import AccountCheckMixin, ProjectViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase
 
 
 @Project.views('label')
-@route('/<account>/<project>/labels')
-class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<account>/<project>/labels', init_app=app)
+class ProjectLabelView(ProjectViewBase):
     @route('', methods=['GET', 'POST'])
     @render_with('labels.html.jinja2')
     @requires_login
@@ -96,20 +96,15 @@ def new_label(self) -> ReturnRenderWith:
         }
 
 
-ProjectLabelView.init_app(app)
-
-
 @Label.views('main')
-@route('/<account>/<project>/labels/<label>')
-class LabelView(AccountCheckMixin, UrlForView, ModelView):
+@route('/<account>/<project>/labels/<label>', init_app=app)
+class LabelView(AccountCheckMixin, UrlForView, ModelView[Label]):
     __decorators__ = [requires_login]
-    model = Label
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'label': 'name',
     }
-    obj: Label
 
     def loader(self, account: str, project: str, label: str) -> Label:
         return (
@@ -121,9 +116,8 @@ def loader(self, account: str, project: str, label: str) -> Label:
             .first_or_404()
         )
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('edit', methods=['GET', 'POST'])
     @requires_login
@@ -157,7 +151,7 @@ def edit(self) -> ReturnRenderWith:
                     # existing option
                     subl = Label.query.filter_by(
                         project=self.obj.project, name=name
-                    ).first()
+                    ).one()
                     subl.title = title
                     subl.icon_emoji = emoji
                     subl.seq = counter + 1  # Counter is 0-indexed, seq is 1-indexed
@@ -256,6 +250,3 @@ def delete(self) -> ReturnView:
             submit=_("Delete"),
             cancel_url=self.obj.project.url_for('labels'),
         )
-
-
-LabelView.init_app(app)
diff --git a/funnel/views/login.py b/funnel/views/login.py
index b7b0bffc3..15c85cf2a 100644
--- a/funnel/views/login.py
+++ b/funnel/views/login.py
@@ -22,11 +22,11 @@
 from baseframe import _, __, forms, statsd
 from baseframe.forms import render_message
 from baseframe.signals import exception_catchall
-from coaster.auth import current_auth
 from coaster.utils import getbool, utcnow
 from coaster.views import get_next_url, requestargs
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     LoginForm,
     LoginPasswordResetException,
@@ -44,6 +44,7 @@
     AccountExternalId,
     AuthClientCredential,
     LoginSession,
+    User,
     db,
     getextid,
     merge_accounts,
@@ -100,7 +101,7 @@ def render_otp_form(
     form: OtpForm | RegisterOtpForm, cancel_url: str, action: str
 ) -> ReturnView:
     """Render OTP form."""
-    form.form_nonce.data = form.form_nonce.default()
+    form.form_nonce.data = form.form_nonce.get_default()
     return (
         render_template(
             'otpform.html.jinja2',
@@ -174,7 +175,7 @@ def login() -> ReturnView:
             if success:
                 user = loginform.user
                 if TYPE_CHECKING:
-                    assert isinstance(user, Account)  # nosec
+                    assert isinstance(user, User)  # nosec B101
                 login_internal(user, login_service='password')
                 db.session.commit()
                 if loginform.weak_password:
@@ -278,7 +279,7 @@ def login() -> ReturnView:
                     # Register an account
                     user = register_internal(None, otp_form.fullname.data, None)
                     if TYPE_CHECKING:
-                        assert isinstance(user, Account)  # nosec
+                        assert isinstance(user, User)  # nosec B101
                     if otp_session.email:
                         db.session.add(user.add_email(otp_session.email, primary=True))
                     if otp_session.phone:
@@ -408,7 +409,8 @@ def account_logout() -> ReturnView:
 
     for field_errors in form.errors.values():
         for error in field_errors:
-            flash(error, 'error')
+            if error is not None:
+                flash(error, 'error')
     return render_redirect(url_for('account'))
 
 
@@ -456,7 +458,9 @@ def login_service_callback(service: str) -> ReturnView:
     return login_service_postcallback(service, userdata)
 
 
-def get_user_extid(service, userdata):
+def get_user_extid(
+    service: str, userdata: LoginProviderData
+) -> tuple[Account | None, AccountExternalId | None, AccountEmail | None]:
     """Retrieve user, extid and email from the given service and userdata."""
     provider = login_registry[service]
     extid = getextid(service=service, userid=userdata.userid)
@@ -543,7 +547,7 @@ def login_service_postcallback(service: str, userdata: LoginProviderData) -> Ret
             extid.account = user
         else:
             # Register a new user
-            user = register_internal(None, userdata.fullname, None)
+            user = register_internal(None, userdata.fullname or '', None)
             extid.account = user
             if userdata.username:
                 if Account.is_available_name(userdata.username):
@@ -587,6 +591,8 @@ def login_service_postcallback(service: str, userdata: LoginProviderData) -> Ret
         user.fullname = userdata.fullname
 
     if not current_auth:  # If a user isn't already logged in, login now.
+        if TYPE_CHECKING:
+            assert isinstance(user, User)  # nosec B101
         login_internal(user, login_service=service)
         flash(
             _("You have logged in via {service}").format(
@@ -629,6 +635,8 @@ def account_merge() -> ReturnView:
         if 'merge' in request.form:
             new_user = merge_accounts(current_auth.user, other_user)
             if new_user is not None:
+                if TYPE_CHECKING:
+                    assert isinstance(new_user, User)  # nosec B101
                 login_internal(
                     new_user,
                     login_service=current_auth.session.login_service
@@ -731,7 +739,7 @@ def hasjob_login(cookietest: bool = False) -> ReturnView:
 # @hasjobapp.route('/login/callback', endpoint='login_callback')
 @reload_for_cookies
 @requestargs('token')
-def hasjobapp_login_callback(token):
+def hasjobapp_login_callback(token: str) -> ReturnView:
     """Process callback from Hasjob to confirm a login attempt."""
     nonce = session.pop('login_nonce', None)
     if not nonce:
@@ -759,6 +767,8 @@ def hasjobapp_login_callback(token):
     login_session = LoginSession.get(request_token['sessionid'])
     if login_session is not None:
         user = login_session.account
+        if TYPE_CHECKING:
+            assert isinstance(user, User)  # nosec B101
         login_internal(user, login_session)
         db.session.commit()
         flash(_("You are now logged in"), category='success')
@@ -776,7 +786,7 @@ def hasjobapp_login_callback(token):
 
 # Retained for future hasjob integration
 # @hasjobapp.route('/logout', endpoint='logout')
-def hasjob_logout():
+def hasjob_logout() -> ReturnView:
     """Process a logout request in Hasjob."""
     # Revoke session and redirect to homepage. Don't bother to ask `app` to logout
     # as well since the session is revoked. `app` will notice and drop cookies on
diff --git a/funnel/views/login_session.py b/funnel/views/login_session.py
index 294c1be59..00661dcdd 100644
--- a/funnel/views/login_session.py
+++ b/funnel/views/login_session.py
@@ -25,11 +25,11 @@
 
 from baseframe import _, __, statsd
 from baseframe.forms import render_form
-from coaster.auth import add_auth_attribute, current_auth, request_has_auth
 from coaster.utils import utcnow
 from coaster.views import get_current_url, get_next_url
 
 from .. import app
+from ..auth import add_auth_attribute, current_auth, request_has_auth
 from ..forms import OtpForm, PasswordForm
 from ..geoip import GeoIP2Error, geoip
 from ..models import (
@@ -49,7 +49,7 @@
 from ..proxies import request_wants
 from ..serializers import lastuser_serializer
 from ..signals import user_login, user_registered
-from ..typing import P, ResponseType, ReturnResponse, T
+from ..typing import P, ResponseType, ReturnResponse, ReturnView, T
 from ..utils import abort_null
 from .helpers import (
     app_context,
@@ -95,17 +95,17 @@ class LoginManager:
     is_master_data_source = True
 
     @property
-    def autocomplete_endpoint(self):
+    def autocomplete_endpoint(self) -> str:
         """Endpoint for autocomplete of user name (used in Baseframe)."""
         return app_url_for(app, 'user_autocomplete')
 
     @property
-    def getuser_endpoint(self):
+    def getuser_endpoint(self) -> str:
         """Endpoint for getting a user by userid (used in Baseframe)."""
         return app_url_for(app, 'user_get_by_userids')
 
     @staticmethod
-    def _load_user():
+    def _load_user() -> None:
         """Load the user object to `current_auth` if there's a buid in the session."""
         add_auth_attribute('user', None)
         add_auth_attribute('session', None)
@@ -226,7 +226,7 @@ def session_mark_accessed(
     auth_client: AuthClient | None = None,
     ipaddr: str | None = None,
     user_agent: str | None = None,
-):
+) -> None:
     """
     Mark a session as currently active.
 
@@ -357,7 +357,7 @@ def update_user_session_timestamp(response: ResponseType) -> ResponseType:
         user_agent = str(request.user_agent.string[:250])
 
         @response.call_on_close
-        def mark_session_accessed_after_response():
+        def mark_session_accessed_after_response() -> None:
             # App context is needed for the call to statsd in mark_accessed()
             with app_context():
                 # 1. Add object back to the current database session as it's not
@@ -389,7 +389,7 @@ def save_session_next_url() -> bool:
     return False
 
 
-def reload_for_cookies(f: Callable[P, T]) -> Callable[P, T | ReturnResponse]:
+def reload_for_cookies(f: Callable[P, ReturnView]) -> Callable[P, ReturnView]:
     """
     Decorate a view to reload to obtain SameSite=strict cookies.
 
@@ -405,7 +405,7 @@ def view() -> ReturnView:
     """
 
     @wraps(f)
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T | ReturnResponse:
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnView:
         if 'lastuser' not in request.cookies:
             add_auth_attribute('suppress_empty_cookie', True)
             attempt = request.args.get('cookiereload')
@@ -426,15 +426,15 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T | ReturnResponse:
 
 
 def requires_user_not_spammy(
-    get_current: Callable[P, str] | None = None
-) -> Callable[[Callable[P, T]], Callable[P, T | ReturnResponse]]:
+    get_current: Callable[..., str] | None = None
+) -> Callable[[Callable[P, ReturnView]], Callable[P, ReturnView]]:
     """Decorate a view to require the user to prove they are not likely a spammer."""
 
-    def decorator(f: Callable[P, T]) -> Callable[P, T | ReturnResponse]:
+    def decorator(f: Callable[P, ReturnView]) -> Callable[P, ReturnView]:
         """Apply decorator using the specified :attr:`get_current` function."""
 
         @wraps(f)
-        def wrapper(*args: P.args, **kwargs: P.kwargs) -> T | ReturnResponse:
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnView:
             """Validate user rights in a view."""
             if not current_auth.is_authenticated:
                 flash(_("Confirm your phone number to continue"), 'info')
@@ -543,7 +543,7 @@ def del_sudo_preference_context() -> None:
     session.pop('sudo_context', None)
 
 
-def requires_sudo(f: Callable[P, T]) -> Callable[P, T | ReturnResponse]:
+def requires_sudo(f: Callable[P, ReturnView]) -> Callable[P, ReturnView]:
     """
     Decorate a view to require the current user to have re-authenticated recently.
 
@@ -555,7 +555,7 @@ def requires_sudo(f: Callable[P, T]) -> Callable[P, T | ReturnResponse]:
     """
 
     @wraps(f)
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T | ReturnResponse:
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> ReturnView:
         """Prompt for re-authentication to proceed."""
         add_auth_attribute('login_required', True)
         # If the user is not logged in, require login first
@@ -661,7 +661,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T | ReturnResponse:
                 abort(422)
 
             # Allow 5 password or OTP guesses per 60 seconds
-            validate_rate_limit('account_sudo', current_auth.user.userid, 5, 60)
+            validate_rate_limit('account_sudo', current_auth.user.uuid_b64, 5, 60)
             if form.validate_on_submit():
                 # User has successfully authenticated. Update their sudo timestamp
                 # and reload the page with a GET request, as the wrapped view may
@@ -825,7 +825,7 @@ def login_internal(
     user: User,
     login_session: LoginSession | None = None,
     login_service: str | None = None,
-):
+) -> None:
     """
     Login a user and create a session.
 
@@ -866,7 +866,9 @@ def logout_internal() -> None:
     session.permanent = False
 
 
-def register_internal(username, fullname, password):
+def register_internal(
+    username: str | None, fullname: str, password: str | None
+) -> User:
     """Register a user account (helper function)."""
     user = User(username=username, fullname=fullname, password=password)
     if not username:
@@ -876,7 +878,7 @@ def register_internal(username, fullname, password):
     return user
 
 
-def set_loginmethod_cookie(response, value):
+def set_loginmethod_cookie(response: ResponseType, value: str) -> ResponseType:
     """Record the login method that was used, to provide a UI hint the next time."""
     # TODO: This is deprecated now that the primary emphasis is on OTP login.
     response.set_cookie(
diff --git a/funnel/views/membership.py b/funnel/views/membership.py
index 5be330067..5a13a6c2e 100644
--- a/funnel/views/membership.py
+++ b/funnel/views/membership.py
@@ -6,7 +6,6 @@
 
 from baseframe import _
 from baseframe.forms import Form, render_form
-from coaster.auth import current_auth
 from coaster.views import (
     ModelView,
     UrlChangeCheck,
@@ -17,6 +16,7 @@
 )
 
 from .. import app, signals
+from ..auth import current_auth
 from ..forms import (
     OrganizationMembershipForm,
     ProjectCrewMembershipForm,
@@ -39,18 +39,19 @@
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .login_session import requires_login, requires_sudo
-from .mixins import AccountCheckMixin, AccountViewMixin, ProjectViewMixin
+from .mixins import AccountCheckMixin, AccountViewBase, ProjectViewBase
 from .notification import dispatch_notification
 
 
 @Account.views('members')
-@route('/<account>/members')
-class OrganizationMembersView(AccountViewMixin, UrlForView, ModelView):
-    def after_loader(self) -> ReturnView | None:  # type: ignore[return]
+@route('/<account>/members', init_app=app)
+class OrganizationMembersView(AccountViewBase):
+    def after_loader(self) -> ReturnView | None:
         """Don't render member views for user accounts."""
         if not isinstance(self.obj, Organization):
             # Only organization accounts have admin members
             abort(404)
+        return super().after_loader()
 
     @route('', methods=['GET', 'POST'])
     @render_with('organization_membership.html.jinja2')
@@ -151,26 +152,22 @@ def new_member(self) -> ReturnView:
         return {'status': 'ok', 'form': membership_form_html}
 
 
-OrganizationMembersView.init_app(app)
-
-
 @AccountMembership.views('main')
-@route('/<account>/members/<membership>')
+@route('/<account>/members/<membership>', init_app=app)
 class OrganizationMembershipView(
-    AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView
+    AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[AccountMembership]
 ):
-    model = AccountMembership
     route_model_map = {'account': 'account.urlname', 'membership': 'uuid_b58'}
-    obj: AccountMembership
 
-    def loader(self, account: str, membership: str) -> AccountMembership:
-        return AccountMembership.query.filter(
+    def load(self, account: str, membership: str) -> ReturnView | None:
+        self.obj = AccountMembership.query.filter(
             AccountMembership.uuid_b58 == membership,
         ).first_or_404()
+        self.post_init()
+        return self.after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.account
-        return super().after_loader()
 
     @route('edit', methods=['GET', 'POST'])
     @requires_login
@@ -291,15 +288,12 @@ def delete(self) -> ReturnView:
         return {'status': 'ok', 'form': form_html}
 
 
-OrganizationMembershipView.init_app(app)
-
-
 #: Project Membership views
 
 
 @Project.views('crew')
-@route('/<account>/<project>/crew')
-class ProjectMembershipView(ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>/crew', init_app=app)
+class ProjectMembershipView(ProjectViewBase):
     @route('', methods=['GET', 'POST'])
     @render_with(html_in_json('project_membership.html.jinja2'))
     def crew(self) -> ReturnRenderWith:
@@ -385,20 +379,17 @@ def new_member(self) -> ReturnView:
         return {'status': 'ok', 'form': membership_form_html}
 
 
-ProjectMembershipView.init_app(app)
-
-
-class ProjectCrewMembershipMixin(AccountCheckMixin):
-    model = ProjectMembership
+class ProjectCrewMembershipBase(
+    AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[ProjectMembership]
+):
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'membership': 'uuid_b58',
     }
-    obj: ProjectMembership
 
-    def loader(self, account: str, project: str, membership: str) -> ProjectMembership:
-        return (
+    def load(self, account: str, project: str, membership: str) -> ReturnView | None:
+        self.obj = (
             ProjectMembership.query.join(Project)
             .join(Account, Project.account)
             .filter(
@@ -408,27 +399,27 @@ def loader(self, account: str, project: str, membership: str) -> ProjectMembersh
             )
             .first_or_404()
         )
+        self.post_init()
+        return self.after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
 
 @ProjectMembership.views('invite')
-@route('/<account>/<project>/crew/<membership>/invite')
-class ProjectCrewMembershipInviteView(
-    ProjectCrewMembershipMixin, UrlChangeCheck, UrlForView, ModelView
-):
-    def loader(self, account: str, project: str, membership: str) -> ProjectMembership:
-        obj = super().loader(account, project, membership)
-        if not obj.is_invite or obj.member != current_auth.user:
+@route('/<account>/<project>/crew/<membership>/invite', init_app=app)
+class ProjectCrewMembershipInviteView(ProjectCrewMembershipBase):
+    def load(self, account: str, project: str, membership: str) -> ReturnView | None:
+        resp = super().load(account, project, membership)
+        if not self.obj.is_invite or self.obj.member != current_auth.user:
             abort(404)
-        return obj
+        return resp
 
     @route('', methods=['GET'])
     @requires_login
     @requires_roles({'member'})
     def invite(self) -> ReturnView:
+        status_code = 200
         if request.method == 'GET':
             return render_template(
                 'membership_invite_actions.html.jinja2',
@@ -442,7 +433,6 @@ def invite(self) -> ReturnView:
                 status_code = 201
             elif membership_invite_form.action.data == 'decline':
                 self.obj.revoke(actor=current_auth.user)
-                status_code = 200
             else:
                 error_description = _("This is not a valid response")
                 if request_wants.json:
@@ -462,14 +452,9 @@ def invite(self) -> ReturnView:
         return render_redirect(self.obj.project.url_for())
 
 
-ProjectCrewMembershipInviteView.init_app(app)
-
-
 @ProjectMembership.views('main')
-@route('/<account>/<project>/crew/<membership>')
-class ProjectCrewMembershipView(
-    ProjectCrewMembershipMixin, UrlChangeCheck, UrlForView, ModelView
-):
+@route('/<account>/<project>/crew/<membership>', init_app=app)
+class ProjectCrewMembershipView(ProjectCrewMembershipBase):
     @route('edit', methods=['GET', 'POST'])
     @requires_login
     @requires_roles({'account_admin'})
@@ -575,6 +560,3 @@ def delete(self) -> ReturnView:
             with_chrome=False,
         ).get_data(as_text=True)
         return {'status': 'ok', 'form': form_html}
-
-
-ProjectCrewMembershipView.init_app(app)
diff --git a/funnel/views/mixins.py b/funnel/views/mixins.py
index 9ec94ab2f..226371f8e 100644
--- a/funnel/views/mixins.py
+++ b/funnel/views/mixins.py
@@ -3,41 +3,39 @@
 
 from __future__ import annotations
 
-from uuid import uuid4
+from typing import TYPE_CHECKING, Any
+from uuid import UUID, uuid4
 
 from flask import abort, g, request
 from werkzeug.datastructures import MultiDict
 
 from baseframe import _, forms
-from coaster.auth import current_auth
+from coaster.views import ModelView, UrlChangeCheck, UrlForView, route
 
+from ..auth import current_auth
 from ..forms import SavedProjectForm
 from ..models import (
     Account,
     Draft,
+    ModelUuidProtocol,
     Project,
     ProjectRedirect,
-    Session,
     TicketEvent,
-    UuidModelUnion,
-    Venue,
-    VenueRoom,
     db,
 )
 from ..typing import ReturnView
 from .helpers import render_redirect
+from .login_session import requires_login
 
 
 class AccountCheckMixin:
     """Base class checks for suspended accounts."""
 
-    account: Account | None = None
+    account: Account
 
     def after_loader(self) -> ReturnView | None:
         """Post-process loader."""
         account = self.account
-        if account is None:
-            raise ValueError("Subclass must set self.account")
         g.account = account
         if not account.state.ACTIVE:
             abort(410)
@@ -49,16 +47,15 @@ def after_loader(self) -> ReturnView | None:
         return super().after_loader()  # type: ignore[misc]
 
 
-class ProjectViewMixin(AccountCheckMixin):
-    model: type[Project] = Project
+class ProjectViewBase(
+    AccountCheckMixin, UrlForView, UrlChangeCheck, ModelView[Project]
+):
     route_model_map = {'account': 'account.urlname', 'project': 'name'}
-    obj: Project
     SavedProjectForm = SavedProjectForm
     CsrfForm = forms.Form
+    project: Project
 
-    def loader(
-        self, account: str, project: str, session: str | None = None
-    ) -> Project | ProjectRedirect:
+    def load(self, account: str, project: str, **_kwargs: Any) -> ReturnView | None:
         obj = (
             Project.query.join(Account, Project.account)
             .filter(Account.name_is(account), Project.name == project)
@@ -70,32 +67,30 @@ def loader(
                 .filter(Account.name_is(account), ProjectRedirect.name == project)
                 .first_or_404()
             )
-            return obj_redirect
-        if obj.state.DELETED:
-            abort(410)
-        return obj
-
-    def after_loader(self) -> ReturnView | None:
-        if isinstance(self.obj, ProjectRedirect):
-            if self.obj.project:
-                self.account = self.obj.project.account
+            if obj_redirect.project:
+                self.account = obj_redirect.project.account
                 return render_redirect(
-                    self.obj.project.url_for(),
+                    obj_redirect.project.url_for(),
                     302 if request.method == 'GET' else 303,
                 )
             abort(410)  # Project has been deleted
-        self.account = self.obj.account
-        return super().after_loader()
+        elif obj.state.DELETED:
+            abort(410)
+        self.obj = obj
+        self.post_init()
+        return self.after_loader()
+
+    def post_init(self) -> None:
+        self.project = project = self.obj
+        self.account = project.account
 
     @property
-    def project_currently_saved(self):
+    def project_currently_saved(self) -> bool:
         return self.obj.is_saved_by(current_auth.user)
 
 
-class AccountViewMixin(AccountCheckMixin):
-    model = Account
+class AccountViewBase(AccountCheckMixin, UrlForView, ModelView[Account]):
     route_model_map = {'account': 'urlname'}
-    obj: Account
     SavedProjectForm = SavedProjectForm
     CsrfForm = forms.Form
 
@@ -105,99 +100,18 @@ def loader(self, account: str) -> Account:
             abort(404)
         return obj
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj
-        return super().after_loader()
 
 
-class SessionViewMixin(AccountCheckMixin):
-    model = Session
-    route_model_map = {
-        'account': 'project.account.urlname',
-        'project': 'project.name',
-        'session': 'url_name_uuid_b58',
-    }
-    obj: Session
-    SavedProjectForm = SavedProjectForm
-
-    def loader(self, account: str, project: str, session: str) -> Session:
-        return (
-            Session.query.join(Project, Session.project_id == Project.id)
-            .join(Account, Project.account)
-            .filter(Session.url_name_uuid_b58 == session)
-            .first_or_404()
-        )
-
-    def after_loader(self) -> ReturnView | None:
-        self.account = self.obj.project.account
-        return super().after_loader()
-
-    @property
-    def project_currently_saved(self):
-        return self.obj.project.is_saved_by(current_auth.user)
-
-
-class VenueViewMixin(AccountCheckMixin):
-    model = Venue
-    route_model_map = {
-        'account': 'project.account.urlname',
-        'project': 'project.name',
-        'venue': 'name',
-    }
-    obj: Venue
-
-    def loader(self, account: str, project: str, venue: str) -> Venue:
-        return (
-            Venue.query.join(Project)
-            .join(Account, Project.account)
-            .filter(
-                Account.name_is(account), Project.name == project, Venue.name == venue
-            )
-            .first_or_404()
-        )
-
-    def after_loader(self) -> ReturnView | None:
-        self.account = self.obj.project.account
-        return super().after_loader()
-
-
-class VenueRoomViewMixin(AccountCheckMixin):
-    model = VenueRoom
-    route_model_map = {
-        'account': 'venue.project.account.urlname',
-        'project': 'venue.project.name',
-        'venue': 'venue.name',
-        'room': 'name',
-    }
-    obj: VenueRoom
-
-    def loader(self, account: str, project: str, venue: str, room: str) -> VenueRoom:
-        return (
-            VenueRoom.query.join(Venue)
-            .join(Project)
-            .join(Account, Project.account)
-            .filter(
-                Account.name_is(account),
-                Project.name == project,
-                Venue.name == venue,
-                VenueRoom.name == room,
-            )
-            .first_or_404()
-        )
-
-    def after_loader(self) -> ReturnView | None:
-        self.account = self.obj.venue.project.account
-        return super().after_loader()
-
-
-class TicketEventViewMixin(AccountCheckMixin):
-    model = TicketEvent
+@route('/<account>/<project>/ticket_event/<name>')
+class TicketEventViewBase(AccountCheckMixin, UrlForView, ModelView[TicketEvent]):
+    __decorators__ = [requires_login]
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'name': 'name',
     }
-    obj: TicketEvent
 
     def loader(self, account: str, project: str, name: str) -> TicketEvent:
         return (
@@ -211,25 +125,27 @@ def loader(self, account: str, project: str, name: str) -> TicketEvent:
             .one_or_404()
         )
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
 
-class DraftViewMixin:
-    obj: UuidModelUnion
-    model: type[UuidModelUnion]
+class DraftViewProtoMixin:
+    # These must be Any to avoid conflict with subclasses
+    model: Any
+    obj: Any
 
-    def get_draft(self, obj: UuidModelUnion | None = None) -> Draft | None:
+    def get_draft(self, obj: ModelUuidProtocol | None = None) -> Draft | None:
         """
         Return the draft object for `obj`. Defaults to `self.obj`.
 
         `obj` is needed in case of multi-model views.
         """
         obj = obj if obj is not None else self.obj
-        return Draft.query.get((self.model.__tablename__, obj.uuid))
+        if TYPE_CHECKING:
+            assert obj is not None  # nosec B101
+        return db.session.get(Draft, (self.model.__tablename__, obj.uuid))
 
-    def delete_draft(self, obj=None):
+    def delete_draft(self, obj: ModelUuidProtocol | None = None) -> None:
         """Delete draft for `obj`, or `self.obj` if `obj` is `None`."""
         draft = self.get_draft(obj)
         if draft is not None:
@@ -238,8 +154,8 @@ def delete_draft(self, obj=None):
             raise ValueError(_("There is no draft for the given object"))
 
     def get_draft_data(
-        self, obj: UuidModelUnion | None = None
-    ) -> tuple[None, None] | tuple[int, dict]:
+        self, obj: ModelUuidProtocol | None = None
+    ) -> tuple[None, None] | tuple[UUID | None, dict]:
         """
         Return a tuple of draft data.
 
@@ -250,7 +166,7 @@ def get_draft_data(
             return draft.revision, draft.formdata
         return None, None
 
-    def autosave_post(self, obj: UuidModelUnion | None = None) -> ReturnView:
+    def autosave_post(self, obj: ModelUuidProtocol | None = None) -> ReturnView:
         """Handle autosave POST requests."""
         obj = obj if obj is not None else self.obj
         if 'form.revision' not in request.form:
@@ -335,7 +251,7 @@ def autosave_post(self, obj: UuidModelUnion | None = None) -> ReturnView:
             return {
                 'status': 'ok',
                 'revision': draft.revision,
-                'form_nonce': form.form_nonce.default(),
+                'form_nonce': form.form_nonce.get_default(),
             }
         return (
             {
diff --git a/funnel/views/notification.py b/funnel/views/notification.py
index 48dc4a651..456a2c771 100644
--- a/funnel/views/notification.py
+++ b/funnel/views/notification.py
@@ -9,7 +9,7 @@
 from email.utils import formataddr
 from functools import wraps
 from itertools import islice
-from typing import Any, ClassVar, Literal
+from typing import Any, ClassVar, Literal, cast
 from uuid import UUID, uuid4
 
 from flask import url_for
@@ -17,21 +17,23 @@
 from werkzeug.utils import cached_property
 
 from baseframe import __, statsd
-from coaster.auth import current_auth
+from coaster.sqlalchemy import RoleAccessProxy
 
 from .. import app
+from ..auth import current_auth
 from ..models import (
     Account,
     AccountEmail,
     AccountPhone,
+    ModelUuidProtocol,
     Notification,
     NotificationFor,
     NotificationRecipient,
     db,
+    sa,
 )
 from ..serializers import token_serializer
 from ..transports import TransportError, email, platform_transports, sms
-from ..transports.sms import SmsTemplate
 from .helpers import make_cached_token
 from .jobs import rqjob
 
@@ -55,7 +57,7 @@ class DecisionFactorBase:
     """
     Base class for a decision factor in picking from one of many templates.
 
-    Subclasses must implemnt :meth:`is_match`.
+    Subclasses must implement :meth:`is_match`.
     """
 
     #: Subclasses must implement an is_match method
@@ -68,8 +70,8 @@ class DecisionFactorBase:
 
     # Additional criteria must be defined in subclasses
 
-    def match(self, obj: Any, **kwargs) -> DecisionFactorBase | None:
-        """If the parameters matche the defined criteria, return self."""
+    def match(self, obj: Any, **kwargs: Any) -> DecisionFactorBase | None:
+        """If the parameters match the defined criteria, return self."""
         return self if self.is_match(obj, **kwargs) else None
 
 
@@ -109,7 +111,7 @@ def __post_init__(self) -> None:
                         f"expected {expected_value}, got {factor_value} in {factor}"
                     )
 
-    def match(self, obj: Any, **kwargs) -> DecisionFactorBase | None:
+    def match(self, obj: Any, **kwargs: Any) -> DecisionFactorBase | None:
         """Find a matching decision factor, recursing through other branches."""
         if self.is_match(obj, **kwargs):
             for factor in self.factors:
@@ -156,7 +158,7 @@ class MyNotificationView(NotificationView):
         "You are receiving this because you have an account at hasgeek.com"
     )
 
-    #: Copies of reason per transport that can be overriden by subclasses using either
+    #: Copies of reason per transport that can be overridden by subclasses using either
     #: a property or an attribute
     @property
     def reason_for(self) -> str:
@@ -235,7 +237,7 @@ def tracking_tags(
             'utm_source': source,
         }
 
-    def unsubscribe_token(self, transport):
+    def unsubscribe_token(self, transport: str) -> str:
         """
         Return a token suitable for use in an unsubscribe link.
 
@@ -252,15 +254,19 @@ def unsubscribe_token(self, transport):
         # This payload is consumed by :meth:`AccountNotificationView.unsubscribe`
         # in `views/notification_preferences.py`
         return token_serializer().dumps(
+            # pylint: disable=used-before-assignment
+            # https://github.com/pylint-dev/pylint/issues/8486
             {
                 'buid': self.notification_recipient.recipient.buid,
                 'notification_type': self.notification.type,
                 'transport': transport,
-                'hash': self.transport_for(transport).transport_hash,
+                'hash': anchor.transport_hash
+                if (anchor := self.transport_for(transport)) is not None
+                else '',
             }
         )
 
-    def unsubscribe_url(self, transport):
+    def unsubscribe_url(self, transport: str) -> str:
         """Return an unsubscribe URL."""
         return url_for(
             'notification_unsubscribe',
@@ -270,21 +276,25 @@ def unsubscribe_url(self, transport):
         )
 
     @cached_property
-    def unsubscribe_url_email(self):
+    def unsubscribe_url_email(self) -> str:
         return self.unsubscribe_url('email')
 
-    def unsubscribe_short_url(self, transport='sms'):
+    def unsubscribe_short_url(self, transport: str = 'sms') -> str:
         """Return a short but temporary unsubscribe URL (for SMS)."""
         # Eventid is included here because SMS links can't have utm_* tags.
         # However, the current implementation of the unsubscribe handler doesn't
         # use this, and can't add utm_* tags to the URL as it only examines the token
         # after cleaning up the URL, so there are no more redirects left.
         token = make_cached_token(
+            # pylint: disable=used-before-assignment
+            # https://github.com/pylint-dev/pylint/issues/8486
             {
                 'buid': self.notification_recipient.recipient.buid,
                 'notification_type': self.notification.type,
                 'transport': transport,
-                'hash': self.transport_for(transport).transport_hash,
+                'hash': anchor.transport_hash
+                if (anchor := self.transport_for(transport)) is not None
+                else '',
                 'eventid_b58': self.notification.eventid_b58,
                 'timestamp': datetime.utcnow(),  # Naive timestamp
             },
@@ -298,8 +308,10 @@ def unsubscribe_short_url(self, transport='sms'):
         return url_for('notification_unsubscribe_short', token=token, _external=True)
 
     @cached_property
-    def fragments_order_by(self):
+    def fragments_order_by(self) -> list[sa.UnaryExpression]:
         """Provide a list of order_by columns for loading fragments."""
+        if self.notification.fragment_model is None:
+            return []
         return [
             self.notification.fragment_model.updated_at.desc()
             if hasattr(self.notification.fragment_model, 'updated_at')
@@ -307,20 +319,21 @@ def fragments_order_by(self):
         ]
 
     @property
-    def fragments_query_options(self):
+    def fragments_query_options(self) -> Sequence:
         """Provide a list of SQLAlchemy options for loading fragments."""
         return []
 
     @cached_property
-    def fragments(self):
-        if not self.notification.fragment_model:
+    def fragments(
+        self,
+    ) -> list[RoleAccessProxy[ModelUuidProtocol]]:  # type: ignore[type-var]  # FIXME
+        query = self.notification_recipient.rolledup_fragments()
+        if query is None:
             return []
 
-        query = self.notification_recipient.rolledup_fragments().order_by(
-            *self.fragments_order_by
-        )
-        if self.fragments_query_options:
-            query = query.options(*self.fragments_query_options)
+        query = query.order_by(*self.fragments_order_by)
+        if query_options := self.fragments_query_options:
+            query = query.options(*query_options)
 
         return [
             _f.access_for(actor=self.notification_recipient.recipient)
@@ -341,7 +354,7 @@ def has_current_access(self) -> bool:
 
     @property
     def actor(self) -> Account | None:
-        """Actor that prompted this notification. May be overriden."""
+        """Actor that prompted this notification. May be overridden."""
         return self.notification.created_by
 
     def web(self) -> str:
@@ -355,7 +368,7 @@ def web(self) -> str:
     @property
     def email_base_url(self) -> str:
         """Base URL for relative links in email."""
-        return self.notification.role_provider_obj.absolute_url
+        return cast(str, self.notification.role_provider_obj.absolute_url)
 
     def email_subject(self) -> str:
         """
@@ -385,7 +398,13 @@ def email_from(self) -> str:
             return f"{self.notification.preference_context.title} (via Hasgeek)"
         return "Hasgeek"
 
-    def sms(self) -> SmsTemplate:
+    def sms_with_unsubscribe(self) -> sms.SmsTemplate:
+        """Add an unsubscribe link to the SMS message."""
+        msg = self.sms()
+        msg.unsubscribe_url = self.unsubscribe_short_url('sms')
+        return msg
+
+    def sms(self) -> sms.SmsTemplate:
         """
         Render a short text message. Templates must use a single line with a link.
 
@@ -397,12 +416,6 @@ def text(self) -> str:
         """Render a short plain text notification using the SMS template."""
         return self.sms().text
 
-    def sms_with_unsubscribe(self) -> SmsTemplate:
-        """Add an unsubscribe link to the SMS message."""
-        msg = self.sms()
-        msg.unsubscribe_url = self.unsubscribe_short_url('sms')
-        return msg
-
     def webpush(self) -> str:
         """
         Render a web push notification.
@@ -496,7 +509,7 @@ def transport_worker_wrapper(
     def inner(notification_recipient_ids: Sequence[tuple[int, UUID]]) -> None:
         """Convert a notification id into an object for worker to process."""
         queue = [
-            NotificationRecipient.query.get(identity)
+            db.session.get(NotificationRecipient, identity)
             for identity in notification_recipient_ids
         ]
         for notification_recipient in queue:
@@ -557,10 +570,10 @@ def dispatch_transport_email(
                     # pylint: enable=consider-using-f-string
                 )
             ),
-            'List-Help': f'<{url_for("notification_preferences")}>',
+            'List-Help': f'<{url_for("notification_preferences", _external=True)}>',
             'List-Unsubscribe': f'<{view.unsubscribe_url_email}>',
             'List-Unsubscribe-Post': 'One-Click',
-            'List-Archive': f'<{url_for("notifications")}>',
+            'List-Archive': f'<{url_for("notifications", _external=True)}>',
         },
         base_url=view.email_base_url,
     )
@@ -586,8 +599,13 @@ def dispatch_transport_sms(
         # the worker may be delayed and the user may have changed their preference.
         notification_recipient.messageid_sms = 'cancelled'
         return
+    try:
+        message = view.sms_with_unsubscribe()
+    except NotImplementedError:
+        notification_recipient.messageid_sms = 'not-implemented'
+        return
     notification_recipient.messageid_sms = sms.send_sms(
-        str(view.transport_for('sms')), view.sms_with_unsubscribe()
+        str(view.transport_for('sms')), message
     )
     statsd.incr(
         'notification.transport',
@@ -609,15 +627,16 @@ def dispatch_transport_sms(
 @rqjob()
 def dispatch_notification_job(eventid: UUID, notification_ids: Sequence[UUID]) -> None:
     """Process :class:`Notification` into batches of :class:`UserNotification`."""
-    notifications = [Notification.query.get((eventid, nid)) for nid in notification_ids]
+    notifications = [
+        db.session.get(Notification, (eventid, nid)) for nid in notification_ids
+    ]
 
     # Dispatch, creating batches of DISPATCH_BATCH_SIZE each
     for notification in notifications:
         if notification is not None:
             generator = notification.dispatch()
             # TODO: Use walrus operator := after we move off Python 3.7
-            batch = tuple(islice(generator, DISPATCH_BATCH_SIZE))
-            while batch:
+            while batch := tuple(islice(generator, DISPATCH_BATCH_SIZE)):
                 db.session.commit()
                 notification_recipient_ids = [
                     notification_recipient.identity for notification_recipient in batch
@@ -629,7 +648,6 @@ def dispatch_notification_job(eventid: UUID, notification_ids: Sequence[UUID]) -
                     tags={'notification_type': notification.type},
                 )
                 # Continue to the next batch
-                batch = tuple(islice(generator, DISPATCH_BATCH_SIZE))
 
 
 @rqjob()
@@ -637,8 +655,9 @@ def dispatch_notification_recipients_job(
     notification_recipient_ids: Sequence[tuple[int, UUID]]
 ) -> None:
     """Process notifications for users and enqueue transport delivery."""
+    # TODO: Can this be a single query instead of a loop of queries?
     queue = [
-        NotificationRecipient.query.get(identity)
+        db.session.get(NotificationRecipient, identity)
         for identity in notification_recipient_ids
     ]
     transport_batch: dict[str, list[tuple[int, UUID]]] = defaultdict(list)
diff --git a/funnel/views/notification_feed.py b/funnel/views/notification_feed.py
index 80c193ffe..8da4e3a68 100644
--- a/funnel/views/notification_feed.py
+++ b/funnel/views/notification_feed.py
@@ -5,16 +5,16 @@
 from flask import abort
 
 from baseframe import forms
-from coaster.auth import current_auth
 from coaster.views import ClassView, render_with, requestargs, route
 
 from .. import app
+from ..auth import current_auth
 from ..models import NotificationRecipient, db
 from ..typing import ReturnRenderWith
 from .login_session import requires_login
 
 
-@route('/updates')
+@route('/updates', init_app=app)
 class AllNotificationsView(ClassView):
     current_section = 'notifications'  # needed for showing active tab
 
@@ -23,7 +23,9 @@ class AllNotificationsView(ClassView):
     @requires_login
     @render_with('notification_feed.html.jinja2', json=True)
     @requestargs(('page', int), ('per_page', int))
-    def view(self, unread_only: bool, page=1, per_page=10) -> ReturnRenderWith:
+    def view(
+        self, unread_only: bool, page: int = 1, per_page: int = 10
+    ) -> ReturnRenderWith:
         pagination = NotificationRecipient.web_notifications_for(
             current_auth.user, unread_only
         ).paginate(page=page, per_page=per_page, max_per_page=100)
@@ -109,6 +111,3 @@ def mark_unread(self, eventid_b58: str) -> ReturnRenderWith:
             db.session.commit()
             return {'status': 'ok', 'unread': self.unread_count()}
         return {'status': 'error', 'error': 'csrf'}, 400
-
-
-AllNotificationsView.init_app(app)
diff --git a/funnel/views/notification_preferences.py b/funnel/views/notification_preferences.py
index e4dd0c660..4ca3c104a 100644
--- a/funnel/views/notification_preferences.py
+++ b/funnel/views/notification_preferences.py
@@ -9,11 +9,11 @@
 
 from baseframe import _, __
 from baseframe.forms import render_form, render_message
-from coaster.auth import current_auth
 from coaster.utils import getbool
 from coaster.views import ClassView, render_with, requestargs, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import SetNotificationPreferenceForm, UnsubscribeForm, transport_labels
 from ..models import (
     Account,
@@ -26,7 +26,7 @@
 )
 from ..serializers import token_serializer
 from ..transports import platform_transports
-from ..typing import ReturnRenderWith
+from ..typing import ReturnRenderWith, ReturnView
 from .helpers import (
     metarefresh_redirect,
     render_redirect,
@@ -52,7 +52,7 @@
 )
 
 
-@route('/account/notifications')
+@route('/account/notifications', init_app=app)
 class AccountNotificationView(ClassView):
     """Views for notification settings (under account settings)."""
 
@@ -181,7 +181,7 @@ def set_notification_preference(self) -> ReturnRenderWith:
         methods=['POST'],
         endpoint='notification_unsubscribe_auto',
     )
-    def unsubscribe_auto(self, token: str):
+    def unsubscribe_auto(self, token: str) -> ReturnView:
         """Implement RFC 8058 one-click auto unsubscribe for email transport."""
         # TODO: Merge this into the other handler. Unsubscribe first, then ask the user
         # if they'd like to resubscribe
@@ -244,7 +244,9 @@ def unsubscribe_auto(self, token: str):
         endpoint='notification_unsubscribe_do',
     )
     @requestargs(('cookietest', getbool))
-    def unsubscribe(self, token: str, token_type: str | None, cookietest: bool = False):
+    def unsubscribe(
+        self, token: str, token_type: str | None, cookietest: bool = False
+    ) -> ReturnView:
         """View for unsubscribing from a notification type or disabling a transport."""
         # This route strips the token from the URL before rendering the page, to avoid
         # leaking the token to web analytics software.
@@ -405,9 +407,7 @@ def unsubscribe(self, token: str, token_type: str | None, cookietest: bool = Fal
             else:
                 email_address.mark_active()
                 db.session.commit()
-        elif (
-            payload['transport'] in ('sms', 'whatsapp', 'signal') and 'hash' in payload
-        ):
+        elif payload['transport'] in ('sms', 'whatsapp') and 'hash' in payload:
             phone_number = PhoneNumber.get(phone_hash=payload['hash'])
             if phone_number is None:
                 current_app.logger.error(
@@ -448,6 +448,3 @@ def unsubscribe(self, token: str, token_type: str | None, cookietest: bool = Fal
             ajax=False,
             template='account_formlayout.html.jinja2',
         )
-
-
-AccountNotificationView.init_app(app)
diff --git a/funnel/views/notifications/account_notification.py b/funnel/views/notifications/account_notification.py
index 1a1a526f2..63416789d 100644
--- a/funnel/views/notifications/account_notification.py
+++ b/funnel/views/notifications/account_notification.py
@@ -24,7 +24,7 @@ class RenderAccountPasswordNotification(RenderNotification):
     email_heading = __("Password updated!")
 
     @property
-    def actor(self):
+    def actor(self) -> Account:
         # This notification won't have an actor when dispatched from password reset.
         # i.e., self.notification.created_by is None. However, password reset is
         # presumably performed by the owner of the user account, i.e., self.document, so
@@ -32,15 +32,15 @@ def actor(self):
         # above).
         return self.user
 
-    def web(self):
+    def web(self) -> str:
         return render_template(
             'notifications/user_password_set_web.html.jinja2', view=self
         )
 
-    def email_subject(self):
+    def email_subject(self) -> str:
         return self.emoji_prefix + _("Your password has been updated")
 
-    def email_content(self):
+    def email_content(self) -> str:
         return render_template(
             'notifications/user_password_set_email.html.jinja2', view=self
         )
diff --git a/funnel/views/notifications/comment_notification.py b/funnel/views/notifications/comment_notification.py
index 574066536..ee89f4665 100644
--- a/funnel/views/notifications/comment_notification.py
+++ b/funnel/views/notifications/comment_notification.py
@@ -1,7 +1,9 @@
-"""̌Comment noficiations."""
+"""Comment notifications."""
 
 from __future__ import annotations
 
+from typing import Any, cast
+
 from flask import render_template, url_for
 from markupsafe import Markup, escape
 from werkzeug.utils import cached_property
@@ -15,7 +17,6 @@
     CommentReplyNotification,
     CommentReportReceivedNotification,
     Commentset,
-    DuckTypeAccount,
     NewCommentNotification,
     Project,
     Proposal,
@@ -129,10 +130,16 @@ class CommentNotification(RenderNotification):
     hero_image = 'img/email/chars-v1/comment.png'
     email_heading = __("New comment!")
 
+    @cached_property
+    def commentset(self) -> Commentset:
+        if isinstance(self.document, Commentset):
+            return self.document
+        return self.document.commentset
+
     @property
-    def actor(self) -> Account | DuckTypeAccount:
+    def actor(self) -> Account:
         """Actor who commented."""
-        return self.comment.posted_by
+        return cast(Account, self.comment.posted_by)
 
     @cached_property
     def commenters(self) -> list[Account]:
@@ -150,16 +157,16 @@ def commenters(self) -> list[Account]:
 
     @property
     def project(self) -> Project | None:
-        if self.document_type == 'project':
-            return self.document.project
-        if self.document_type == 'proposal':
-            return self.document.proposal.project
+        if (document_type := self.document_type) == 'project':
+            return self.commentset.project
+        if document_type == 'proposal':
+            return self.commentset.proposal.project  # type: ignore[union-attr]
         return None
 
     @property
     def proposal(self) -> Proposal | None:
         if self.document_type == 'proposal':
-            return self.document.proposal
+            return self.commentset.proposal
         return None
 
     @property
@@ -167,25 +174,25 @@ def document_type(self) -> str:
         """Return type of document this comment is on ('comment' for replies)."""
         if self.notification.document_type == 'comment':
             return 'comment'
-        return self.document.parent_type
+        return self.commentset.parent_type
 
-    def document_comments_url(self, **kwargs) -> str:
+    def document_comments_url(self, **kwargs: Any) -> str:
         """URL to comments view on the document."""
-        if self.document_type == 'project':
-            return self.document.parent.url_for('comments', **kwargs)
-        if self.document_type == 'proposal':
-            return self.document.parent.url_for('view', **kwargs) + '#comments'
+        if (document_type := self.document_type) == 'project':
+            return self.commentset.parent.url_for('comments', **kwargs)
+        if document_type == 'proposal':
+            return self.commentset.parent.url_for('view', **kwargs) + '#comments'
         return self.document.url_for('view', **kwargs)
 
     def activity_template_standalone(self, comment: Comment | None = None) -> str:
         """Activity template for standalone use, such as email subject."""
         if comment is None:
             comment = self.comment
-        if self.document_type == 'comment':
+        if (document_type := self.document_type) == 'comment':
             return _("{actor} replied to your comment in {project}")
-        if self.document_type == 'project':
+        if document_type == 'project':
             return _("{actor} commented in {project}")
-        if self.document_type == 'proposal':
+        if document_type == 'proposal':
             return _("{actor} commented on {proposal}")
         # Unknown document type
         return _("{actor} replied to you")
@@ -194,11 +201,11 @@ def activity_template_inline(self, comment: Comment | None = None) -> str:
         """Activity template for inline use with other content, like SMS with URL."""
         if comment is None:
             comment = self.comment
-        if self.document_type == 'comment':
+        if (document_type := self.document_type) == 'comment':
             return _("{actor} replied to your comment in {project}:")
-        if self.document_type == 'project':
+        if document_type == 'project':
             return _("{actor} commented in {project}:")
-        if self.document_type == 'proposal':
+        if document_type == 'proposal':
             return _("{actor} commented on {proposal}:")
         # Unknown document type
         return _("{actor} replied to you:")
@@ -258,7 +265,7 @@ def email_content(self) -> str:
             'notifications/comment_received_email.html.jinja2', view=self
         )
 
-    def sms(self):
+    def sms(self) -> SmsTemplate:
         url = shortlink(
             self.comment.url_for(_external=True, **self.tracking_tags('sms'))
         )
diff --git a/funnel/views/notifications/mixins.py b/funnel/views/notifications/mixins.py
index b3e7270d3..1631ee2fc 100644
--- a/funnel/views/notifications/mixins.py
+++ b/funnel/views/notifications/mixins.py
@@ -9,7 +9,7 @@
 
 _T = TypeVar('_T')  # Host type for SetVar
 _I = TypeVar('_I')  # Input type for SetVar's setter
-_O = TypeVar('_O')  # Output type for SetVar's setter
+_O = TypeVar('_O')  # Output type for SetVar's getter
 
 
 class SetVar(Generic[_T, _I, _O]):
@@ -47,7 +47,7 @@ def __get__(self, instance: _T | None, owner: type[_T] | None = None) -> Self |
         try:
             return instance.__dict__[self.name]
         except KeyError:
-            raise AttributeError(self.name) from None
+            raise AttributeError(self.name, name=self.name, obj=instance) from None
 
     def __set__(self, instance: _T, value: _I) -> None:
         instance.__dict__[self.name] = self.fset(instance, value)
@@ -56,7 +56,7 @@ def __delete__(self, instance: _T) -> None:
         try:
             instance.__dict__.pop(self.name)
         except KeyError:
-            raise AttributeError(self.name) from None
+            raise AttributeError(self.name, name=self.name, obj=instance) from None
 
 
 class TemplateVarMixin:
diff --git a/funnel/views/notifications/organization_membership_notification.py b/funnel/views/notifications/organization_membership_notification.py
index 97faf526e..0c7737e42 100644
--- a/funnel/views/notifications/organization_membership_notification.py
+++ b/funnel/views/notifications/organization_membership_notification.py
@@ -8,16 +8,19 @@
 
 from flask import render_template
 from markupsafe import Markup, escape
+from werkzeug.utils import cached_property
 
 from baseframe import _, __
 
 from ...models import (
     Account,
     AccountMembership,
+    MembershipRecordTypeEnum,
+    Notification,
     NotificationRecipient,
-    NotificationType,
     OrganizationAdminMembershipNotification,
     OrganizationAdminMembershipRevokedNotification,
+    sa,
 )
 from ...transports.sms import MessageTemplate
 from ..notification import DecisionBranchBase, DecisionFactorBase, RenderNotification
@@ -29,7 +32,7 @@ class DecisionFactorFields:
 
     is_member: bool | None = None
     for_actor: bool | None = None
-    rtypes: Collection[str] = ()
+    rtypes: Collection[MembershipRecordTypeEnum] = ()
     is_owner: bool | None = None
     is_actor: bool | None = None
 
@@ -43,7 +46,7 @@ def is_match(
         return (
             (self.is_member is None or self.is_member is is_member)
             and (self.for_actor is None or self.for_actor is for_actor)
-            and (not self.rtypes or membership.record_type_label.name in self.rtypes)
+            and (not self.rtypes or membership.record_type_enum in self.rtypes)
             and (self.is_owner is None or self.is_owner is membership.is_owner)
             and (self.is_actor is None or (self.is_actor is membership.is_self_granted))
         )
@@ -63,7 +66,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
 grant_amend_templates = DecisionBranch(
     factors=[
         DecisionBranch(
-            rtypes=['invite'],
+            rtypes=[MembershipRecordTypeEnum.INVITE],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -121,7 +124,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['direct_add'],
+            rtypes=[MembershipRecordTypeEnum.DIRECT_ADD],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -169,7 +172,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['accept'],
+            rtypes=[MembershipRecordTypeEnum.ACCEPT],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -229,7 +232,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['amend'],
+            rtypes=[MembershipRecordTypeEnum.AMEND],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -345,7 +348,7 @@ class RenderShared:
 
     organization: Account
     membership: AccountMembership
-    notification: NotificationType
+    notification: Notification
     notification_recipient: NotificationRecipient
     template_picker: DecisionBranch
 
@@ -439,7 +442,9 @@ class RenderOrganizationAdminMembershipNotification(RenderShared, RenderNotifica
     email_heading = __("Membership granted!")
     template_picker = grant_amend_templates
 
-    fragments_order_by = [AccountMembership.granted_at.desc()]
+    @cached_property
+    def fragments_order_by(self) -> list[sa.UnaryExpression]:
+        return [AccountMembership.granted_at.desc()]
 
     def membership_actor(
         self, membership: AccountMembership | None = None
@@ -472,7 +477,9 @@ class RenderOrganizationAdminMembershipRevokedNotification(
     email_heading = __("Membership revoked")
     template_picker = revoke_templates
 
-    fragments_order_by = [AccountMembership.revoked_at.desc()]
+    @cached_property
+    def fragments_order_by(self) -> list[sa.UnaryExpression]:
+        return [AccountMembership.revoked_at.desc()]
 
     def membership_actor(
         self, membership: AccountMembership | None = None
diff --git a/funnel/views/notifications/project_crew_notification.py b/funnel/views/notifications/project_crew_notification.py
index e6e3d1227..a04af0275 100644
--- a/funnel/views/notifications/project_crew_notification.py
+++ b/funnel/views/notifications/project_crew_notification.py
@@ -4,21 +4,24 @@
 
 from collections.abc import Callable, Collection
 from dataclasses import dataclass
-from typing import ClassVar
+from typing import TYPE_CHECKING, ClassVar
 
 from flask import render_template
 from markupsafe import Markup, escape
+from werkzeug.utils import cached_property
 
 from baseframe import _, __
 
 from ...models import (
     Account,
+    MembershipRecordTypeEnum,
+    Notification,
     NotificationRecipient,
-    NotificationType,
     Project,
     ProjectCrewMembershipNotification,
     ProjectCrewMembershipRevokedNotification,
     ProjectMembership,
+    sa,
 )
 from ...transports.sms import OneLineTemplate
 from ..helpers import shortlink
@@ -31,7 +34,7 @@ class DecisionFactorFields:
 
     is_member: bool | None = None
     for_actor: bool | None = None
-    rtypes: Collection[str] = ()
+    rtypes: Collection[MembershipRecordTypeEnum] = ()
     is_editor: bool | None = None
     is_promoter: bool | None = None
     is_usher: bool | None = None
@@ -46,7 +49,7 @@ def is_match(
         return (
             (self.is_member is None or self.is_member is is_member)
             and (self.for_actor is None or self.for_actor is for_actor)
-            and (not self.rtypes or membership.record_type_label.name in self.rtypes)
+            and (not self.rtypes or membership.record_type_enum in self.rtypes)
             and (self.is_editor is None or self.is_editor is membership.is_editor)
             and (self.is_promoter is None or self.is_promoter is membership.is_promoter)
             and (self.is_usher is None or self.is_usher is membership.is_usher)
@@ -77,7 +80,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
 grant_amend_templates = DecisionBranch(
     factors=[
         DecisionBranch(
-            rtypes=['invite'],
+            rtypes=[MembershipRecordTypeEnum.INVITE],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -142,7 +145,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
                                 "{actor} invited you to join the crew of {project}"
                             ),
                             is_member=True,
-                            rtypes=['invite'],
+                            rtypes=[MembershipRecordTypeEnum.INVITE],
                         ),
                     ],
                 ),
@@ -172,7 +175,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
                             template=__(
                                 "You invited {user} to join the crew of {project}"
                             ),
-                            rtypes=['invite'],
+                            rtypes=[MembershipRecordTypeEnum.INVITE],
                             for_actor=True,
                         ),
                     ],
@@ -180,7 +183,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['accept'],
+            rtypes=[MembershipRecordTypeEnum.ACCEPT],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -248,7 +251,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['direct_add'],
+            rtypes=[MembershipRecordTypeEnum.DIRECT_ADD],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -344,7 +347,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
                         ),
                         DecisionFactor(
                             template=__("You made {user} promoter of {project}"),
-                            rtypes=['direct_add'],
+                            rtypes=[MembershipRecordTypeEnum.DIRECT_ADD],
                             is_promoter=True,
                         ),
                         DecisionFactor(
@@ -377,7 +380,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
             ],
         ),
         DecisionBranch(
-            rtypes=['amend'],
+            rtypes=[MembershipRecordTypeEnum.AMEND],
             factors=[
                 DecisionBranch(
                     for_actor=False,
@@ -530,7 +533,7 @@ class DecisionBranch(DecisionFactorFields, DecisionBranchBase):
                             template=__(
                                 "You changed your role to crew member of {project}"
                             ),
-                            rtypes=['amend'],
+                            rtypes=[MembershipRecordTypeEnum.AMEND],
                             is_self_granted=True,
                         ),
                     ],
@@ -667,7 +670,7 @@ class RenderShared:
 
     project: Project
     membership: ProjectMembership
-    notification: NotificationType
+    notification: Notification
     notification_recipient: NotificationRecipient
     #: Subclasses must specify a base template picker
     template_picker: DecisionBranch
@@ -771,19 +774,25 @@ class RenderProjectCrewMembershipNotification(RenderShared, RenderNotification):
     aliases = {'document': 'project', 'fragment': 'membership'}
     hero_image = 'img/email/chars-v1/access-granted.png'
     email_heading = __("Crew membership granted!")
-    fragments_order_by = [ProjectMembership.granted_at.desc()]
     template_picker = grant_amend_templates
 
+    @cached_property
+    def fragments_order_by(self) -> list[sa.UnaryExpression]:
+        return [ProjectMembership.granted_at.desc()]
+
     def membership_actor(self, membership: ProjectMembership | None = None) -> Account:
         """Actual actor who granted (or edited) the membership, for the template."""
-        return (membership or self.membership).granted_by
+        actor = (membership or self.membership).granted_by
+        if TYPE_CHECKING:
+            assert actor is not None  # nosec B101
+        return actor
 
-    def web(self):
+    def web(self) -> str:
         return render_template(
             'notifications/project_crew_membership_granted_web.html.jinja2', view=self
         )
 
-    def email_content(self):
+    def email_content(self) -> str:
         return render_template(
             'notifications/project_crew_membership_granted_email.html.jinja2', view=self
         )
diff --git a/funnel/views/notifications/proposal_notification.py b/funnel/views/notifications/proposal_notification.py
index 2959fe204..9a13ec1c9 100644
--- a/funnel/views/notifications/proposal_notification.py
+++ b/funnel/views/notifications/proposal_notification.py
@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
+
 from flask import render_template
+from werkzeug.utils import cached_property
 
 from baseframe import _, __
 
@@ -12,6 +15,7 @@
     ProposalReceivedNotification,
     ProposalSubmittedNotification,
     sa,
+    sa_orm,
 )
 from ...transports.sms import SmsPriority, SmsTemplate
 from ..helpers import shortlink
@@ -69,12 +73,17 @@ class RenderProposalReceivedNotification(RenderNotification):
     hero_image = 'img/email/chars-v1/new-submission.png'
     email_heading = __("New submission!")
 
-    fragments_order_by = [Proposal.datetime.desc()]
-    fragments_query_options = [
-        sa.orm.load_only(
-            Proposal.name, Proposal.title, Proposal.project_id, Proposal.uuid
-        )
-    ]
+    @cached_property
+    def fragments_order_by(self) -> list[sa.UnaryExpression]:
+        return [Proposal.datetime.desc()]
+
+    @property
+    def fragments_query_options(self) -> Sequence:
+        return [
+            sa_orm.load_only(
+                Proposal.name, Proposal.title, Proposal.project_id, Proposal.uuid
+            )
+        ]
 
     def web(self) -> str:
         return render_template(
@@ -117,7 +126,7 @@ class RenderProposalSubmittedNotification(RenderNotification):
     emoji_prefix = "📤 "
     reason = __("You are receiving this because you made this submission")
     hero_image = 'img/email/chars-v1/sent-submission.png'
-    email_heading = __("Proposal sumbitted!")
+    email_heading = __("Proposal submitted!")
 
     def web(self) -> str:
         return render_template(
diff --git a/funnel/views/notifications/rsvp_notification.py b/funnel/views/notifications/rsvp_notification.py
index 65fe69c24..75946b0c9 100644
--- a/funnel/views/notifications/rsvp_notification.py
+++ b/funnel/views/notifications/rsvp_notification.py
@@ -108,15 +108,15 @@ class RenderRegistrationConfirmationNotification(RegistrationBase, RenderNotific
     datetime_format = "EEE, dd MMM yyyy, hh:mm a"
     datetime_format_sms = "EEE, dd MMM, hh:mm a"
 
-    def web(self):
+    def web(self) -> str:
         return render_template('notifications/rsvp_yes_web.html.jinja2', view=self)
 
-    def email_subject(self):
+    def email_subject(self) -> str:
         return self.emoji_prefix + _("Registration confirmation for {project}").format(
             project=self.rsvp.project.joined_title
         )
 
-    def email_content(self):
+    def email_content(self) -> str:
         return render_template(
             'notifications/rsvp_yes_email.html.jinja2',
             view=self,
diff --git a/funnel/views/organization.py b/funnel/views/organization.py
index 4fe28568b..08b3b18a8 100644
--- a/funnel/views/organization.py
+++ b/funnel/views/organization.py
@@ -6,10 +6,10 @@
 
 from baseframe import _
 from baseframe.forms import render_delete_sqla, render_form, render_message
-from coaster.auth import current_auth
 from coaster.views import ModelView, UrlChangeCheck, UrlForView, requires_roles, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import OrganizationForm, TeamForm
 from ..models import Account, Organization, Team, db
 from ..signals import org_data_changed, team_data_changed
@@ -43,17 +43,15 @@ def people_and_teams(obj: Organization) -> list[tuple[Account, list[Team]]]:
 
 
 @Account.views('org')
-@route('/<account>')
-class OrgView(UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>', init_app=app)
+class OrgView(UrlChangeCheck, UrlForView, ModelView[Account]):
     """Views for organizations."""
 
     __decorators__ = [requires_login]
-    model = Account
     # Map <account> in URL to attribute `urlname`, for `url_for` automation
     route_model_map = {'account': 'urlname'}
-    obj: Account
 
-    def loader(self, account: str | None = None) -> Account | None:
+    def load(self, account: str | None = None) -> None:
         """Load an organization if the view requires it."""
         if account:
             obj = Account.get(name=account)
@@ -61,8 +59,9 @@ def loader(self, account: str | None = None) -> Account | None:
                 abort(404)
             if not obj.state.ACTIVE:
                 abort(410)
-            return obj
-        return None
+            self.obj = obj
+        else:
+            self.obj = None  # type: ignore[assignment]
 
     # The /new root URL is intentional
     @route('/new', methods=['GET', 'POST'], endpoint='new_organization')
@@ -149,22 +148,17 @@ def new_team(self) -> ReturnView:
         )
 
 
-OrgView.init_app(app)
-
-
 @Team.views('main')
-@route('/<account>/teams/<team>')
-class TeamView(UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/teams/<team>', init_app=app)
+class TeamView(UrlChangeCheck, UrlForView, ModelView[Team]):
     """Views for teams in organizations."""
 
     __decorators__ = [requires_login]
-    model = Team
     # Map <name> and <buid> in URLs to model attributes, for `url_for` automation
     route_model_map = {
         'account': 'account.urlname',
         'team': 'buid',
     }
-    obj: Team
 
     def loader(self, account: str, team: str) -> Team:
         """Load a team."""
@@ -209,6 +203,3 @@ def delete(self) -> ReturnView:
             ).format(team=self.obj.title, org=self.obj.account.title),
             next=self.obj.account.url_for('teams'),
         )
-
-
-TeamView.init_app(app)
diff --git a/funnel/views/otp.py b/funnel/views/otp.py
index cc9c7b711..4a7fc71b4 100644
--- a/funnel/views/otp.py
+++ b/funnel/views/otp.py
@@ -4,7 +4,7 @@
 
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import Generic, Optional, TypeVar
+from typing import Any, Generic, Optional, TypeVar
 
 import phonenumbers
 from flask import current_app, flash, render_template, request, session, url_for
@@ -12,15 +12,16 @@
 from werkzeug.utils import cached_property
 
 from baseframe import _
-from coaster.auth import current_auth
 from coaster.utils import newpin, require_one_of
 
 from .. import app
+from ..auth import current_auth
 from ..models import (
     Account,
     AccountEmail,
     AccountEmailClaim,
     AccountPhone,
+    Anchor,
     EmailAddress,
     EmailAddressBlockedError,
     PhoneNumber,
@@ -107,7 +108,7 @@ class OtpSession(Generic[OptionalAccountType]):
     link_token: str | None = None
 
     # __new__ gets called before __init__ and can replace the class that is created
-    def __new__(cls, reason: str, **kwargs) -> OtpSession:  # pylint: disable=W0221
+    def __new__(cls, reason: str, **kwargs: Any) -> OtpSession:  # pylint: disable=W0221
         """Return a subclass that contains the appropriate methods for given reason."""
         if reason not in _reason_subclasses:
             raise TypeError(f"Unknown OtpSession reason {reason}")
@@ -118,7 +119,7 @@ def __new__(cls, reason: str, **kwargs) -> OtpSession:  # pylint: disable=W0221
     # __init_subclass__ gets called for ``class Subclass(OtpSession, reason='...'):``
     # and receives `reason` as a kwarg. However, declaring it in the method signature
     # upsets PyLint, so we pop it from kwargs.
-    def __init_subclass__(cls, *args, **kwargs) -> None:
+    def __init_subclass__(cls, *args: Any, **kwargs: Any) -> None:
         """Register a subclass for use by __new__."""
         reason = kwargs.pop('reason', None)
         if not reason:
@@ -134,7 +135,7 @@ def make(
         cls: type[OtpSessionType],
         reason: str,
         user: OptionalAccountType,
-        anchor: AccountEmail | AccountEmailClaim | AccountPhone | EmailAddress | None,
+        anchor: Anchor | None,
         phone: str | None = None,
         email: str | None = None,
     ) -> OtpSessionType:
diff --git a/funnel/views/profile.py b/funnel/views/profile.py
index c16173794..2dfa01cc6 100644
--- a/funnel/views/profile.py
+++ b/funnel/views/profile.py
@@ -2,16 +2,15 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from flask import abort, current_app, flash, render_template, request
 
 from baseframe import _
 from baseframe.filters import date_filter
 from baseframe.forms import render_form
-from coaster.auth import current_auth
 from coaster.views import (
-    ModelView,
     UrlChangeCheck,
-    UrlForView,
     get_next_url,
     render_with,
     requestargs,
@@ -20,6 +19,7 @@
 )
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     ProfileBannerForm,
     ProfileForm,
@@ -30,12 +30,12 @@
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import render_redirect
 from .login_session import requires_login, requires_user_not_spammy
-from .mixins import AccountViewMixin
+from .mixins import AccountViewBase
 from .schedule import schedule_data, session_list_data
 
 
 @Account.features('new_project')
-def feature_profile_new_project(obj):
+def feature_profile_new_project(obj: Account) -> bool:
     return (
         obj.is_organization_profile
         and obj.current_roles.admin
@@ -44,7 +44,7 @@ def feature_profile_new_project(obj):
 
 
 @Account.features('new_user_project')
-def feature_profile_new_user_project(obj: Account):
+def feature_profile_new_user_project(obj: Account) -> bool:
     return (
         obj.is_user_profile
         and obj.current_roles.admin
@@ -53,33 +53,33 @@ def feature_profile_new_user_project(obj: Account):
 
 
 @Account.features('make_public')
-def feature_profile_make_public(obj: Account):
+def feature_profile_make_public(obj: Account) -> bool:
     return obj.current_roles.admin and obj.make_profile_public.is_available
 
 
 @Account.features('make_private')
-def feature_profile_make_private(obj: Account):
+def feature_profile_make_private(obj: Account) -> bool:
     return obj.current_roles.admin and obj.make_profile_private.is_available
 
 
 @Account.features('is_private')
-def feature_profile_is_private(obj: Account):
+def feature_profile_is_private(obj: Account) -> bool:
     return not obj.current_roles.admin and not bool(obj.profile_state.ACTIVE_AND_PUBLIC)
 
 
-def template_switcher(templateargs):
+def template_switcher(templateargs: dict[str, Any]) -> str:
     template = templateargs.pop('template')
     return render_template(template, **templateargs)
 
 
 @Account.views('main')
-@route('/<account>')
-class ProfileView(AccountViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>', init_app=app)
+class ProfileView(UrlChangeCheck, AccountViewBase):
     @route('', endpoint='profile')
     @render_with({'text/html': template_switcher}, json=True)
     def view(self) -> ReturnRenderWith:
         template_name = None
-        ctx = {}
+        ctx: dict[str, Any] = {}
 
         if self.obj.is_user_profile:
             template_name = 'user_profile.html.jinja2'
@@ -175,7 +175,7 @@ def view(self) -> ReturnRenderWith:
             # If the user is an admin of this account, show all draft projects.
             # Else, only show the drafts they have a crew role in
             if self.obj.current_roles.admin:
-                draft_projects = self.obj.draft_projects
+                draft_projects: list[Project] = self.obj.draft_projects.all()
                 unscheduled_projects = self.obj.projects.filter(
                     Project.state.PUBLISHED_WITHOUT_SESSIONS
                 ).all()
@@ -280,7 +280,7 @@ def user_proposals(self) -> ReturnRenderWith:
     @route('past.projects')
     @requestargs(('page', int), ('per_page', int))
     @render_with('past_projects_section.html.jinja2')
-    def past_projects(self, page: int = 1, per_page: int = 10) -> ReturnView:
+    def past_projects(self, page: int = 1, per_page: int = 10) -> ReturnRenderWith:
         projects = self.obj.listed_projects.order_by(None)
         past_projects = projects.filter(Project.state.PAST).order_by(
             Project.start_at.desc()
@@ -307,7 +307,7 @@ def past_projects(self, page: int = 1, per_page: int = 10) -> ReturnView:
     @route('past.sessions')
     @requestargs(('page', int), ('per_page', int))
     @render_with('past_sessions_section.html.jinja2')
-    def past_sessions(self, page: int = 1, per_page: int = 10) -> ReturnView:
+    def past_sessions(self, page: int = 1, per_page: int = 10) -> ReturnRenderWith:
         featured_sessions = (
             Session.query.join(Project, Session.project_id == Project.id)
             .filter(
@@ -466,6 +466,3 @@ def transition(self) -> ReturnView:
                 _("There was a problem saving your changes. Please try again"), 'error'
             )
         return render_redirect(get_next_url(referrer=True))
-
-
-ProfileView.init_app(app)
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 8f61f9d68..c278f0240 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -7,24 +7,16 @@
 from types import SimpleNamespace
 
 from flask import Response, abort, current_app, flash, render_template, request
-from flask_babel import LazyString, format_number
+from flask_babel import format_number
 from markupsafe import Markup
 
 from baseframe import _, __, forms
 from baseframe.forms import render_delete_sqla, render_form, render_message
-from coaster.auth import current_auth
 from coaster.utils import getbool, make_name
-from coaster.views import (
-    ModelView,
-    UrlChangeCheck,
-    UrlForView,
-    get_next_url,
-    render_with,
-    requires_roles,
-    route,
-)
+from coaster.views import get_next_url, render_with, requires_roles, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     CfpForm,
     ProjectBannerForm,
@@ -38,13 +30,13 @@
     ProjectTransitionForm,
 )
 from ..models import (
-    PROJECT_RSVP_STATE,
-    RSVP_STATUS,
     Account,
     Project,
+    ProjectRsvpStateEnum,
     RegistrationCancellationNotification,
     RegistrationConfirmationNotification,
     Rsvp,
+    RsvpStateEnum,
     SavedProject,
     db,
     sa,
@@ -58,7 +50,7 @@
     requires_site_editor,
     requires_user_not_spammy,
 )
-from .mixins import AccountViewMixin, DraftViewMixin, ProjectViewMixin
+from .mixins import AccountViewBase, DraftViewProtoMixin, ProjectViewBase
 from .notification import dispatch_notification
 
 
@@ -66,10 +58,10 @@
 class CountWords:
     """Labels for a count of registrations."""
 
-    unregistered: str | LazyString
-    registered: str | LazyString
-    not_following: str | LazyString
-    following: str | LazyString
+    unregistered: str
+    registered: str
+    not_following: str
+    following: str
 
 
 registration_count_messages = [
@@ -149,8 +141,8 @@ class CountWords:
 
 
 def get_registration_text(
-    count: int, registered=False, follow_mode=False
-) -> str | LazyString:
+    count: int, registered: bool = False, follow_mode: bool = False
+) -> str:
     if count < len(registration_count_messages):
         if registered and not follow_mode:
             return registration_count_messages[count].registered
@@ -174,9 +166,9 @@ def feature_project_rsvp(obj: Project) -> bool:
         obj.state.PUBLISHED
         and (obj.start_at is None or not obj.state.PAST)
         and (
-            obj.rsvp_state == PROJECT_RSVP_STATE.ALL
+            obj.rsvp_state == ProjectRsvpStateEnum.ALL
             or (
-                obj.rsvp_state == PROJECT_RSVP_STATE.MEMBERS
+                obj.rsvp_state == ProjectRsvpStateEnum.MEMBERS
                 and obj.current_roles.account_member
             )
         )
@@ -188,7 +180,7 @@ def feature_project_rsvp_for_members(obj: Project) -> bool:
     return bool(
         obj.state.PUBLISHED
         and (obj.start_at is None or not obj.state.PAST)
-        and obj.rsvp_state == PROJECT_RSVP_STATE.MEMBERS
+        and obj.rsvp_state == ProjectRsvpStateEnum.MEMBERS
     )
 
 
@@ -232,7 +224,7 @@ def feature_project_register(obj: Project) -> bool:
 @Project.features('rsvp_registered', cached_property=True)
 def feature_project_deregister(obj: Project) -> bool:
     rsvp = obj.rsvp_for(current_auth.user)
-    return rsvp is not None and rsvp.state.YES
+    return rsvp is not None and bool(rsvp.state.YES)
 
 
 @Project.features('schedule_no_sessions')
@@ -256,7 +248,7 @@ def project_follow_mode(obj: Project) -> bool:
 
 
 @Project.views('registration_text')
-def project_registration_text(obj: Project) -> str | LazyString:
+def project_registration_text(obj: Project) -> str:
     return get_registration_text(
         count=obj.rsvp_count_going,
         registered=obj.features.rsvp_registered,
@@ -283,8 +275,8 @@ def project_register_button_text(obj: Project) -> str:
 
 
 @Account.views('project_new')
-@route('/<account>')
-class AccountProjectView(AccountViewMixin, UrlForView, ModelView):
+@route('/<account>', init_app=app)
+class AccountProjectView(AccountViewBase):
     """Project views inside the account (new project view only)."""
 
     @route('new', methods=['GET', 'POST'])
@@ -318,23 +310,16 @@ def new_project(self) -> ReturnView:
         )
 
 
-AccountProjectView.init_app(app)
-
-
-# mypy has trouble with the definition of `obj` and `model` between ProjectViewMixin and
-# DraftViewMixin
 @Project.views('main')
-@route('/<account>/<project>/')
-class ProjectView(  # type: ignore[misc]
-    ProjectViewMixin, DraftViewMixin, UrlChangeCheck, UrlForView, ModelView
-):
+@route('/<account>/<project>/', init_app=app)
+class ProjectView(ProjectViewBase, DraftViewProtoMixin):
     """All main project views."""
 
     @route('')
     @render_with(html_in_json('project.html.jinja2'))
     @requires_roles({'reader'})
     def view(self) -> ReturnRenderWith:
-        """Render project landing lage."""
+        """Render project landing page."""
         return {
             'project': self.obj.current_access(datasets=('primary', 'related')),
             'featured_proposals': [
@@ -487,7 +472,7 @@ def edit(self) -> ReturnView:
 
             return render_redirect(self.obj.url_for())
         # Reset nonce to avoid conflict with autosave
-        form.form_nonce.data = form.form_nonce.default()
+        form.form_nonce.data = form.form_nonce.get_default()
         return render_form(
             form=form,
             title=_("Edit project"),
@@ -761,7 +746,7 @@ def rsvp_list(self) -> ReturnRenderWith:
             'project': self.obj.current_access(datasets=('primary', 'related')),
             'going_rsvps': [
                 _r.current_access(datasets=('without_parent', 'related', 'related'))
-                for _r in self.obj.rsvps_with(RSVP_STATUS.YES)
+                for _r in self.obj.rsvps_with(RsvpStateEnum.YES)
             ],
             'rsvp_form_fields': [
                 field.get('name', '')
@@ -772,7 +757,7 @@ def rsvp_list(self) -> ReturnRenderWith:
             else None,
         }
 
-    def get_rsvp_state_csv(self, state):
+    def get_rsvp_state_csv(self, state: RsvpStateEnum) -> Response:
         """Export participant list as a CSV."""
         outfile = io.StringIO(newline='')
         out = csv.writer(outfile)
@@ -806,14 +791,14 @@ def get_rsvp_state_csv(self, state):
     @requires_roles({'promoter'})
     def rsvp_list_yes_csv(self) -> ReturnView:
         """Return a CSV of RSVP participants who answered Yes."""
-        return self.get_rsvp_state_csv(state=RSVP_STATUS.YES)
+        return self.get_rsvp_state_csv(RsvpStateEnum.YES)
 
     @route('rsvp_list/maybe.csv')
     @requires_login
     @requires_roles({'promoter'})
     def rsvp_list_maybe_csv(self) -> ReturnView:
         """Return a CSV of RSVP participants who answered Maybe."""
-        return self.get_rsvp_state_csv(state=RSVP_STATUS.MAYBE)
+        return self.get_rsvp_state_csv(RsvpStateEnum.MAYBE)
 
     @route('save', methods=['POST'])
     @requires_login
@@ -821,7 +806,7 @@ def rsvp_list_maybe_csv(self) -> ReturnView:
     def save(self) -> ReturnView:
         """Save (bookmark) a project."""
         form = self.SavedProjectForm()
-        form.form_nonce.data = form.form_nonce.default()
+        form.form_nonce.data = form.form_nonce.get_default()
         if form.validate_on_submit():
             proj_save = SavedProject.query.filter_by(
                 account=current_auth.user, project=self.obj
@@ -930,6 +915,3 @@ def update_featured(self) -> ReturnView:
                 'message': _("This project is no longer featured"),
             }
         return render_redirect(get_next_url(referrer=True))
-
-
-ProjectView.init_app(app)
diff --git a/funnel/views/project_sponsor.py b/funnel/views/project_sponsor.py
index b59014f73..e67808997 100644
--- a/funnel/views/project_sponsor.py
+++ b/funnel/views/project_sponsor.py
@@ -9,20 +9,20 @@
 from baseframe import _
 from baseframe.forms import Form
 from baseframe.forms.auto import ConfirmDeleteForm
-from coaster.auth import current_auth
 from coaster.utils import getbool
 from coaster.views import ModelView, UrlChangeCheck, UrlForView, requestform, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import ProjectSponsorForm
-from ..models import Account, Project, ProjectSponsorMembership, db, sa
+from ..models import Account, Project, ProjectSponsorMembership, db, sa_orm
 from ..typing import ReturnView
 from .helpers import render_redirect
 from .login_session import requires_login, requires_site_editor
-from .mixins import ProjectViewMixin
+from .mixins import ProjectViewBase
 
 
-def edit_sponsor_form(obj):
+def edit_sponsor_form(obj: ProjectSponsorMembership) -> ProjectSponsorForm:
     """Customise ProjectSponsorForm to remove member field."""
     form = ProjectSponsorForm(obj=obj)
     del form.member
@@ -30,10 +30,8 @@ def edit_sponsor_form(obj):
 
 
 @Project.views('sponsors')
-@route('/<account>/<project>/sponsors/')
-class ProjectSponsorLandingView(
-    ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView
-):
+@route('/<account>/<project>/sponsors/', init_app=app)
+class ProjectSponsorLandingView(ProjectViewBase):
     __decorators__ = [requires_login, requires_site_editor]
 
     @route('add', methods=['POST', 'GET'])
@@ -96,7 +94,7 @@ def reorder_sponsors(self, target: str, other: str, before: bool) -> ReturnView:
             sponsor: ProjectSponsorMembership = (
                 ProjectSponsorMembership.query.filter_by(uuid_b58=target)
                 .options(
-                    sa.orm.load_only(
+                    sa_orm.load_only(
                         ProjectSponsorMembership.id, ProjectSponsorMembership.seq
                     )
                 )
@@ -105,7 +103,7 @@ def reorder_sponsors(self, target: str, other: str, before: bool) -> ReturnView:
             other_sponsor: ProjectSponsorMembership = (
                 ProjectSponsorMembership.query.filter_by(uuid_b58=other)
                 .options(
-                    sa.orm.load_only(
+                    sa_orm.load_only(
                         ProjectSponsorMembership.id, ProjectSponsorMembership.seq
                     )
                 )
@@ -117,14 +115,12 @@ def reorder_sponsors(self, target: str, other: str, before: bool) -> ReturnView:
         return {'status': 'error', 'error': 'csrf'}, 422
 
 
-ProjectSponsorLandingView.init_app(app)
-
-
 @ProjectSponsorMembership.views('main')
-@route('/<account>/<project>/sponsors/<sponsorship>')
-class ProjectSponsorView(UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>/sponsors/<sponsorship>', init_app=app)
+class ProjectSponsorView(
+    UrlChangeCheck, UrlForView, ModelView[ProjectSponsorMembership]
+):
     __decorators__ = [requires_login, requires_site_editor]
-    model = ProjectSponsorMembership
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
@@ -132,13 +128,10 @@ class ProjectSponsorView(UrlChangeCheck, UrlForView, ModelView):
     }
 
     def loader(
-        self,
-        account: str,  # skipcq: PYL-W0613
-        project: str,  # skipcq: PYL-W0613
-        sponsorship: str | None = None,
+        self, sponsorship: str | None = None, **_kwargs: str
     ) -> ProjectSponsorMembership:
         obj = (
-            self.model.query.join(Project)
+            ProjectSponsorMembership.query.join(Project)
             .join(Account, Project.account)
             .filter(self.model.uuid_b58 == sponsorship)
             .one_or_404()
@@ -209,6 +202,3 @@ def remove(self) -> ReturnView:
             ref_id='remove_sponsor',
             remove=True,
         )
-
-
-ProjectSponsorView.init_app(app)
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index b4fd88ae4..c0011b5aa 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -2,11 +2,13 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from flask import abort, flash, request
 
 from baseframe import _, __
 from baseframe.forms import Form, render_delete_sqla, render_form, render_template
-from coaster.auth import current_auth
+from coaster.sqlalchemy import RoleAccessProxy
 from coaster.utils import getbool, make_name
 from coaster.views import (
     ModelView,
@@ -19,6 +21,7 @@
 )
 
 from .. import app
+from ..auth import current_auth
 from ..forms import (
     ProposalFeaturedForm,
     ProposalForm,
@@ -38,11 +41,12 @@
     ProposalSuuidRedirect,
     db,
     sa,
+    sa_orm,
 )
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .login_session import requires_login, requires_sudo, requires_user_not_spammy
-from .mixins import AccountCheckMixin, ProjectViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase
 from .notification import dispatch_notification
 from .session import session_edit
 
@@ -53,27 +57,27 @@
 
 
 @Proposal.features('comment_new')
-def proposal_comment_new(obj):
+def proposal_comment_new(obj: Proposal) -> bool:
     return obj.current_roles.commenter
 
 
 @Project.features('reorder_proposals')
-def proposals_can_be_reordered(obj):
+def proposals_can_be_reordered(obj: Project) -> bool:
     return obj.current_roles.editor
 
 
 # --- Routes ------------------------------------------------------------------
 @Project.views('proposal_new')
-@route('/<account>/<project>')
-class ProjectProposalView(ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>', init_app=app)
+class ProjectProposalView(ProjectViewBase):
     """Views for proposal management (new/reorder)."""
 
     @route('sub/new', methods=['GET', 'POST'])
     @route('proposals/new', methods=['GET', 'POST'])
     @requires_login
-    @render_with('submission_form.html.jinja2')
     @requires_roles({'reader'})
     @requires_user_not_spammy()
+    @render_with('submission_form.html.jinja2')
     def new_proposal(self) -> ReturnRenderWith:
         # This along with the `reader` role makes it possible for
         # anyone to submit a proposal if the CFP is open.
@@ -114,12 +118,12 @@ def reorder_proposals(self, target: str, other: str, before: bool) -> ReturnView
         if Form().validate_on_submit():
             proposal: Proposal = (
                 Proposal.query.filter_by(uuid_b58=target)
-                .options(sa.orm.load_only(Proposal.id, Proposal.seq))
+                .options(sa_orm.load_only(Proposal.id, Proposal.seq))
                 .one_or_404()
             )
             other_proposal: Proposal = (
                 Proposal.query.filter_by(uuid_b58=other)
-                .options(sa.orm.load_only(Proposal.id, Proposal.seq))
+                .options(sa_orm.load_only(Proposal.id, Proposal.seq))
                 .one_or_404()
             )
             proposal.current_access().reorder_item(other_proposal, before)
@@ -128,62 +132,51 @@ def reorder_proposals(self, target: str, other: str, before: bool) -> ReturnView
         return {'status': 'error', 'error': 'csrf'}, 422
 
 
-ProjectProposalView.init_app(app)
-
-
 @Proposal.views('main')
-@route('/<account>/<project>/proposals/<proposal>')
+@route('/<account>/<project>/proposals/<proposal>', init_app=app)
 @route('/<account>/<project>/sub/<proposal>')
-class ProposalView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView):
-    model = Proposal
+class ProposalView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[Proposal]):
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'proposal': 'url_name_uuid_b58',
     }
-    obj: Proposal | ProposalSuuidRedirect
 
     SavedProjectForm = SavedProjectForm
 
-    def loader(
+    def load(
         self,
         account: str,  # skipcq: PYL-W0613
         project: str,  # skipcq: PYL-W0613
         proposal: str,
-    ) -> Proposal | ProposalSuuidRedirect:
+    ) -> ReturnView | None:
         # `account` and `project` are part of the URL, but unnecessary for loading
         # a proposal since it has a unique id embedded. These parameters are not
         # used in the query.
         obj = (
-            self.model.query.join(Project)
+            Proposal.query.join(Project)
             .join(Account, Project.account)
             .filter(Proposal.url_name_uuid_b58 == proposal)
             .first()
         )
-        if obj is None:
-            if request.method == 'GET':
-                return (
-                    ProposalSuuidRedirect.query.join(Proposal)
-                    .filter(ProposalSuuidRedirect.suuid == proposal.split('-')[-1])
-                    .first_or_404()
-                )
-            abort(404)
-
-        if obj.project.state.DELETED or obj.state.DELETED:
-            abort(410)
-        return obj
-
-    def after_loader(self) -> ReturnView | None:
-        if isinstance(self.obj, ProposalSuuidRedirect):
-            if self.obj.proposal:
-                self.account = self.obj.proposal.project.account
-                return render_redirect(
-                    self.obj.proposal.url_for(),
-                    302 if request.method == 'GET' else 303,
-                )
+        if obj is not None:
+            self.account = obj.project.account
+            self.obj = obj
+            if obj.project.state.DELETED or obj.state.DELETED:
+                abort(410)
+            return self.after_loader()
+        redirect = (
+            ProposalSuuidRedirect.query.join(Proposal)
+            .filter(ProposalSuuidRedirect.suuid == proposal.split('-')[-1])
+            .first_or_404()
+        )
+        if not redirect.proposal:
             abort(410)
+        self.account = redirect.proposal.project.account
+        return render_redirect(redirect.proposal.url_for(), 308)
+
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('')
     @render_with(html_in_json('submission.html.jinja2'))
@@ -418,7 +411,7 @@ def edit_labels(self) -> ReturnView:
     @route('contacts.json', methods=['GET'])
     @requires_login
     @requires_roles({'project_editor'})
-    def contacts_json(self):
+    def contacts_json(self) -> dict[str, Any]:
         """Return the contact details of collaborators as JSON."""
         return {
             'title': self.obj.title,
@@ -435,42 +428,34 @@ def contacts_json(self):
         }
 
 
-ProposalView.init_app(app)
-
-
 @ProposalMembership.views('main')
-@route('/<account>/<project>/sub/<proposal>/collaborator/<membership>')
-class ProposalMembershipView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView):
-    model = ProposalMembership
+@route('/<account>/<project>/sub/<proposal>/collaborator/<membership>', init_app=app)
+class ProposalMembershipView(
+    AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[ProposalMembership]
+):
     route_model_map = {
         'account': 'proposal.project.account.urlname',
         'project': 'proposal.project.name',
         'proposal': 'proposal.url_name_uuid_b58',
         'membership': 'uuid_b58',
     }
-    obj: ProposalMembership
 
-    def loader(
-        self,
-        account: str,  # skipcq: PYL-W0613
-        project: str,  # skipcq: PYL-W0613
-        proposal: str,  # skipcq: PYL-W0613
-        membership: str,
-    ) -> ProposalMembership:
+    def load(self, membership: str, **_kwargs: str) -> ReturnView | None:
         # `account`, `project` and `proposal` are part of the URL, but unnecessary for
         # loading a proposal membership since it has a unique id.
-        obj = self.model.query.filter(
+        obj = ProposalMembership.query.filter(
             ProposalMembership.uuid_b58 == membership
         ).one_or_404()
         if obj.revoked_at is not None:
             abort(410)
-        return obj
+        self.obj = obj
+        self.post_init()
+        return self.after_loader()
 
-    def after_loader(self):
+    def post_init(self) -> None:
         self.account = self.obj.proposal.project.account
-        return super().after_loader()
 
-    def collaborators(self):
+    def collaborators(self) -> list[RoleAccessProxy[ProposalMembership]]:
         return [
             _m.current_access(datasets=['primary', 'related'])
             for _m in self.obj.proposal.memberships
@@ -539,6 +524,3 @@ def remove(self) -> ReturnView:
                 ),
             }
         return {'status': 'error', 'error': 'csrf'}, 422
-
-
-ProposalMembershipView.init_app(app)
diff --git a/funnel/views/schedule.py b/funnel/views/schedule.py
index 8df758ae1..eddef6567 100644
--- a/funnel/views/schedule.py
+++ b/funnel/views/schedule.py
@@ -5,38 +5,31 @@
 from collections import defaultdict
 from datetime import timedelta
 from types import SimpleNamespace
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from flask import Response, current_app, json
 from icalendar import Alarm, Calendar, Event, vCalAddress, vText
 from pytz import utc
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from baseframe import _, localize_timezone
 from coaster.utils import utcnow
-from coaster.views import (
-    ModelView,
-    UrlChangeCheck,
-    UrlForView,
-    render_with,
-    requestargs,
-    requires_roles,
-    route,
-)
+from coaster.views import render_with, requestargs, requires_roles, route
 
 from .. import app
 from ..models import Project, Proposal, Rsvp, Session, VenueRoom, db, sa
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, localize_date
 from .login_session import requires_login
-from .mixins import ProjectViewMixin, VenueRoomViewMixin
+from .mixins import ProjectViewBase
+from .venue import VenueRoomViewBase
 
 # TODO: Replace the arbitrary dicts in the `_data` functions with dataclasses
 
 
 def session_data(
-    session: Session, with_modal_url: str | None = None, with_delete_url=False
-):
+    session: Session, with_modal_url: str | None = None, with_delete_url: bool = False
+) -> dict:
     data = {
         'id': session.url_id,
         'title': session.title,
@@ -76,15 +69,19 @@ def session_data(
 
 
 def session_list_data(
-    sessions: list[Session], with_modal_url=False, with_delete_url=False
-):
+    sessions: list[Session],
+    with_modal_url: str | None = None,
+    with_delete_url: bool = False,
+) -> list[dict]:
     return [
         session_data(session, with_modal_url, with_delete_url) for session in sessions
     ]
 
 
 def schedule_data(
-    project: Project, with_slots=True, scheduled_sessions=None
+    project: Project,
+    with_slots: bool = True,
+    scheduled_sessions: list[dict] | None = None,
 ) -> list[dict]:
     scheduled_sessions = scheduled_sessions or session_list_data(
         project.scheduled_sessions
@@ -122,7 +119,7 @@ def schedule_data(
 
 def schedule_ical(
     project: Project, rsvp: Rsvp | None = None, future_only: bool = False
-):
+) -> bytes:
     cal = Calendar()
     cal.add('prodid', "-//HasGeek//NONSGML Funnel//EN")
     cal.add('version', '2.0')
@@ -137,7 +134,7 @@ def schedule_ical(
     cal.add('x-published-ttl', 'PT12H')
     now = utcnow()
     for session in project.scheduled_sessions:
-        if not future_only or session.end_at > now:
+        if not future_only or (session.end_at is not None and session.end_at > now):
             cal.add_component(session_ical(session, rsvp))
     if not project.scheduled_sessions and project.start_at:
         cal.add_component(
@@ -229,8 +226,8 @@ def session_ical(session: Session, rsvp: Rsvp | None = None) -> Event:
 
 
 @Project.views('schedule')
-@route('/<account>/<project>/schedule')
-class ProjectScheduleView(ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>/schedule', init_app=app)
+class ProjectScheduleView(ProjectViewBase):
     @route('')
     @render_with(html_in_json('project_schedule.html.jinja2'))
     @requires_roles({'reader'})
@@ -298,10 +295,12 @@ def edit_schedule(self) -> ReturnRenderWith:
             'project': self.obj,
             'proposals': proposals,
             'from_date': (
-                self.obj.start_at_localized.isoformat() if self.obj.start_at else None
+                start_at.isoformat()
+                if (start_at := self.obj.start_at_localized)
+                else None
             ),
             'to_date': (
-                self.obj.end_at_localized.isoformat() if self.obj.end_at else None
+                end_at.isoformat() if (end_at := self.obj.end_at_localized) else None
             ),
             'timezone': self.obj.timezone.zone,
             'venues': [venue.current_access() for venue in self.obj.venues],
@@ -319,7 +318,7 @@ def edit_schedule(self) -> ReturnRenderWith:
     @requires_login
     @requires_roles({'editor'})
     @requestargs(('sessions', json.loads))
-    def update_schedule(self, sessions) -> ReturnRenderWith:
+    def update_schedule(self, sessions: list[dict]) -> ReturnRenderWith:
         for session in sessions:
             try:
                 s = Session.query.filter_by(
@@ -340,12 +339,8 @@ def update_schedule(self, sessions) -> ReturnRenderWith:
         return {'status': 'ok'}
 
 
-ProjectScheduleView.init_app(app)
-
-
 @VenueRoom.views('schedule')
-@route('/<account>/<project>/schedule/<venue>/<room>')
-class ScheduleVenueRoomView(VenueRoomViewMixin, UrlForView, ModelView):
+class ScheduleVenueRoomView(VenueRoomViewBase):
     @route('ical')
     @requires_roles({'reader'})
     def schedule_room_ical(self) -> Response:
@@ -411,6 +406,9 @@ def updates(self) -> ReturnRenderWith:
             .first()
         )
         if current_session is not None:
+            if TYPE_CHECKING:
+                assert current_session.start_at is not None  # nosec B101
+                assert current_session.end_at is not None  # nosec B101
             current_session.start_at = localize_date(
                 current_session.start_at, to_tz=self.obj.venue.project.timezone
             )
@@ -419,14 +417,18 @@ def updates(self) -> ReturnRenderWith:
             )
         nextdiff = None
         if next_session is not None:
+            if TYPE_CHECKING:
+                assert next_session.start_at is not None  # nosec B101
+                assert next_session.end_at is not None  # nosec B101
             next_session.start_at = localize_date(
                 next_session.start_at, to_tz=self.obj.venue.project.timezone
             )
             next_session.end_at = localize_date(
                 next_session.end_at, to_tz=self.obj.venue.project.timezone
             )
-            nextdiff = next_session.start_at.date() - now.date()
-            nextdiff = nextdiff.total_seconds() / 86400
+            nextdiff = (
+                next_session.start_at.date() - now.date()
+            ).total_seconds() / 86400
         return {
             'room': self.obj,
             'current_session': current_session,
diff --git a/funnel/views/search.py b/funnel/views/search.py
index dc14c3fae..a39ed8f98 100644
--- a/funnel/views/search.py
+++ b/funnel/views/search.py
@@ -4,7 +4,7 @@
 
 import re
 from html import unescape as html_unescape
-from typing import Any, TypedDict, TypeVar
+from typing import Any, ClassVar, Generic, TypedDict, TypeVar
 from urllib.parse import quote as urlquote
 
 from flask import request, url_for
@@ -12,40 +12,35 @@
 from sqlalchemy.sql import expression
 
 from baseframe import __
-from coaster.views import (
-    ClassView,
-    ModelView,
-    UrlForView,
-    render_with,
-    requestargs,
-    requires_roles,
-    route,
-)
+from coaster.sqlalchemy import RoleAccessProxy
+from coaster.views import ClassView, render_with, requestargs, requires_roles, route
 
 from .. import app, executor
 from ..models import (
     Account,
     Comment,
     Commentset,
+    ModelSearchProtocol,
     Project,
     Proposal,
     ProposalMembership,
     Query,
-    SearchModelUnion,
     Session,
     Update,
     db,
     sa,
+    sa_orm,
     visual_field_delimiter,
 )
 from ..typing import ReturnRenderWith
 from ..utils import abort_null
 from .helpers import render_redirect
-from .mixins import AccountViewMixin, ProjectViewMixin
+from .mixins import AccountViewBase, ProjectViewBase
 
 # --- Definitions ----------------------------------------------------------------------
 
 _Q = TypeVar('_Q', bound=Query)
+_ST = TypeVar('_ST', bound=ModelSearchProtocol)
 
 
 # PostgreSQL ts_headline markers
@@ -68,19 +63,19 @@
 # --- Search provider types ------------------------------------------------------------
 
 
-class SearchProvider:
+class SearchProvider(Generic[_ST]):
     """Base class for search providers."""
 
     #: Label to use in UI
     label: str
     #: Model to query against
-    model: type[SearchModelUnion]
+    model: type[_ST]
     #: Does this model have a title column?
-    has_title: bool = True
+    has_title: ClassVar[bool] = True
 
     @property
     def regconfig(self) -> str:
-        """Return PostgreSQL regconfig language, defaulting to English."""
+        """Return PostgreSQL `regconfig` language, defaulting to English."""
         return self.model.search_vector.type.options.get('regconfig', 'english')
 
     @property
@@ -90,7 +85,7 @@ def title_column(self) -> sa.ColumnElement[str]:
         # That makes this return value incorrect, but here we ignore the error as
         # class:`CommentSearch` explicitly overrides :meth:`hltitle_column`, and that is
         # the only place this property is accessed
-        return self.model.title  # type: ignore[return-value]
+        return self.model.title  # type: ignore[return-value]  # FIXME
 
     @property
     def hltext(self) -> sa.ColumnElement[str]:
@@ -105,9 +100,7 @@ def hltext(self) -> sa.ColumnElement[str]:
             *(getattr(self.model, c) for c in self.model.search_vector.type.columns),
         )
 
-    def hltitle_column(
-        self, tsquery: sa.sql.functions.Function
-    ) -> sa.ColumnElement[str]:
+    def hltitle_column(self, tsquery: sa.Function) -> sa.ColumnElement:
         """Return a column expression for title with search terms highlighted."""
         return sa.func.ts_headline(
             self.regconfig,
@@ -117,9 +110,7 @@ def hltitle_column(
             type_=sa.UnicodeText,
         )
 
-    def hlsnippet_column(
-        self, tsquery: sa.sql.functions.Function
-    ) -> sa.ColumnElement[str]:
+    def hlsnippet_column(self, tsquery: sa.Function) -> sa.ColumnElement[str]:
         """Return a column expression for a snippet of text with highlights."""
         return sa.func.ts_headline(
             self.regconfig,
@@ -131,9 +122,7 @@ def hlsnippet_column(
             type_=sa.UnicodeText,
         )
 
-    def matched_text_column(
-        self, tsquery: sa.sql.functions.Function
-    ) -> sa.ColumnElement[str]:
+    def matched_text_column(self, tsquery: sa.Function) -> sa.ColumnElement[str]:
         """Return a column expression for matching text, without highlighting."""
         return sa.func.ts_headline(
             self.regconfig,
@@ -145,58 +134,50 @@ def matched_text_column(
 
     # --- Query methods
 
-    def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
+    def add_order_by(self, tsquery: sa.Function, query: _Q) -> _Q:
         """Add an order_by condition to the query."""
         return query.order_by(
             sa.desc(sa.func.ts_rank_cd(self.model.search_vector, tsquery)),
             self.model.created_at.desc(),
         )
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query:
+    def all_query(self, tsquery: sa.Function) -> Query:
         """Search entire site."""
         raise NotImplementedError("Subclasses must implement all_query")
 
-    def all_count(self, tsquery: sa.sql.functions.Function) -> int:
+    def all_count(self, tsquery: sa.Function) -> int:
         """Return count of results for :meth:`all_query`."""
-        return self.all_query(tsquery).options(sa.orm.load_only(self.model.id)).count()
+        return self.all_query(tsquery).options(sa_orm.load_only(self.model.id_)).count()
 
 
-class SearchInAccountProvider(SearchProvider):
+class SearchInAccountProvider(SearchProvider[_ST]):
     """Base class for search providers that support searching in an account."""
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query:
         """Search in an account."""
         raise NotImplementedError("Subclasses must implement account_query")
 
-    def account_count(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> int:
+    def account_count(self, tsquery: sa.Function, account: Account) -> int:
         """Return count of results for :meth:`account_query`."""
         return (
             self.account_query(tsquery, account)
-            .options(sa.orm.load_only(self.model.id))
+            .options(sa_orm.load_only(self.model.id_))
             .count()
         )
 
 
-class SearchInProjectProvider(SearchInAccountProvider):
+class SearchInProjectProvider(SearchInAccountProvider[_ST]):
     """Base class for search providers that support searching in a project."""
 
-    def project_query(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> Query:
+    def project_query(self, tsquery: sa.Function, project: Project) -> Query:
         """Search in a project."""
         raise NotImplementedError("Subclasses must implement project_query")
 
-    def project_count(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> int:
+    def project_count(self, tsquery: sa.Function, project: Project) -> int:
         """Return count of results for :meth:`project_query`."""
         return (
             self.project_query(tsquery, project)
-            .options(sa.orm.load_only(self.model.id))
+            .options(sa_orm.load_only(self.model.id_))
             .count()
         )
 
@@ -210,7 +191,7 @@ class ProjectSearch(SearchInAccountProvider):
     label = __("Projects")
     model = Project
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Project]:
+    def all_query(self, tsquery: sa.Function) -> Query[Project]:
         """Search entire site for projects."""
         return (
             Project.query.join(Account, Project.account).filter(
@@ -248,10 +229,10 @@ def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Project]:
             )
         )
 
-    def all_count(self, tsquery: sa.sql.functions.Function) -> int:
+    def all_count(self, tsquery: sa.Function) -> int:
         """Return count of matching projects across the entire site."""
         return (
-            db.session.query(sa.func.count('*'))
+            db.session.query(sa.func.count(sa.text('*')))
             .select_from(Project)
             .join(Account, Project.account)
             .filter(
@@ -262,9 +243,7 @@ def all_count(self, tsquery: sa.sql.functions.Function) -> int:
             .scalar()
         )
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query[Project]:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query[Project]:
         """Search within an account for projects."""
         return Project.query.filter(
             Project.account == account,
@@ -313,7 +292,7 @@ def hltext(self) -> sa.ColumnElement[str]:
             visual_field_delimiter, Account.title, Account.description_html
         )
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Account]:
+    def all_query(self, tsquery: sa.Function) -> Query[Account]:
         """Search for accounts."""
         return self.add_order_by(
             tsquery,
@@ -330,7 +309,7 @@ class SessionSearch(SearchInProjectProvider):
     label = __("Sessions")
     model = Session
 
-    def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
+    def add_order_by(self, tsquery: sa.Function, query: _Q) -> _Q:
         """Add an order_by condition to the query."""
         return query.order_by(
             sa.desc(sa.func.ts_rank_cd(Session.search_vector, tsquery)),
@@ -340,7 +319,7 @@ def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
             ).desc(),
         )
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Session]:
+    def all_query(self, tsquery: sa.Function) -> Query[Session]:
         """Search for sessions across the site."""
         return self.add_order_by(
             tsquery,
@@ -355,9 +334,7 @@ def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Session]:
             ),
         )
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query[Session]:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query[Session]:
         """Search for sessions within an account."""
         return self.add_order_by(
             tsquery,
@@ -371,9 +348,7 @@ def account_query(
             ),
         )
 
-    def project_query(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> Query[Session]:
+    def project_query(self, tsquery: sa.Function, project: Project) -> Query[Session]:
         """Search for sessions within a project."""
         return self.add_order_by(
             tsquery,
@@ -391,14 +366,14 @@ class ProposalSearch(SearchInProjectProvider):
     label = __("Submissions")
     model = Proposal
 
-    def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
+    def add_order_by(self, tsquery: sa.Function, query: _Q) -> _Q:
         """Add an order_by condition to the query."""
         return query.order_by(
             sa.desc(sa.func.ts_rank_cd(Proposal.search_vector, tsquery)),
             Proposal.created_at.desc(),
         )
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Proposal]:
+    def all_query(self, tsquery: sa.Function) -> Query[Proposal]:
         """Search for proposals across the site."""
         return self.add_order_by(
             tsquery,
@@ -424,9 +399,7 @@ def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Proposal]:
             ),
         )
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query[Proposal]:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query[Proposal]:
         """Search for proposals within an account."""
         return self.add_order_by(
             tsquery,
@@ -450,9 +423,7 @@ def account_query(
             ),
         )
 
-    def project_query(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> Query[Proposal]:
+    def project_query(self, tsquery: sa.Function, project: Project) -> Query[Proposal]:
         """Search for proposals within a project."""
         return self.add_order_by(
             tsquery,
@@ -482,7 +453,7 @@ class UpdateSearch(SearchInProjectProvider):
     label = __("Updates")
     model = Update
 
-    def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
+    def add_order_by(self, tsquery: sa.Function, query: _Q) -> _Q:
         """Add an order_by condition to the query."""
         return query.order_by(
             sa.desc(sa.func.ts_rank_cd(Update.search_vector, tsquery)),
@@ -492,7 +463,7 @@ def add_order_by(self, tsquery: sa.sql.functions.Function, query: _Q) -> _Q:
             ).desc(),
         )
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Update]:
+    def all_query(self, tsquery: sa.Function) -> Query[Update]:
         """Search for updates across the site."""
         return self.add_order_by(
             tsquery,
@@ -507,9 +478,7 @@ def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Update]:
             ),
         )
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query[Update]:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query[Update]:
         """Search for updates within an account."""
         return self.add_order_by(
             tsquery,
@@ -521,9 +490,7 @@ def account_query(
             ),
         )
 
-    def project_query(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> Query[Update]:
+    def project_query(self, tsquery: sa.Function, project: Project) -> Query[Update]:
         """Search for updates within a project."""
         return self.add_order_by(
             tsquery,
@@ -542,11 +509,11 @@ class CommentSearch(SearchInProjectProvider):
     model = Comment
     has_title = False  # Comments don't have titles
 
-    def hltitle_column(self, tsquery: sa.sql.functions.Function):
+    def hltitle_column(self, tsquery: sa.Function) -> sa.ColumnElement:
         """Comments don't have titles, so return a null expression here."""
         return expression.null()
 
-    def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Comment]:
+    def all_query(self, tsquery: sa.Function) -> Query[Comment]:
         """Search for comments across the site."""
         return (
             Comment.query.join(Account, Comment.posted_by_id == Account.id)
@@ -589,9 +556,7 @@ def all_query(self, tsquery: sa.sql.functions.Function) -> Query[Comment]:
             )
         )
 
-    def account_query(
-        self, tsquery: sa.sql.functions.Function, account: Account
-    ) -> Query[Comment]:
+    def account_query(self, tsquery: sa.Function, account: Account) -> Query[Comment]:
         """Search for comments within an account."""
         return (
             Comment.query.join(Account, Comment.posted_by_id == Account.id)
@@ -630,9 +595,7 @@ def account_query(
             )
         )
 
-    def project_query(
-        self, tsquery: sa.sql.functions.Function, project: Project
-    ) -> Query[Comment]:
+    def project_query(self, tsquery: sa.Function, project: Project) -> Query[Comment]:
         """Search for comments within a project."""
         return (
             Comment.query.join(Account, Comment.posted_by_id == Account.id)
@@ -698,7 +661,7 @@ def escape_quotes(text: str) -> Markup:
     return Markup(text.replace('"', '&quot;').replace("'", '&#39;'))
 
 
-def get_tsquery(text: str | None) -> sa.sql.functions.Function:
+def get_tsquery(text: str | None) -> sa.Function:
     """
     Parse a web search query into a PostgreSQL ``tsquery``.
 
@@ -730,7 +693,7 @@ class SearchCountType(TypedDict, total=False):
 
 # @cache.memoize(timeout=300)
 def search_counts(
-    tsquery: sa.sql.functions.Function,
+    tsquery: sa.Function,
     account: Account | None = None,
     project: Project | None = None,
 ) -> list[SearchCountType]:
@@ -778,15 +741,35 @@ def search_counts(
     return results
 
 
+class SearchResultsItemDict(TypedDict):
+    title: str | None
+    title_html: str | None
+    url: str
+    snippet_html: str
+    obj: RoleAccessProxy
+
+
+class SearchResultsDict(TypedDict):
+    items: list[SearchResultsItemDict]
+    has_next: bool
+    has_prev: bool
+    page: int
+    per_page: int
+    pages: int
+    next_num: int | None
+    prev_num: int | None
+    count: int | None
+
+
 # @cache.memoize(timeout=300)
 def search_results(
-    tsquery: sa.sql.functions.Function,
+    tsquery: sa.Function,
     stype: str,
     page: int = 1,
     per_page: int = 20,
     account: Account | None = None,
     project: Project | None = None,
-):
+) -> SearchResultsDict:
     """Return search results."""
     # Pick up model data for the given type string
     sp = search_providers[stype]
@@ -836,10 +819,13 @@ def search_results(
 
 
 # --- Views -------------------------------------------------------------------
-class SearchView(ClassView):
+
+
+@route('/', init_app=app)
+class SiteSearchView(ClassView):
     current_section = 'search'
 
-    @route('/search', endpoint='search')
+    @route('search', endpoint='search')
     @render_with('search.html.jinja2', json=True)
     @requestargs(('q', abort_null), ('page', int), ('per_page', int))
     def search(
@@ -867,12 +853,9 @@ def search(
         }
 
 
-SearchView.init_app(app)
-
-
 @Account.views('search')
-@route('/<account>')
-class AccountSearchView(AccountViewMixin, UrlForView, ModelView):
+@route('/<account>', init_app=app)
+class AccountSearchView(AccountViewBase):
     @route('search', endpoint='search_account')
     @render_with('search.html.jinja2', json=True)
     @requires_roles({'reader', 'admin'})
@@ -907,12 +890,9 @@ def search(
         }
 
 
-AccountSearchView.init_app(app)
-
-
 @Project.views('search')
-@route('/<account>/<project>/')
-class ProjectSearchView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<account>/<project>/', init_app=app)
+class ProjectSearchView(ProjectViewBase):
     @route('search', endpoint='search_project')
     @render_with('search.html.jinja2', json=True)
     @requires_roles({'reader', 'crew', 'participant'})
@@ -946,6 +926,3 @@ def search(
                 tsquery, stype, page=page, per_page=per_page, project=self.obj
             ),
         }
-
-
-ProjectSearchView.init_app(app)
diff --git a/funnel/views/session.py b/funnel/views/session.py
index 111be7ecd..030a0c760 100644
--- a/funnel/views/session.py
+++ b/funnel/views/session.py
@@ -2,31 +2,31 @@
 
 from __future__ import annotations
 
-from typing import cast
+from typing import TYPE_CHECKING
 
 from flask import render_template, request
 
 from baseframe import _
-from coaster.auth import current_auth
 from coaster.sqlalchemy import failsafe_add
 from coaster.views import ModelView, UrlChangeCheck, UrlForView, requires_roles, route
 
 from .. import app
-from ..forms import SavedSessionForm, SessionForm
-from ..models import Project, Proposal, SavedSession, Session, db
+from ..auth import current_auth
+from ..forms import SavedProjectForm, SavedSessionForm, SessionForm
+from ..models import Account, Project, Proposal, SavedSession, Session, db
 from ..proxies import request_wants
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import localize_date, render_redirect
 from .login_session import requires_login
-from .mixins import ProjectViewMixin, SessionViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase
 from .schedule import schedule_data, session_data, session_list_data
 
 
-def rooms_list(project):
+def rooms_list(project: Project) -> list[tuple[str, str]]:
     if project.rooms:
         return [("", _("Select Room"))] + [
             (
-                room.id,
+                str(room.id),
                 f"{room.venue.title} – {room.title}",
             )
             for room in project.rooms
@@ -36,7 +36,7 @@ def rooms_list(project):
 
 def get_form_template(form: SessionForm) -> ReturnView:
     """Render Session form html."""
-    form.form_nonce.data = form.form_nonce.default()
+    form.form_nonce.data = form.form_nonce.get_default()
     form_template = render_template(
         'session_form.html.jinja2',
         form=form,
@@ -61,7 +61,7 @@ def session_edit(
     else:
         form = SessionForm()
         if proposal is not None:
-            form.description.data = proposal.body
+            form.description.data = str(proposal.body)
             form.speaker.data = proposal.first_user.fullname
             form.title.data = proposal.title
 
@@ -92,7 +92,8 @@ def session_edit(
             else:
                 db.session.add(session)
         db.session.commit()
-        session = cast(Session, session)  # Tell mypy session is not None
+        if TYPE_CHECKING:  # FIXME: Needed for Mypy in pre-commit only, unclear why
+            assert session is not None  # nosec B101
         session.project.update_schedule_timestamps()
         db.session.commit()
         if request_wants.html_in_json:
@@ -123,8 +124,8 @@ def session_edit(
 
 
 @Project.views('session_new')
-@route('/<account>/<project>/sessions')
-class ProjectSessionView(ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>/sessions', init_app=app)
+class ProjectSessionView(ProjectViewBase):
     @route('new', methods=['GET', 'POST'])
     @requires_login
     @requires_roles({'editor'})
@@ -132,12 +133,31 @@ def new_session(self) -> ReturnView:
         return session_edit(self.obj)
 
 
-ProjectSessionView.init_app(app)
+@Session.views('main')
+@route('/<account>/<project>/schedule/<session>', init_app=app)
+class SessionView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[Session]):
+    route_model_map = {
+        'account': 'project.account.urlname',
+        'project': 'project.name',
+        'session': 'url_name_uuid_b58',
+    }
+    SavedProjectForm = SavedProjectForm
 
+    def loader(self, account: str, project: str, session: str) -> Session:
+        return (
+            Session.query.join(Project, Session.project_id == Project.id)
+            .join(Account, Project.account)
+            .filter(Session.url_name_uuid_b58 == session)
+            .first_or_404()
+        )
+
+    def post_init(self) -> None:
+        self.account = self.obj.project.account
+
+    @property
+    def project_currently_saved(self) -> bool:
+        return self.obj.project.is_saved_by(current_auth.user)
 
-@Session.views('main')
-@route('/<account>/<project>/schedule/<session>')
-class SessionView(SessionViewMixin, UrlChangeCheck, UrlForView, ModelView):
     @route('')
     @route('viewsession-popup')  # Legacy route, will be auto-redirected to base URL
     # @requires_roles({'reader'})
@@ -158,13 +178,13 @@ def view(self) -> ReturnView:
                 datasets=('without_parent', 'related')
             ),
             from_date=(
-                self.obj.project.start_at_localized.isoformat()
-                if self.obj.project.start_at
+                start_at.isoformat()
+                if (start_at := self.obj.project.start_at_localized)
                 else None
             ),
             to_date=(
-                self.obj.project.end_at_localized.isoformat()
-                if self.obj.project.end_at
+                end_at.isoformat()
+                if (end_at := self.obj.project.end_at_localized)
                 else None
             ),
             active_session=session_data(self.obj, with_modal_url='view'),
@@ -252,6 +272,3 @@ def save(self) -> ReturnRenderWith:
             },
             400,
         )
-
-
-SessionView.init_app(app)
diff --git a/funnel/views/siteadmin.py b/funnel/views/siteadmin.py
index 0c89cf46c..cca5b3a84 100644
--- a/funnel/views/siteadmin.py
+++ b/funnel/views/siteadmin.py
@@ -21,10 +21,10 @@
 
 from baseframe import _
 from baseframe.forms import Form
-from coaster.auth import current_auth
 from coaster.views import ClassView, render_with, requestargs, route
 
 from .. import app
+from ..auth import current_auth
 from ..forms import ModeratorReportForm
 from ..models import (
     MODERATOR_REPORT_TYPE,
@@ -133,7 +133,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Any:
     return wrapper
 
 
-@route('/siteadmin')
+@route('/siteadmin', init_app=app)
 class SiteadminView(ClassView):
     """Site administrator views."""
 
@@ -215,7 +215,7 @@ def dashboard_data_users_by_client(self) -> ReturnView:
                     auth_client_login_session.c.login_session_id == LoginSession.id,
                     Account.state.ACTIVE,
                     auth_client_login_session.c.accessed_at
-                    >= sa.func.utcnow() - sa.func.cast(interval, INTERVAL),
+                    >= sa.func.utcnow() - sa.func.cast(sa.text(interval), INTERVAL),
                 )
                 .group_by(
                     auth_client_login_session.c.auth_client_id, LoginSession.account_id
@@ -310,16 +310,12 @@ def comments(
             'comment_spam_form': Form(),
         }
 
-    @route(
-        'comments/markspam',
-        endpoint='siteadmin_comments_spam',
-        methods=['POST'],
-    )
+    @route('comments/markspam', endpoint='siteadmin_comments_spam', methods=['POST'])
     @requires_comment_moderator
     def markspam(self) -> ReturnResponse:
         """Mark comments as spam."""
         comment_spam_form = Form()
-        comment_spam_form.form_nonce.data = comment_spam_form.form_nonce.default()
+        comment_spam_form.form_nonce.data = comment_spam_form.form_nonce.get_default()
         # TODO: Create a CommentReportForm that has a QuerySelectMultiField on Comment.
         # Avoid request.form.getlist('comment_id') here
         if comment_spam_form.validate_on_submit():
@@ -363,7 +359,7 @@ def review_comment(self, report: str) -> ReturnRenderWith:
             uuid_b58=report
         ).one_or_404()
 
-        if comment_report.comment.is_reviewed_by(current_auth.user):
+        if comment_report.comment.was_reviewed_by(current_auth.user):
             flash(_("You cannot review same comment twice"), 'error')
             return render_redirect(url_for('siteadmin_review_comments_random'))
 
@@ -389,7 +385,7 @@ def review_comment(self, report: str) -> ReturnRenderWith:
             return render_redirect(url_for('siteadmin_review_comments_random'))
 
         report_form = ModeratorReportForm()
-        report_form.form_nonce.data = report_form.form_nonce.default()
+        report_form.form_nonce.data = report_form.form_nonce.get_default()
 
         if report_form.validate_on_submit():
             # get other reports for same comment
@@ -446,10 +442,7 @@ def review_comment(self, report: str) -> ReturnRenderWith:
         }
 
 
-SiteadminView.init_app(app)
-
-
-def init_rq_dashboard():
+def init_rq_dashboard() -> None:
     """Register RQ Dashboard Blueprint if available for import."""
     if rq_dashboard is not None:
         rq_dashboard.blueprint.before_request(
diff --git a/funnel/views/sitemap.py b/funnel/views/sitemap.py
index 3a9992ad8..b2877add9 100644
--- a/funnel/views/sitemap.py
+++ b/funnel/views/sitemap.py
@@ -250,7 +250,7 @@ def query_session(dtstart: datetime, dtend: datetime, changefreq: ChangeFreq) ->
 # --- Views ----------------------------------------------------------------------------
 
 
-@route('/')
+@route('/', init_app=app)
 class SitemapView(ClassView):
     @route('sitemap.xml')
     @xml_response
@@ -338,6 +338,3 @@ def by_date(  # skipcq: PYL-R0201
         # Sort pages by lastmod, in descending order
         sitemap.sort(key=lambda page: page.lastmod, reverse=True)
         return render_template('sitemap.xml.jinja2', sitemap=sitemap)
-
-
-SitemapView.init_app(app)
diff --git a/funnel/views/ticket_event.py b/funnel/views/ticket_event.py
index b8a79c2c7..2ff7a0f28 100644
--- a/funnel/views/ticket_event.py
+++ b/funnel/views/ticket_event.py
@@ -31,12 +31,12 @@
 from .helpers import render_redirect
 from .jobs import import_tickets
 from .login_session import requires_login, requires_sudo
-from .mixins import AccountCheckMixin, ProjectViewMixin, TicketEventViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase, TicketEventViewBase
 
 
 @Project.views('ticket_event')
-@route('/<account>/<project>/ticket_event')
-class ProjectTicketEventView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<account>/<project>/ticket_event', init_app=app)
+class ProjectTicketEventView(ProjectViewBase):
     @route('')
     @render_with('ticket_event_list.html.jinja2')
     @requires_login
@@ -118,14 +118,8 @@ def new_ticket_client(self) -> ReturnView:
         )
 
 
-ProjectTicketEventView.init_app(app)
-
-
 @TicketEvent.views('main')
-@route('/<account>/<project>/ticket_event/<name>')
-class TicketEventView(TicketEventViewMixin, UrlForView, ModelView):
-    __decorators__ = [requires_login]
-
+class TicketEventView(TicketEventViewBase):
     @route('', methods=['GET', 'POST'])
     @render_with('ticket_event.html.jinja2')
     @requires_roles({'project_promoter', 'project_usher'})
@@ -218,19 +212,17 @@ def scan_badge(self) -> ReturnRenderWith:
 
 
 @TicketType.views('main')
-@route('/<account>/<project>/ticket_type/<name>')
-class TicketTypeView(AccountCheckMixin, UrlForView, ModelView):
+@route('/<account>/<project>/ticket_type/<name>', init_app=app)
+class TicketTypeView(AccountCheckMixin, UrlForView, ModelView[TicketType]):
     __decorators__ = [requires_login]
-    model = TicketType
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'name': 'name',
     }
-    obj: TicketType
 
-    def loader(self, account: str, project: str, name: str) -> TicketType:
-        return (
+    def load(self, account: str, project: str, name: str) -> ReturnView | None:
+        self.obj = (
             TicketType.query.join(Project)
             .join(Account, Project.account)
             .filter(
@@ -240,10 +232,11 @@ def loader(self, account: str, project: str, name: str) -> TicketType:
             )
             .first_or_404()
         )
+        self.post_init()
+        return super().after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('')
     @render_with('ticket_type.html.jinja2')
@@ -293,25 +286,20 @@ def delete(self) -> ReturnView:
         )
 
 
-TicketTypeView.init_app(app)
-
-
 @TicketClient.views('main')
-@route('/<account>/<project>/ticket_client/<client_id>')
-class TicketClientView(AccountCheckMixin, UrlForView, ModelView):
+@route('/<account>/<project>/ticket_client/<client_id>', init_app=app)
+class TicketClientView(AccountCheckMixin, UrlForView, ModelView[TicketClient]):
     __decorators__ = [requires_login]
-    model = TicketClient
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'client_id': 'id',
     }
-    obj: TicketClient
 
-    def loader(self, account: str, project: str, client_id: str) -> TicketClient:
+    def load(self, account: str, project: str, client_id: str) -> ReturnView | None:
         if not client_id.isdigit():
             abort(404)
-        return (
+        self.obj = (
             TicketClient.query.join(Project)
             .join(Account, Project.account)
             .filter(
@@ -321,10 +309,11 @@ def loader(self, account: str, project: str, client_id: str) -> TicketClient:
             )
             .first_or_404()
         )
+        self.post_init()
+        return super().after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('edit', methods=['GET', 'POST'])
     @requires_roles({'project_promoter'})
@@ -355,6 +344,3 @@ def delete(self) -> ReturnView:
             next=self.obj.project.url_for('admin'),
             cancel_url=self.obj.project.url_for(),
         )
-
-
-TicketClientView.init_app(app)
diff --git a/funnel/views/ticket_participant.py b/funnel/views/ticket_participant.py
index 3cd31d753..1748408d3 100644
--- a/funnel/views/ticket_participant.py
+++ b/funnel/views/ticket_participant.py
@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 
-from flask import flash, request, url_for
+from collections.abc import Iterable
+from typing import Any, TypedDict
+
+from flask import abort, flash, request, url_for
 from sqlalchemy.exc import IntegrityError
 
 from baseframe import _, forms
@@ -36,11 +39,22 @@
 from ..utils import format_twitter_handle, make_qrcode, mask_email, split_name
 from .helpers import render_redirect
 from .login_session import requires_login
-from .mixins import AccountCheckMixin, ProjectViewMixin, TicketEventViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase, TicketEventViewBase
+
 
+class BadgeDict(TypedDict):
+    first_name: str
+    last_name: str
+    twitter: str | None
+    company: str | None
+    qrcode_content: str
+    order_no: str
 
-def ticket_participant_badge_data(ticket_participants, project):
-    badges = []
+
+def ticket_participant_badge_data(
+    ticket_participants: Iterable[TicketParticipant], project: Project
+) -> list[BadgeDict]:
+    badges: list[BadgeDict] = []
     for ticket_participant in ticket_participants:
         first_name, last_name = split_name(ticket_participant.fullname)
         ticket = SyncTicket.query.filter_by(
@@ -63,8 +77,8 @@ def ticket_participant_badge_data(ticket_participants, project):
 
 # FIXME: Do not process integer primary keys
 def ticket_participant_data(
-    ticket_participant: TicketParticipant, project_id: int, full=False
-):
+    ticket_participant: TicketParticipant, project_id: int, full: bool = False
+) -> dict[str, Any]:
     data = {
         '_id': ticket_participant.id,
         'puk': ticket_participant.puk,
@@ -84,7 +98,9 @@ def ticket_participant_data(
     return data
 
 
-def ticket_participant_checkin_data(ticket_participant, project, ticket_event):
+def ticket_participant_checkin_data(
+    ticket_participant, project: Project, ticket_event: TicketEvent  # FIXME type
+) -> dict:
     puuid_b58 = uuid_to_base58(ticket_participant.uuid)
     data = {
         'puuid_b58': puuid_b58,
@@ -125,8 +141,8 @@ def ticket_participant_checkin_data(ticket_participant, project, ticket_event):
 
 
 @Project.views('ticket_participant')
-@route('/<account>/<project>/ticket_participants')
-class ProjectTicketParticipantView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<account>/<project>/ticket_participants', init_app=app)
+class ProjectTicketParticipantView(ProjectViewBase):
     @route('json')
     @requires_login
     @requires_roles({'promoter', 'usher'})
@@ -161,26 +177,23 @@ def new_participant(self) -> ReturnView:
         )
 
 
-ProjectTicketParticipantView.init_app(app)
-
-
 @TicketParticipant.views('main')
-@route('/<account>/<project>/ticket_participant/<ticket_participant>')
-class TicketParticipantView(AccountCheckMixin, UrlForView, ModelView):
+@route('/<account>/<project>/ticket_participant/<ticket_participant>', init_app=app)
+class TicketParticipantView(
+    AccountCheckMixin, UrlForView, ModelView[TicketParticipant]
+):
     __decorators__ = [requires_login]
 
-    model = TicketParticipant
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'ticket_participant': 'uuid_b58',
     }
-    obj: TicketParticipant
 
-    def loader(
+    def load(
         self, account: str, project: str, ticket_participant: str
-    ) -> TicketParticipant:
-        return (
+    ) -> ReturnView | None:
+        self.obj = (
             TicketParticipant.query.join(Project)
             .join(Account, Project.account)
             .filter(
@@ -190,10 +203,11 @@ def loader(
             )
             .first_or_404()
         )
+        self.post_init()
+        return super().after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('edit', methods=['GET', 'POST'])
     @requires_roles({'project_promoter'})
@@ -251,14 +265,8 @@ def user_ticket_assignment(user: Account, changes: list[str]) -> None:
             db.session.commit()
 
 
-TicketParticipantView.init_app(app)
-
-
 @TicketEvent.views('ticket_participant')
-@route('/<account>/<project>/ticket_event/<name>')
-class TicketEventParticipantView(TicketEventViewMixin, UrlForView, ModelView):
-    __decorators__ = [requires_login]
-
+class TicketEventParticipantView(TicketEventViewBase):
     @route('ticket_participants/checkin', methods=['GET', 'POST'])
     @requires_roles({'project_promoter', 'project_usher'})
     def checkin(self) -> ReturnView:
@@ -268,7 +276,9 @@ def checkin(self) -> ReturnView:
             ticket_participant_ids = request.form.getlist('puuid_b58')
             for ticket_participant_id in ticket_participant_ids:
                 attendee = TicketEventParticipant.get(self.obj, ticket_participant_id)
-                attendee.checked_in = checked_in
+                if attendee is None:
+                    abort(404)
+                attendee.checked_in = bool(checked_in)
             db.session.commit()
             if request_wants.json:
                 return {
@@ -341,7 +351,7 @@ def label_badges(self) -> ReturnRenderWith:
 
 
 # TODO: make this endpoint use uuid_b58 instead of puk, along with badge generation
-@route('/<account>/<project>/event/<event>/ticket_participant/<puk>')
+@route('/<account>/<project>/event/<event>/ticket_participant/<puk>', init_app=app)
 class TicketEventParticipantCheckinView(ClassView):
     __decorators__ = [requires_login]
 
@@ -349,9 +359,7 @@ class TicketEventParticipantCheckinView(ClassView):
     def checkin_puk(
         self, account: str, project: str, event: str, puk: str
     ) -> ReturnView:
-        checked_in = getbool(  # type: ignore[unreachable]
-            request.form.get('checkin', 't')
-        )
+        checked_in = getbool(request.form.get('checkin', 't'))
         ticket_event = (
             TicketEvent.query.join(Project)
             .join(Account, Project.account)
@@ -378,9 +386,6 @@ def checkin_puk(
                 {'error': 'not_found', 'error_description': _("Attendee not found")},
                 404,
             )
-        attendee.checked_in = checked_in
+        attendee.checked_in = bool(checked_in)
         db.session.commit()
         return {'attendee': {'fullname': ticket_participant.fullname}}
-
-
-TicketEventParticipantCheckinView.init_app(app)
diff --git a/funnel/views/update.py b/funnel/views/update.py
index 1b67048c4..a542ff8a2 100644
--- a/funnel/views/update.py
+++ b/funnel/views/update.py
@@ -6,7 +6,6 @@
 
 from baseframe import _, forms
 from baseframe.forms import render_form
-from coaster.auth import current_auth
 from coaster.utils import make_name
 from coaster.views import (
     ModelView,
@@ -18,6 +17,7 @@
 )
 
 from .. import app
+from ..auth import current_auth
 from ..forms import SavedProjectForm, UpdateForm
 from ..models import Account, NewUpdateNotification, Project, Update, db
 from ..typing import ReturnRenderWith, ReturnView
@@ -25,12 +25,12 @@
 from .login_session import requires_login, requires_sudo
 from .mixins import AccountCheckMixin
 from .notification import dispatch_notification
-from .project import ProjectViewMixin
+from .project import ProjectViewBase
 
 
 @Project.views('updates')
-@route('/<account>/<project>/updates')
-class ProjectUpdatesView(ProjectViewMixin, UrlChangeCheck, UrlForView, ModelView):
+@route('/<account>/<project>/updates', init_app=app)
+class ProjectUpdatesView(ProjectViewBase):
     @route('', methods=['GET'])
     @render_with(html_in_json('project_updates.html.jinja2'))
     @requires_roles({'reader'})
@@ -78,37 +78,33 @@ def new_update(self) -> ReturnView:
         )
 
 
-ProjectUpdatesView.init_app(app)
-
-
 @Update.features('publish')
-def update_publishable(obj):
-    return obj.state.DRAFT and 'editor' in obj.roles_for(current_auth.user)
+def update_publishable(obj: Update) -> bool:
+    return bool(obj.state.DRAFT) and 'editor' in obj.roles_for(current_auth.user)
 
 
 @Update.views('project')
-@route('/<account>/<project>/updates/<update>')
-class UpdateView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView):
-    model = Update
+@route('/<account>/<project>/updates/<update>', init_app=app)
+class UpdateView(AccountCheckMixin, UrlChangeCheck, UrlForView, ModelView[Update]):
     route_model_map = {
         'account': 'project.account.urlname',
         'project': 'project.name',
         'update': 'url_name_uuid_b58',
     }
-    obj: Update
     SavedProjectForm = SavedProjectForm
 
-    def loader(self, account: str, project: str, update: str) -> Update:
-        return (
+    def load(self, account: str, project: str, update: str) -> ReturnView | None:
+        self.obj = (
             Update.query.join(Project)
             .join(Account, Project.account)
             .filter(Update.url_name_uuid_b58 == update)
             .one_or_404()
         )
+        self.post_init()
+        return super().after_loader()
 
-    def after_loader(self) -> ReturnView | None:
+    def post_init(self) -> None:
         self.account = self.obj.project.account
-        return super().after_loader()
 
     @route('', methods=['GET'])
     @render_with('update_details.html.jinja2')
@@ -184,6 +180,3 @@ def delete(self) -> ReturnView:
             submit=_("Delete"),
             cancel_url=self.obj.url_for(),
         )
-
-
-UpdateView.init_app(app)
diff --git a/funnel/views/venue.py b/funnel/views/venue.py
index 4d29fd53f..225f5e0e0 100644
--- a/funnel/views/venue.py
+++ b/funnel/views/venue.py
@@ -10,19 +10,19 @@
 
 from .. import app
 from ..forms.venue import VenueForm, VenuePrimaryForm, VenueRoomForm
-from ..models import Project, Venue, VenueRoom, db
+from ..models import Account, Project, Venue, VenueRoom, db
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import render_redirect
 from .login_session import requires_login, requires_sudo
-from .mixins import ProjectViewMixin, VenueRoomViewMixin, VenueViewMixin
+from .mixins import AccountCheckMixin, ProjectViewBase
 
 RESERVED_VENUE = ['new']
 RESERVED_VENUEROOM = ['new', 'edit', 'delete']
 
 
 @Project.views('venue')
-@route('/<account>/<project>/venues')
-class ProjectVenueView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<account>/<project>/venues', init_app=app)
+class ProjectVenueView(ProjectViewBase):
     @route('')
     @render_with('venues.html.jinja2')
     @requires_login
@@ -98,12 +98,28 @@ def makeprimary_venue(self) -> ReturnView:
         return render_redirect(self.obj.url_for('venues'))
 
 
-ProjectVenueView.init_app(app)
+@Venue.views('main')
+@route('/<account>/<project>/venues/<venue>', init_app=app)
+class VenueView(AccountCheckMixin, UrlForView, ModelView[Venue]):
+    route_model_map = {
+        'account': 'project.account.urlname',
+        'project': 'project.name',
+        'venue': 'name',
+    }
+
+    def loader(self, account: str, project: str, venue: str) -> Venue:
+        return (
+            Venue.query.join(Project)
+            .join(Account, Project.account)
+            .filter(
+                Account.name_is(account), Project.name == project, Venue.name == venue
+            )
+            .first_or_404()
+        )
 
+    def post_init(self) -> None:
+        self.account = self.obj.project.account
 
-@Venue.views('main')
-@route('/<account>/<project>/venues/<venue>')
-class VenueView(VenueViewMixin, UrlForView, ModelView):
     @route('edit', methods=['GET', 'POST'])
     @requires_login
     @requires_roles({'project_editor'})
@@ -161,12 +177,35 @@ def new_venueroom(self) -> ReturnView:
         )
 
 
-VenueView.init_app(app)
+@route('/<account>/<project>/schedule/<venue>/<room>')
+class VenueRoomViewBase(AccountCheckMixin, UrlForView, ModelView[VenueRoom]):
+    route_model_map = {
+        'account': 'venue.project.account.urlname',
+        'project': 'venue.project.name',
+        'venue': 'venue.name',
+        'room': 'name',
+    }
+
+    def loader(self, account: str, project: str, venue: str, room: str) -> VenueRoom:
+        return (
+            VenueRoom.query.join(Venue)
+            .join(Project)
+            .join(Account, Project.account)
+            .filter(
+                Account.name_is(account),
+                Project.name == project,
+                Venue.name == venue,
+                VenueRoom.name == room,
+            )
+            .first_or_404()
+        )
+
+    def post_init(self) -> None:
+        self.account = self.obj.venue.project.account
 
 
 @VenueRoom.views('main')
-@route('/<account>/<project>/venues/<venue>/<room>')
-class VenueRoomView(VenueRoomViewMixin, UrlForView, ModelView):
+class VenueRoomView(VenueRoomViewBase):
     @route('edit', methods=['GET', 'POST'])
     @requires_login
     @requires_roles({'project_editor'})
diff --git a/funnel/views/video.py b/funnel/views/video.py
index 8978018e8..7dfe58ba2 100644
--- a/funnel/views/video.py
+++ b/funnel/views/video.py
@@ -57,7 +57,7 @@ def set_video_cache(obj: VideoMixin, data: VideoData, exists: bool = True) -> No
         copied_data['uploaded_at'] = cast(
             datetime, copied_data['uploaded_at']
         ).isoformat()
-    redis_store.hmset(cache_key, copied_data)
+    redis_store.hset(cache_key, mapping=copied_data)
 
     # if video exists at source, cache for 2 days, if not, for 6 hours
     hours_to_cache = 2 * 24 if exists else 6
diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 7e80587ce..7e4567dab 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,5 +1,5 @@
 """Gunicorn default configuration."""
-# The settings in this file may be overriden using env var `GUNICORN_CMD_ARGS` or
+# The settings in this file may be overridden using env var `GUNICORN_CMD_ARGS` or
 # directly on the command line to `gunicorn`
 
 import multiprocessing
diff --git a/migrations/env.py b/migrations/env.py
index cd0203b43..43e344e70 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -4,8 +4,10 @@
 
 import logging
 from logging.config import fileConfig
+from typing import Any
 
 from alembic import context
+from alembic.operations import MigrationScript
 from flask import current_app
 from sqlalchemy import MetaData
 
@@ -46,7 +48,7 @@
 # my_important_option = config.get_main_option("my_important_option") ... etc.
 
 
-def get_metadata(bind):
+def get_metadata(bind: str | None) -> MetaData:
     """Return the metadata for a bind."""
     if bind == '':
         bind = None
@@ -61,7 +63,7 @@ def get_metadata(bind):
     return m
 
 
-def run_migrations_offline():
+def run_migrations_offline() -> None:
     """
     Run migrations in 'offline' mode.
 
@@ -94,7 +96,7 @@ def run_migrations_offline():
                 context.run_migrations(engine_name=name)
 
 
-def run_migrations_online():
+def run_migrations_online() -> None:
     """Run migrations in 'online' mode.
 
     In this scenario we need to create an Engine
@@ -104,7 +106,9 @@ def run_migrations_online():
     # this callback is used to prevent an auto-migration from being generated
     # when there are no changes to the schema
     # reference: https://alembic.zzzcomputing.com/en/latest/cookbook.html
-    def process_revision_directives(_context, _revision, directives):
+    def process_revision_directives(
+        _context: Any, _revision: Any, directives: list[MigrationScript]
+    ) -> None:
         if getattr(config.cmd_opts, 'autogenerate', False):
             script = directives[0]
             if len(script.upgrade_ops_list) >= len(bind_names) + 1:
diff --git a/migrations/versions/047ebdac558b_complement_email_md5sum_with_blake2b.py b/migrations/versions/047ebdac558b_complement_email_md5sum_with_blake2b.py
index 4c9045d76..45383fdd2 100644
--- a/migrations/versions/047ebdac558b_complement_email_md5sum_with_blake2b.py
+++ b/migrations/versions/047ebdac558b_complement_email_md5sum_with_blake2b.py
@@ -59,7 +59,7 @@ def upgrade() -> None:
 
     # Add blake2b column to UserEmail
     op.add_column('user_email', sa.Column('blake2b', sa.LargeBinary(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user_email))
     progress = get_progressbar("Emails", count)
     progress.start()
     items = conn.execute(sa.select(user_email.c.id, user_email.c.email))
@@ -85,7 +85,9 @@ def upgrade() -> None:
     op.add_column(
         'user_email_claim', sa.Column('blake2b', sa.LargeBinary(), nullable=True)
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email_claim))
+    count = conn.scalar(
+        sa.select(sa.func.count(sa.text('*'))).select_from(user_email_claim)
+    )
     progress = get_progressbar("Email claims", count)
     progress.start()
     items = conn.execute(sa.select(user_email_claim.c.id, user_email_claim.c.email))
diff --git a/migrations/versions/0fae06340346_add_version_numbers_for_timestamped_.py b/migrations/versions/0fae06340346_add_version_numbers_for_timestamped_.py
index 0164e4e51..e10c18974 100644
--- a/migrations/versions/0fae06340346_add_version_numbers_for_timestamped_.py
+++ b/migrations/versions/0fae06340346_add_version_numbers_for_timestamped_.py
@@ -16,17 +16,17 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.add_column(
         'project',
         sa.Column(
@@ -43,14 +43,14 @@ def upgrade_():
     op.alter_column('session', 'versionid', server_default=None)
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_column('session', 'versionid')
     op.drop_column('project', 'versionid')
 
 
-def upgrade_geoname():
+def upgrade_geoname() -> None:
     pass
 
 
-def downgrade_geoname():
+def downgrade_geoname() -> None:
     pass
diff --git a/migrations/versions/1c9cbf3a1e5e_add_commenset_memberships.py b/migrations/versions/1c9cbf3a1e5e_add_commenset_memberships.py
index 2bcde53c8..ed7fdca4e 100644
--- a/migrations/versions/1c9cbf3a1e5e_add_commenset_memberships.py
+++ b/migrations/versions/1c9cbf3a1e5e_add_commenset_memberships.py
@@ -116,20 +116,20 @@ def get_progressbar(label, maxval):
     )
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     conn = op.get_bind()
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(project))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(project))
     progress = get_progressbar("Projects", count)
     progress.start()
 
@@ -139,7 +139,7 @@ def upgrade_():
     for counter, project_item in enumerate(projects):
         # Create membership for existing RSVP
         rsvp_count = conn.scalar(
-            sa.select(sa.func.count('*'))
+            sa.select(sa.func.count(sa.text('*')))
             .where(rsvp.c.project_id == project_item.id)
             .select_from(rsvp)
         )
@@ -157,7 +157,7 @@ def upgrade_():
 
         for rsvp_item in rsvps:
             existing_counter = conn.scalar(
-                sa.select(sa.func.count('*'))
+                sa.select(sa.func.count(sa.text('*')))
                 .where(
                     commentset_membership.c.commentset_id == project_item.commentset_id
                 )
@@ -196,7 +196,7 @@ def upgrade_():
 
         for crew in crews:
             existing_counter = conn.scalar(
-                sa.select(sa.func.count('*'))
+                sa.select(sa.func.count(sa.text('*')))
                 .where(
                     commentset_membership.c.commentset_id == project_item.commentset_id
                 )
@@ -225,7 +225,9 @@ def upgrade_():
     progress.finish()
 
     # Create commentset membership for existing proposal memberships
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal_membership))
+    count = conn.scalar(
+        sa.select(sa.func.count(sa.text('*'))).select_from(proposal_membership)
+    )
     progress = get_progressbar("Proposals", count)
     progress.start()
 
@@ -243,7 +245,7 @@ def upgrade_():
     )
     for counter, proposal_item in enumerate(proposals):
         existing_counter = conn.scalar(
-            sa.select(sa.func.count('*'))
+            sa.select(sa.func.count(sa.text('*')))
             .where(commentset_membership.c.commentset_id == proposal_item.commentset_id)
             .where(commentset_membership.c.user_id == proposal_item.user_id)
             .where(commentset_membership.c.revoked_at.is_(None))
@@ -270,10 +272,10 @@ def upgrade_():
     progress.finish()
 
 
-def downgrade_():
+def downgrade_() -> None:
     conn = op.get_bind()
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(project))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(project))
     progress = get_progressbar("Projects", count)
     progress.start()
 
@@ -282,7 +284,7 @@ def downgrade_():
         commentset_memberships = conn.execute(
             sa.select(commentset_membership.c.id)
             .where(commentset_membership.c.commentset_id == project_item.commentset_id)
-            .where(commentset_membership.c.revoked_at is None)
+            .where(commentset_membership.c.revoked_at.is_(None))
             .select_from(commentset_membership)
         )
         for membership_item in commentset_memberships:
@@ -294,7 +296,7 @@ def downgrade_():
         progress.update(counter)
     progress.finish()
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(proposal))
     progress = get_progressbar("Proposals", count)
     progress.start()
 
@@ -307,7 +309,7 @@ def downgrade_():
         commentset_memberships = conn.execute(
             sa.select(commentset_membership.c.id)
             .where(commentset_membership.c.commentset_id == proposal_item.commentset_id)
-            .where(commentset_membership.c.revoked_at is None)
+            .where(commentset_membership.c.revoked_at.is_(None))
             .select_from(commentset_membership)
         )
         for membership_item in commentset_memberships:
diff --git a/migrations/versions/1d5e1a11661a_add_json_field_rsvp.py b/migrations/versions/1d5e1a11661a_add_json_field_rsvp.py
index 2b9bfaf86..cd7e9ff43 100644
--- a/migrations/versions/1d5e1a11661a_add_json_field_rsvp.py
+++ b/migrations/versions/1d5e1a11661a_add_json_field_rsvp.py
@@ -17,13 +17,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/2151c9f8e955_replace_allow_columns_with_has_columns.py b/migrations/versions/2151c9f8e955_replace_allow_columns_with_has_columns.py
index 3d8a0c02f..28ca41148 100644
--- a/migrations/versions/2151c9f8e955_replace_allow_columns_with_has_columns.py
+++ b/migrations/versions/2151c9f8e955_replace_allow_columns_with_has_columns.py
@@ -17,13 +17,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/277ba2ca9e3e_add_proposal_sponsor_membership.py b/migrations/versions/277ba2ca9e3e_add_proposal_sponsor_membership.py
index 83cbc2275..c91e8879e 100644
--- a/migrations/versions/277ba2ca9e3e_add_proposal_sponsor_membership.py
+++ b/migrations/versions/277ba2ca9e3e_add_proposal_sponsor_membership.py
@@ -16,17 +16,17 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.create_table(
         'proposal_sponsor_membership',
         sa.Column('granted_at', sa.TIMESTAMP(timezone=True), nullable=False),
@@ -74,7 +74,7 @@ def upgrade_():
     )
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_index(
         'ix_proposal_sponsor_membership_seq',
         table_name='proposal_sponsor_membership',
@@ -97,9 +97,9 @@ def downgrade_():
     op.drop_table('proposal_sponsor_membership')
 
 
-def upgrade_geoname():
+def upgrade_geoname() -> None:
     pass
 
 
-def downgrade_geoname():
+def downgrade_geoname() -> None:
     pass
diff --git a/migrations/versions/284c10efdbce_deprecate_session_speaker_bio.py b/migrations/versions/284c10efdbce_deprecate_session_speaker_bio.py
index 149ff54a7..e61746248 100644
--- a/migrations/versions/284c10efdbce_deprecate_session_speaker_bio.py
+++ b/migrations/versions/284c10efdbce_deprecate_session_speaker_bio.py
@@ -58,7 +58,7 @@ def session_description(row):
 def upgrade() -> None:
     conn = op.get_bind()
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(session))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(session))
     progress = get_progressbar("Sessions", count)
     progress.start()
     items = conn.execute(session.select())
diff --git a/migrations/versions/294362dc7e49_add_organization_state.py b/migrations/versions/294362dc7e49_add_organization_state.py
index 7e7611814..244421ee9 100644
--- a/migrations/versions/294362dc7e49_add_organization_state.py
+++ b/migrations/versions/294362dc7e49_add_organization_state.py
@@ -25,17 +25,17 @@ class ORGANIZATION_STATE:  # noqa: N801
     SUSPENDED = 2
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.add_column(
         'organization',
         sa.Column(
@@ -51,14 +51,14 @@ def upgrade_():
     )
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_constraint('organization_state_check', 'organization', type_='check')
     op.drop_column('organization', 'state')
 
 
-def upgrade_geoname():
+def upgrade_geoname() -> None:
     pass
 
 
-def downgrade_geoname():
+def downgrade_geoname() -> None:
     pass
diff --git a/migrations/versions/2cbfbcca4737_uuid_columns_for_proposal_and_session.py b/migrations/versions/2cbfbcca4737_uuid_columns_for_proposal_and_session.py
index 227e8ab52..085c9ed92 100644
--- a/migrations/versions/2cbfbcca4737_uuid_columns_for_proposal_and_session.py
+++ b/migrations/versions/2cbfbcca4737_uuid_columns_for_proposal_and_session.py
@@ -43,7 +43,7 @@ def upgrade() -> None:
     conn = op.get_bind()
 
     op.add_column('proposal', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(proposal))
     progress = get_progressbar("Proposals", count)
     progress.start()
     items = conn.execute(sa.select(proposal.c.id))
@@ -57,7 +57,7 @@ def upgrade() -> None:
     op.create_unique_constraint('proposal_uuid_key', 'proposal', ['uuid'])
 
     op.add_column('session', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(session))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(session))
     progress = get_progressbar("Sessions", count)
     progress.start()
     items = conn.execute(sa.select(session.c.id))
diff --git a/migrations/versions/321b11b6a413_add_participant_uuid_field.py b/migrations/versions/321b11b6a413_add_participant_uuid_field.py
index 5df001c4e..feac414db 100644
--- a/migrations/versions/321b11b6a413_add_participant_uuid_field.py
+++ b/migrations/versions/321b11b6a413_add_participant_uuid_field.py
@@ -44,7 +44,7 @@ def upgrade() -> None:
 
     op.add_column('participant', sa.Column('uuid', sa.Uuid(), nullable=True))
     # migrate past participants
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(participant))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(participant))
     progress = get_progressbar("Participants", count)
     progress.start()
     items = conn.execute(sa.select(participant.c.id))
diff --git a/migrations/versions/331a4250aa4b_account_merges_user_organization_and_.py b/migrations/versions/331a4250aa4b_account_merges_user_organization_and_.py
index 10e1b810d..d0bad5438 100644
--- a/migrations/versions/331a4250aa4b_account_merges_user_organization_and_.py
+++ b/migrations/versions/331a4250aa4b_account_merges_user_organization_and_.py
@@ -152,7 +152,7 @@ def __post_init__(self):
                     # If not renaming (new is None), use old name from `self.old`
                     rn.table_name = self.future_name or self.current_name
                     rn.old_table_name = self.current_name
-                    rn.symbol = symbol
+                    rn.symbol = symbol  # type: ignore[assignment]
 
     def upgrade(self) -> None:
         """Do the rename."""
@@ -588,13 +588,13 @@ def downgrade(self) -> None:
 ]
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
@@ -758,7 +758,7 @@ def upgrade_() -> None:
     # Insert organization data into account
     with console.status("Copying organization data into account table"):
         op.execute(
-            account.insert().from_select(  # type: ignore[arg-type]
+            account.insert().from_select(
                 [
                     'type',
                     'uuid',
@@ -827,7 +827,7 @@ def upgrade_() -> None:
             .where(profile.c.uuid == account.c.uuid, profile.c.reserved.is_(False))
         )
         op.execute(
-            account.insert().from_select(  # type: ignore[arg-type]
+            account.insert().from_select(
                 [
                     'type',
                     'uuid',
@@ -1428,11 +1428,7 @@ def downgrade_() -> None:
 
     # Delete all non-user rows from account
     with console.status("Dropping all non-user data from account table (slow!)"):
-        op.execute(
-            account.delete().where(  # type: ignore[arg-type]
-                account.c.type != AccountType.USER
-            )
-        )
+        op.execute(account.delete().where(account.c.type != AccountType.USER))
 
     with console.status("Dropping new columns and indexes on account"):
         op.drop_index(op.f('ix_account_name_lower'), table_name='account')
diff --git a/migrations/versions/4aea03545045_sponsor_label_check_constraint.py b/migrations/versions/4aea03545045_sponsor_label_check_constraint.py
index 534f3bbfe..e812327c1 100644
--- a/migrations/versions/4aea03545045_sponsor_label_check_constraint.py
+++ b/migrations/versions/4aea03545045_sponsor_label_check_constraint.py
@@ -20,7 +20,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'sponsor_membership_label_check',
         'sponsor_membership',
-        column('label') != '',  # type: ignore[arg-type]
+        column('label') != '',
     )
 
 
diff --git a/migrations/versions/4f805eefa9f4_urls_now_use_string_instead_of_text.py b/migrations/versions/4f805eefa9f4_urls_now_use_string_instead_of_text.py
index 650ce053e..0972354f3 100644
--- a/migrations/versions/4f805eefa9f4_urls_now_use_string_instead_of_text.py
+++ b/migrations/versions/4f805eefa9f4_urls_now_use_string_instead_of_text.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/5f1ab3e04f73_drop_support_for_128_bit_blake2b_hash_.py b/migrations/versions/5f1ab3e04f73_drop_support_for_128_bit_blake2b_hash_.py
index 25cdb531c..eee61ac8d 100644
--- a/migrations/versions/5f1ab3e04f73_drop_support_for_128_bit_blake2b_hash_.py
+++ b/migrations/versions/5f1ab3e04f73_drop_support_for_128_bit_blake2b_hash_.py
@@ -63,7 +63,9 @@ def downgrade() -> None:
         sa.Column('blake2b', postgresql.BYTEA(), autoincrement=False, nullable=True),
     )
     # Recalculate blake2b hashes
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email_claim))
+    count = conn.scalar(
+        sa.select(sa.func.count(sa.text('*'))).select_from(user_email_claim)
+    )
     progress = get_progressbar("Email claims", count)
     progress.start()
     items = conn.execute(
diff --git a/migrations/versions/5f465411775c_project_end_at_after_start_at.py b/migrations/versions/5f465411775c_project_end_at_after_start_at.py
index 68e29e059..745bd3703 100644
--- a/migrations/versions/5f465411775c_project_end_at_after_start_at.py
+++ b/migrations/versions/5f465411775c_project_end_at_after_start_at.py
@@ -25,7 +25,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'session_start_at_end_at_check',
         'session',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at > start_at),
         ),
@@ -34,7 +34,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'project_start_at_end_at_check',
         'project',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at > start_at),
         ),
@@ -46,7 +46,7 @@ def downgrade() -> None:
     op.create_check_constraint(
         'session_start_at_end_at_check',
         'session',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at >= start_at),
         ),
@@ -55,7 +55,7 @@ def downgrade() -> None:
     op.create_check_constraint(
         'project_start_at_end_at_check',
         'project',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at >= start_at),
         ),
diff --git a/migrations/versions/60ee1687f59c_project_cfp_end_at_after_cfp_start_at.py b/migrations/versions/60ee1687f59c_project_cfp_end_at_after_cfp_start_at.py
index e92a2f306..0f6f1c2bc 100644
--- a/migrations/versions/60ee1687f59c_project_cfp_end_at_after_cfp_start_at.py
+++ b/migrations/versions/60ee1687f59c_project_cfp_end_at_after_cfp_start_at.py
@@ -24,7 +24,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'project_cfp_start_at_cfp_end_at_check',
         'project',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(cfp_start_at.is_(None), cfp_end_at.is_(None)),
             sa.and_(cfp_start_at.is_not(None), cfp_end_at.is_(None)),
             sa.and_(
diff --git a/migrations/versions/63c44675b6cd_migrate_to_phonenumber.py b/migrations/versions/63c44675b6cd_migrate_to_phonenumber.py
index e5e8afd1b..bb66b98b0 100644
--- a/migrations/versions/63c44675b6cd_migrate_to_phonenumber.py
+++ b/migrations/versions/63c44675b6cd_migrate_to_phonenumber.py
@@ -90,13 +90,13 @@ def phone_blake2b160_hash(phone: str) -> bytes:
     return hashlib.blake2b(phone.encode('utf-8'), digest_size=20).digest()
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
@@ -110,7 +110,7 @@ def upgrade_() -> None:
     op.add_column(
         'user_phone', sa.Column('phone_number_id', sa.Integer(), nullable=True)
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_phone))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user_phone))
     items = conn.execute(
         sa.select(
             user_phone.c.id,
@@ -148,10 +148,8 @@ def upgrade_() -> None:
                     allow_sm=False,
                 )
                 .returning(phone_number.c.id)
-            ).fetchone()[
-                0
-            ]  # type: ignore[index]
-
+            ).first()
+            assert pn_id is not None  # nosec B101
         conn.execute(
             user_phone.update()
             .where(user_phone.c.id == item.id)
@@ -175,7 +173,7 @@ def upgrade_() -> None:
     op.drop_column('user_phone', 'gets_text')
 
     # --- SmsMessage -------------------------------------------------------------------
-    # Remove rows with no transactionid, as the data is not validated in any way
+    # Remove rows with no `transactionid`, as the data is not validated in any way
     conn.execute(sa.delete(sms_message).where(sms_message.c.transactionid.is_(None)))
     op.add_column(
         'sms_message', sa.Column('phone_number_id', sa.Integer(), nullable=True)
@@ -183,7 +181,7 @@ def upgrade_() -> None:
 
     rows_to_delete = set()
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(sms_message))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(sms_message))
     items = conn.execute(
         sa.select(
             sms_message.c.id,
@@ -279,9 +277,8 @@ def upgrade_() -> None:
                     **timestamps,
                 )
                 .returning(phone_number.c.id)
-            ).fetchone()[
-                0
-            ]  # type: ignore[index]
+            ).first()
+            assert pn_id is not None  # nosec B101
         conn.execute(
             sms_message.update()
             .where(sms_message.c.id == item.id)
@@ -328,7 +325,7 @@ def downgrade_() -> None:
             nullable=True,
         ),
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(sms_message))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(sms_message))
     items = conn.execute(
         sa.select(sms_message.c.id, phone_number.c.number).where(
             sms_message.c.phone_number_id == phone_number.c.id
@@ -362,7 +359,7 @@ def downgrade_() -> None:
     op.add_column(
         'user_phone', sa.Column('phone', sa.TEXT(), autoincrement=False, nullable=True)
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_phone))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user_phone))
     items = conn.execute(
         sa.select(user_phone.c.id, phone_number.c.number).where(
             user_phone.c.phone_number_id == phone_number.c.id
diff --git a/migrations/versions/65e230fee746_drop_organization_and_profile_tables.py b/migrations/versions/65e230fee746_drop_organization_and_profile_tables.py
index dc3c2b0e6..e81f707d7 100644
--- a/migrations/versions/65e230fee746_drop_organization_and_profile_tables.py
+++ b/migrations/versions/65e230fee746_drop_organization_and_profile_tables.py
@@ -200,7 +200,7 @@ def downgrade_() -> None:
     )
     # TODO: Populate organization
     op.execute(
-        organization.insert().from_select(  # type: ignore[arg-type]
+        organization.insert().from_select(
             [
                 'uuid',
                 'created_at',
@@ -313,7 +313,7 @@ def downgrade_() -> None:
     )
     # Copy user profiles
     op.execute(
-        profile.insert().from_select(  # type: ignore[arg-type]
+        profile.insert().from_select(
             [
                 'account_id',
                 'organization_id',
@@ -358,7 +358,7 @@ def downgrade_() -> None:
     )
     # Copy org profiles
     op.execute(
-        profile.insert().from_select(  # type: ignore[arg-type]
+        profile.insert().from_select(
             [
                 'account_id',
                 'organization_id',
@@ -407,7 +407,7 @@ def downgrade_() -> None:
     )
     # Copy reserved (placeholder) profiles
     op.execute(
-        profile.insert().from_select(  # type: ignore[arg-type]
+        profile.insert().from_select(
             [
                 'account_id',
                 'organization_id',
diff --git a/migrations/versions/6835596b1eee_shortlink_model.py b/migrations/versions/6835596b1eee_shortlink_model.py
index 6441d657c..7841eaedc 100644
--- a/migrations/versions/6835596b1eee_shortlink_model.py
+++ b/migrations/versions/6835596b1eee_shortlink_model.py
@@ -16,17 +16,17 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.create_table(
         'shortlink',
         sa.Column('id', sa.BigInteger(), autoincrement=False, nullable=False),
@@ -41,6 +41,6 @@ def upgrade_():
     op.create_index(op.f('ix_shortlink_url'), 'shortlink', ['url'], unique=False)
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_index(op.f('ix_shortlink_url'), table_name='shortlink')
     op.drop_table('shortlink')
diff --git a/migrations/versions/69c2ced88981_team_org_uuid.py b/migrations/versions/69c2ced88981_team_org_uuid.py
index 42ad39f46..7feb122dc 100644
--- a/migrations/versions/69c2ced88981_team_org_uuid.py
+++ b/migrations/versions/69c2ced88981_team_org_uuid.py
@@ -46,7 +46,7 @@ def upgrade() -> None:
     conn = op.get_bind()
 
     op.add_column('team', sa.Column('org_uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(team))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(team))
     progress = get_progressbar("Teams", count)
     progress.start()
     items = conn.execute(sa.select(team.c.id, team.c.orgid))
@@ -70,7 +70,7 @@ def downgrade() -> None:
     op.add_column(
         'team', sa.Column('orgid', sa.String(22), autoincrement=False, nullable=True)
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(team))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(team))
     progress = get_progressbar("Teams", count)
     progress.start()
     items = conn.execute(sa.select(team.c.id, team.c.org_uuid))
diff --git a/migrations/versions/6d031c17a6ee_start_enums_at_1.py b/migrations/versions/6d031c17a6ee_start_enums_at_1.py
index ca2c8c905..6a00277c2 100644
--- a/migrations/versions/6d031c17a6ee_start_enums_at_1.py
+++ b/migrations/versions/6d031c17a6ee_start_enums_at_1.py
@@ -88,13 +88,13 @@
 ]
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/7aa9eb80aab4_add_sysadmin_flag.py b/migrations/versions/7aa9eb80aab4_add_sysadmin_flag.py
index 52fdd26b8..4aa8382fa 100644
--- a/migrations/versions/7aa9eb80aab4_add_sysadmin_flag.py
+++ b/migrations/versions/7aa9eb80aab4_add_sysadmin_flag.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/7d5b77aada1e_add_geoname_models.py b/migrations/versions/7d5b77aada1e_add_geoname_models.py
index 788b62cd2..f7e2b6eff 100644
--- a/migrations/versions/7d5b77aada1e_add_geoname_models.py
+++ b/migrations/versions/7d5b77aada1e_add_geoname_models.py
@@ -17,25 +17,25 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     pass
 
 
-def downgrade_():
+def downgrade_() -> None:
     pass
 
 
-def upgrade_geoname():
+def upgrade_geoname() -> None:
     op.create_table(
         'geo_country_info',
         sa.Column('iso_alpha2', sa.CHAR(length=2), nullable=True),
@@ -191,7 +191,7 @@ def upgrade_geoname():
     )
 
 
-def downgrade_geoname():
+def downgrade_geoname() -> None:
     op.drop_index(op.f('ix_geo_alt_name_title'), table_name='geo_alt_name')
     op.drop_index(op.f('ix_geo_name_ascii_title'), table_name='geo_name')
     op.drop_index(op.f('ix_geo_name_title'), table_name='geo_name')
diff --git a/migrations/versions/7f8114c73092_add_rsvp_uuid.py b/migrations/versions/7f8114c73092_add_rsvp_uuid.py
index 4836eb1a2..7fced4679 100644
--- a/migrations/versions/7f8114c73092_add_rsvp_uuid.py
+++ b/migrations/versions/7f8114c73092_add_rsvp_uuid.py
@@ -49,7 +49,7 @@ def upgrade() -> None:
     conn = op.get_bind()
     op.add_column('rsvp', sa.Column('uuid', sa.Uuid(), nullable=True))
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(rsvp))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(rsvp))
     progress = get_progressbar("Rsvps", count)
     progress.start()
 
diff --git a/migrations/versions/832a4481cda9_tagline_for_profile.py b/migrations/versions/832a4481cda9_tagline_for_profile.py
index 37d932956..2bbf1d9f8 100644
--- a/migrations/versions/832a4481cda9_tagline_for_profile.py
+++ b/migrations/versions/832a4481cda9_tagline_for_profile.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/83b6643891ec_hash_check_constraint.py b/migrations/versions/83b6643891ec_hash_check_constraint.py
index ef1dba68c..74e415513 100644
--- a/migrations/versions/83b6643891ec_hash_check_constraint.py
+++ b/migrations/versions/83b6643891ec_hash_check_constraint.py
@@ -15,13 +15,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/887db555cca9_adding_uuid_to_commentset.py b/migrations/versions/887db555cca9_adding_uuid_to_commentset.py
index 7702f2e50..3e4291924 100644
--- a/migrations/versions/887db555cca9_adding_uuid_to_commentset.py
+++ b/migrations/versions/887db555cca9_adding_uuid_to_commentset.py
@@ -45,7 +45,7 @@ def upgrade() -> None:
 
     op.add_column('commentset', sa.Column('uuid', sa.Uuid(), nullable=True))
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(commentset))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(commentset))
     progress = get_progressbar("Commentsets", count)
     progress.start()
     items = conn.execute(sa.select(commentset.c.id))
diff --git a/migrations/versions/896137ace892_remove_voteset_and_vote.py b/migrations/versions/896137ace892_remove_voteset_and_vote.py
index 6e30a09cf..9c6494bc1 100644
--- a/migrations/versions/896137ace892_remove_voteset_and_vote.py
+++ b/migrations/versions/896137ace892_remove_voteset_and_vote.py
@@ -17,17 +17,17 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.drop_constraint('comment_voteset_id_fkey', 'comment', type_='foreignkey')
     op.drop_column('comment', 'voteset_id')
     op.drop_constraint('project_voteset_id_fkey', 'project', type_='foreignkey')
@@ -41,7 +41,7 @@ def upgrade_():
     op.drop_table('voteset')
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.create_table(
         'voteset',
         sa.Column(
diff --git a/migrations/versions/99e99507a595_add_commentset_state.py b/migrations/versions/99e99507a595_add_commentset_state.py
index 5e9e27a42..e7fa649b3 100644
--- a/migrations/versions/99e99507a595_add_commentset_state.py
+++ b/migrations/versions/99e99507a595_add_commentset_state.py
@@ -23,17 +23,17 @@ class COMMENTSET_STATE:  # noqa: N801
     COLLABORATORS = 4  # Only for editors/collaborators
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.add_column(
         'commentset',
         sa.Column(
@@ -49,14 +49,14 @@ def upgrade_():
     )
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_constraint('commentset_state_check', 'commentset', type_='check')
     op.drop_column('commentset', 'state')
 
 
-def upgrade_geoname():
+def upgrade_geoname() -> None:
     pass
 
 
-def downgrade_geoname():
+def downgrade_geoname() -> None:
     pass
diff --git a/migrations/versions/9ad724b3e8cc_remove_userphoneclaim.py b/migrations/versions/9ad724b3e8cc_remove_userphoneclaim.py
index dfc949893..df3c5fb12 100644
--- a/migrations/versions/9ad724b3e8cc_remove_userphoneclaim.py
+++ b/migrations/versions/9ad724b3e8cc_remove_userphoneclaim.py
@@ -17,25 +17,25 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     """Remove UserPhoneClaim model."""
     op.drop_index('ix_user_phone_claim_phone', table_name='user_phone_claim')
     op.drop_table('user_phone_claim')
 
 
-def downgrade_():
+def downgrade_() -> None:
     """Restore UserPhoneClaim model."""
     op.create_table(
         'user_phone_claim',
diff --git a/migrations/versions/a116118d086b_add_frozen_title.py b/migrations/versions/a116118d086b_add_frozen_title.py
index 97ccbb727..278c97866 100644
--- a/migrations/versions/a116118d086b_add_frozen_title.py
+++ b/migrations/versions/a116118d086b_add_frozen_title.py
@@ -50,13 +50,13 @@
 ]
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/a5dbb3f843e4_add_start_end_check_constraints.py b/migrations/versions/a5dbb3f843e4_add_start_end_check_constraints.py
index e411fc95b..faa068dc9 100644
--- a/migrations/versions/a5dbb3f843e4_add_start_end_check_constraints.py
+++ b/migrations/versions/a5dbb3f843e4_add_start_end_check_constraints.py
@@ -25,7 +25,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'session_start_at_end_at_check',
         'session',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at >= start_at),
         ),
@@ -33,7 +33,7 @@ def upgrade() -> None:
     op.create_check_constraint(
         'project_start_at_end_at_check',
         'project',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None), end_at >= start_at),
         ),
@@ -46,7 +46,7 @@ def downgrade() -> None:
     op.create_check_constraint(
         'session_start_at_end_at_check',
         'session',
-        sa.or_(  # type: ignore[arg-type]
+        sa.or_(
             sa.and_(start_at.is_(None), end_at.is_(None)),
             sa.and_(start_at.is_not(None), end_at.is_not(None)),
         ),
diff --git a/migrations/versions/ad5013552ec6_simplify_proposal_fields.py b/migrations/versions/ad5013552ec6_simplify_proposal_fields.py
index 1551e0219..4fa98c8a6 100644
--- a/migrations/versions/ad5013552ec6_simplify_proposal_fields.py
+++ b/migrations/versions/ad5013552ec6_simplify_proposal_fields.py
@@ -87,7 +87,7 @@ def upgrade() -> None:
     op.add_column('proposal', sa.Column('body_html', sa.UnicodeText(), nullable=True))
     op.add_column('proposal', sa.Column('description', sa.Unicode(), nullable=True))
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(proposal))
     progress = get_progressbar("Proposals", count)
     progress.start()
     items = conn.execute(proposal.select())
diff --git a/migrations/versions/ae075a249493_migrate_email_addresses.py b/migrations/versions/ae075a249493_migrate_email_addresses.py
index a6ea10cff..dd639e74f 100644
--- a/migrations/versions/ae075a249493_migrate_email_addresses.py
+++ b/migrations/versions/ae075a249493_migrate_email_addresses.py
@@ -167,7 +167,7 @@ def upgrade() -> None:
         'user_email', sa.Column('email_address_id', sa.Integer(), nullable=True)
     )
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user_email))
     progress = get_progressbar("Emails", count)
     progress.start()
     items = conn.execute(
@@ -259,7 +259,9 @@ def upgrade() -> None:
         ondelete='SET NULL',
     )
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email_claim))
+    count = conn.scalar(
+        sa.select(sa.func.count(sa.text('*'))).select_from(user_email_claim)
+    )
     progress = get_progressbar("Email claims", count)
     progress.start()
     items = conn.execute(
@@ -348,7 +350,7 @@ def upgrade() -> None:
     )
 
     count = conn.scalar(
-        sa.select(sa.func.count('*'))
+        sa.select(sa.func.count(sa.text('*')))
         .select_from(proposal)
         .where(proposal.c.email.is_not(None))
     )
@@ -413,7 +415,7 @@ def downgrade() -> None:
     )
 
     count = conn.scalar(
-        sa.select(sa.func.count('*'))
+        sa.select(sa.func.count(sa.text('*')))
         .select_from(proposal)
         .where(proposal.c.email_address_id.is_not(None))
     )
@@ -449,7 +451,9 @@ def downgrade() -> None:
         sa.Column('email', sa.VARCHAR(length=254), autoincrement=False, nullable=True),
     )
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email_claim))
+    count = conn.scalar(
+        sa.select(sa.func.count(sa.text('*'))).select_from(user_email_claim)
+    )
     progress = get_progressbar("Email claims", count)
     progress.start()
     items = conn.execute(
@@ -519,7 +523,7 @@ def downgrade() -> None:
         sa.Column('blake2b', postgresql.BYTEA(), autoincrement=False, nullable=True),
     )
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user_email))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user_email))
     progress = get_progressbar("Emails", count)
     progress.start()
     items = conn.execute(
diff --git a/migrations/versions/aebd5a9e5af1_project_timestamps.py b/migrations/versions/aebd5a9e5af1_project_timestamps.py
index 804c56f03..5e9e44797 100644
--- a/migrations/versions/aebd5a9e5af1_project_timestamps.py
+++ b/migrations/versions/aebd5a9e5af1_project_timestamps.py
@@ -88,7 +88,7 @@ def upgrade() -> None:
 
     # Update project start_at/end_at timestamps where sessions exist
     conn = op.get_bind()
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(project))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(project))
     progress = get_progressbar("Projects", count)
     progress.start()
     project_ids = conn.execute(sa.select(project.c.id))
diff --git a/migrations/versions/b34aa62af7fc_uuid_columns_for_project_profile_user_team.py b/migrations/versions/b34aa62af7fc_uuid_columns_for_project_profile_user_team.py
index 1ecfc660c..0cb59af67 100644
--- a/migrations/versions/b34aa62af7fc_uuid_columns_for_project_profile_user_team.py
+++ b/migrations/versions/b34aa62af7fc_uuid_columns_for_project_profile_user_team.py
@@ -65,7 +65,7 @@ def upgrade() -> None:
 
     # --- Project
     op.add_column('project', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(project))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(project))
     progress = get_progressbar("Projects", count)
     progress.start()
     items = conn.execute(sa.select(project.c.id))
@@ -80,7 +80,7 @@ def upgrade() -> None:
 
     # --- Profile
     op.add_column('profile', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(profile))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(profile))
     progress = get_progressbar("Profiles", count)
     progress.start()
     items = conn.execute(sa.select(profile.c.id, profile.c.userid))
@@ -99,7 +99,7 @@ def upgrade() -> None:
 
     # --- Team
     op.add_column('team', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(team))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(team))
     progress = get_progressbar("Teams", count)
     progress.start()
     items = conn.execute(sa.select(team.c.id, team.c.userid))
@@ -118,7 +118,7 @@ def upgrade() -> None:
 
     # --- User
     op.add_column('user', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user))
     progress = get_progressbar("Users", count)
     progress.start()
     items = conn.execute(sa.select(user.c.id, user.c.userid))
@@ -142,7 +142,7 @@ def downgrade() -> None:
     # --- User
     op.add_column('user', sa.Column('userid', sa.String(22), nullable=True))
     op.create_unique_constraint('user_userid_key', 'user', ['userid'])
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(user))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(user))
     progress = get_progressbar("Users", count)
     progress.start()
     items = conn.execute(sa.select(user.c.id, user.c.uuid))
@@ -161,7 +161,7 @@ def downgrade() -> None:
     # --- Team
     op.add_column('team', sa.Column('userid', sa.String(22), nullable=True))
     op.create_unique_constraint('team_userid_key', 'team', ['userid'])
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(team))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(team))
     progress = get_progressbar("Teams", count)
     progress.start()
     items = conn.execute(sa.select(team.c.id, team.c.uuid))
@@ -180,7 +180,7 @@ def downgrade() -> None:
     # --- Profile
     op.add_column('profile', sa.Column('userid', sa.String(22), nullable=True))
     op.create_unique_constraint('profile_userid_key', 'profile', ['userid'])
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(profile))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(profile))
     progress = get_progressbar("Profiles", count)
     progress.start()
     items = conn.execute(sa.select(profile.c.id, profile.c.uuid))
diff --git a/migrations/versions/b7165507d80c_track_oauth2_refresh_token_and_expiry.py b/migrations/versions/b7165507d80c_track_oauth2_refresh_token_and_expiry.py
index fd58aedf8..5a6abc35a 100644
--- a/migrations/versions/b7165507d80c_track_oauth2_refresh_token_and_expiry.py
+++ b/migrations/versions/b7165507d80c_track_oauth2_refresh_token_and_expiry.py
@@ -16,12 +16,12 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
 
diff --git a/migrations/versions/b8a87e6a24f1_versionid_is_now_revisionid_and_in_more_.py b/migrations/versions/b8a87e6a24f1_versionid_is_now_revisionid_and_in_more_.py
index e0ff89af2..f706d1402 100644
--- a/migrations/versions/b8a87e6a24f1_versionid_is_now_revisionid_and_in_more_.py
+++ b/migrations/versions/b8a87e6a24f1_versionid_is_now_revisionid_and_in_more_.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/c3069d33419a_comment_uuid_field.py b/migrations/versions/c3069d33419a_comment_uuid_field.py
index b873631f1..34fbd17a1 100644
--- a/migrations/versions/c3069d33419a_comment_uuid_field.py
+++ b/migrations/versions/c3069d33419a_comment_uuid_field.py
@@ -41,7 +41,7 @@ def upgrade() -> None:
 
     op.add_column('comment', sa.Column('uuid', sa.Uuid(), nullable=True))
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(comment))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(comment))
     progress = get_progressbar("Comments", count)
     progress.start()
     items = conn.execute(sa.select(comment.c.id))
diff --git a/migrations/versions/ca578c1b82e8_populate_usersession_geonameid_from_ip_.py b/migrations/versions/ca578c1b82e8_populate_usersession_geonameid_from_ip_.py
index 9b7af1fc7..5afb523fe 100644
--- a/migrations/versions/ca578c1b82e8_populate_usersession_geonameid_from_ip_.py
+++ b/migrations/versions/ca578c1b82e8_populate_usersession_geonameid_from_ip_.py
@@ -72,7 +72,7 @@ def upgrade() -> None:
         if geoip_city is not None or geoip_asn is not None:
             conn = op.get_bind()
             count = conn.scalar(
-                sa.select(sa.func.count('*'))
+                sa.select(sa.func.count(sa.text('*')))
                 .select_from(user_session)
                 .where(
                     sa.or_(
diff --git a/migrations/versions/cad24ab35cc2_limit_session_duration_to_24h.py b/migrations/versions/cad24ab35cc2_limit_session_duration_to_24h.py
index 5b9e69b0d..33fd8f14c 100644
--- a/migrations/versions/cad24ab35cc2_limit_session_duration_to_24h.py
+++ b/migrations/versions/cad24ab35cc2_limit_session_duration_to_24h.py
@@ -20,17 +20,17 @@
 end_at = column('end_at', sa.TIMESTAMP)
 
 
-def upgrade(engine_name=''):
+def upgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `upgrade_` instead
     globals().get('upgrade_%s' % engine_name, lambda: None)()
 
 
-def downgrade(engine_name=''):
+def downgrade(engine_name: str = '') -> None:
     # Do not modify. Edit `downgrade_` instead
     globals().get('downgrade_%s' % engine_name, lambda: None)()
 
 
-def upgrade_():
+def upgrade_() -> None:
     op.drop_constraint('session_start_at_end_at_check', 'session', type_='check')
     op.create_check_constraint(
         'session_start_at_end_at_check',
@@ -47,7 +47,7 @@ def upgrade_():
     )
 
 
-def downgrade_():
+def downgrade_() -> None:
     op.drop_constraint('session_start_at_end_at_check', 'session', type_='check')
     op.create_check_constraint(
         'session_start_at_end_at_check',
diff --git a/migrations/versions/d0a6fab28b7f_add_label_to_project_crew_membership.py b/migrations/versions/d0a6fab28b7f_add_label_to_project_crew_membership.py
index f1844073c..3b1c7b1e2 100644
--- a/migrations/versions/d0a6fab28b7f_add_label_to_project_crew_membership.py
+++ b/migrations/versions/d0a6fab28b7f_add_label_to_project_crew_membership.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/d79beb04a529_remove_incorrect_nullable_flag.py b/migrations/versions/d79beb04a529_remove_incorrect_nullable_flag.py
new file mode 100644
index 000000000..e37afe34d
--- /dev/null
+++ b/migrations/versions/d79beb04a529_remove_incorrect_nullable_flag.py
@@ -0,0 +1,40 @@
+"""Remove incorrect nullable flag.
+
+Revision ID: d79beb04a529
+Revises: f0ed25eed4bc
+Create Date: 2023-12-21 00:55:05.801455
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = 'd79beb04a529'
+down_revision: str = 'f0ed25eed4bc'
+branch_labels: str | tuple[str, ...] | None = None
+depends_on: str | tuple[str, ...] | None = None
+
+
+def upgrade(engine_name: str = '') -> None:
+    """Upgrade all databases."""
+    # Do not modify. Edit `upgrade_` instead
+    globals().get(f'upgrade_{engine_name}', lambda: None)()
+
+
+def downgrade(engine_name: str = '') -> None:
+    """Downgrade all databases."""
+    # Do not modify. Edit `downgrade_` instead
+    globals().get(f'downgrade_{engine_name}', lambda: None)()
+
+
+def upgrade_() -> None:
+    """Upgrade default database."""
+    with op.batch_alter_table('auth_client', schema=None) as batch_op:
+        batch_op.alter_column('account_id', existing_type=sa.INTEGER(), nullable=False)
+
+
+def downgrade_() -> None:
+    """Downgrade default database."""
+    with op.batch_alter_table('auth_client', schema=None) as batch_op:
+        batch_op.alter_column('account_id', existing_type=sa.INTEGER(), nullable=True)
diff --git a/migrations/versions/e2b28adfa135_add_proposal_suuid_redirect.py b/migrations/versions/e2b28adfa135_add_proposal_suuid_redirect.py
index c72feedf5..5b67d654d 100644
--- a/migrations/versions/e2b28adfa135_add_proposal_suuid_redirect.py
+++ b/migrations/versions/e2b28adfa135_add_proposal_suuid_redirect.py
@@ -74,7 +74,7 @@ def upgrade() -> None:
     )
 
     conn = op.get_bind()
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(proposal))
     progress = get_progressbar("Proposals", count)
     progress.start()
     items = conn.execute(sa.select(proposal.c.id, proposal.c.uuid))
diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index 8eadf602d..830676efb 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -71,7 +71,7 @@ def upgrade() -> None:
         sec_count = cast(
             int,
             conn.scalar(
-                sa.select(sa.func.count('*'))
+                sa.select(sa.func.count(sa.text('*')))
                 .select_from(section)
                 .where(section.c.project_id == proj.id)
             ),
@@ -236,7 +236,7 @@ def upgrade() -> None:
             duplicate_count = cast(
                 int,
                 conn.scalar(
-                    sa.select(sa.func.count('*'))
+                    sa.select(sa.func.count(sa.text('*')))
                     .select_from(label)
                     .where(label.c.name == st_name)
                     .where(label.c.project_id == proj.id)
diff --git a/migrations/versions/e3b3ccbca3b9_move_participant_to_emailaddressmixin.py b/migrations/versions/e3b3ccbca3b9_move_participant_to_emailaddressmixin.py
index 906475372..38e9cbe06 100644
--- a/migrations/versions/e3b3ccbca3b9_move_participant_to_emailaddressmixin.py
+++ b/migrations/versions/e3b3ccbca3b9_move_participant_to_emailaddressmixin.py
@@ -139,7 +139,7 @@ def upgrade() -> None:
         ondelete='SET NULL',
     )
 
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(participant))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(participant))
     progress = get_progressbar("Participants", count)
     progress.start()
     items = conn.execute(
@@ -244,7 +244,7 @@ def downgrade() -> None:
         'participant',
         sa.Column('email', sa.VARCHAR(length=254), autoincrement=False, nullable=True),
     )
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(participant))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(participant))
     progress = get_progressbar("Participants", count)
     progress.start()
     items = conn.execute(
diff --git a/migrations/versions/eec2fad0f3e9_venue_uuid_field.py b/migrations/versions/eec2fad0f3e9_venue_uuid_field.py
index f9d951ad7..366d6b5b4 100644
--- a/migrations/versions/eec2fad0f3e9_venue_uuid_field.py
+++ b/migrations/versions/eec2fad0f3e9_venue_uuid_field.py
@@ -40,7 +40,7 @@ def upgrade() -> None:
     conn = op.get_bind()
 
     op.add_column('venue', sa.Column('uuid', sa.Uuid(), nullable=True))
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(venue))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(venue))
     progress = get_progressbar("Venues", count)
     progress.start()
     items = conn.execute(sa.select(venue.c.id))
diff --git a/migrations/versions/f346a7cc783a_use_underscores_in_account_names.py b/migrations/versions/f346a7cc783a_use_underscores_in_account_names.py
index 0e8e89955..08d3e02f3 100644
--- a/migrations/versions/f346a7cc783a_use_underscores_in_account_names.py
+++ b/migrations/versions/f346a7cc783a_use_underscores_in_account_names.py
@@ -22,13 +22,13 @@
 )
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/migrations/versions/fa05ebecbc0f_populate_proposalmembership.py b/migrations/versions/fa05ebecbc0f_populate_proposalmembership.py
index 025b31446..7bbbe085f 100644
--- a/migrations/versions/fa05ebecbc0f_populate_proposalmembership.py
+++ b/migrations/versions/fa05ebecbc0f_populate_proposalmembership.py
@@ -87,7 +87,7 @@ def get_progressbar(label, maxval):
 def upgrade() -> None:
     # Adapts from `proposal` table to an empty `proposal_membership` table.
     conn = op.get_bind()
-    count = conn.scalar(sa.select(sa.func.count('*')).select_from(proposal))
+    count = conn.scalar(sa.select(sa.func.count(sa.text('*'))).select_from(proposal))
 
     progress = get_progressbar("Proposals", count)
     progress.start()
diff --git a/migrations/versions/fb90ab2af4c2_add_phonenumber.py b/migrations/versions/fb90ab2af4c2_add_phonenumber.py
index e9a1059f5..39a5b97b5 100644
--- a/migrations/versions/fb90ab2af4c2_add_phonenumber.py
+++ b/migrations/versions/fb90ab2af4c2_add_phonenumber.py
@@ -16,13 +16,13 @@
 depends_on: str | tuple[str, ...] | None = None
 
 
-def upgrade(engine_name='') -> None:
+def upgrade(engine_name: str = '') -> None:
     """Upgrade all databases."""
     # Do not modify. Edit `upgrade_` instead
     globals().get(f'upgrade_{engine_name}', lambda: None)()
 
 
-def downgrade(engine_name='') -> None:
+def downgrade(engine_name: str = '') -> None:
     """Downgrade all databases."""
     # Do not modify. Edit `downgrade_` instead
     globals().get(f'downgrade_{engine_name}', lambda: None)()
diff --git a/mypy-ratchet.json b/mypy-ratchet.json
deleted file mode 100644
index 3f2971212..000000000
--- a/mypy-ratchet.json
+++ /dev/null
@@ -1,2134 +0,0 @@
-{
-  "funnel/__init__.py": {
-    "\"Flask\" has no attribute \"assets\"  [attr-defined]": 3,
-    "\"Flask\" has no attribute \"geoip_asn\"  [attr-defined]": 2,
-    "\"Flask\" has no attribute \"geoip_city\"  [attr-defined]": 2,
-    "\"Flask\" has no attribute \"login_manager\"  [attr-defined]": 1,
-    "Argument \"theme\" to \"init_app\" of \"BaseframeBlueprint\" has incompatible type \"Literal['funnel']\"; expected \"Literal['bootstrap3', 'mui']\"  [arg-type]": 1,
-    "Call to untyped function \"configure_mappers\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"init\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"init_app\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"init_rq_dashboard\" in typed context  [no-untyped-call]": 1,
-    "Module \"baseframe\" has no attribute \"Bundle\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/cli/geodata.py": {
-    "Call to untyped function \"command\" in typed context  [no-untyped-call]": 2,
-    "Non-overlapping equality check (left operand type: \"str\", right operand type: \"Literal[0]\")  [comparison-overlap]": 1,
-    "Untyped decorator makes function \"download\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"process\" untyped  [misc]": 1
-  },
-  "funnel/cli/misc.py": {
-    "Call to untyped function \"command\" in typed context  [no-untyped-call]": 3,
-    "Untyped decorator makes function \"baseframe_translations_path\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"dbconfig\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"dbcreate\" untyped  [misc]": 1
-  },
-  "funnel/cli/periodic/notification.py": {
-    "\"Type[Project]\" has no attribute \"starting_at\"  [attr-defined]": 1,
-    "Call to untyped function \"command\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Untyped decorator makes function \"project_starting_alert\" untyped  [misc]": 1
-  },
-  "funnel/cli/periodic/stats.py": {
-    "Call to untyped function \"command\" in typed context  [no-untyped-call]": 1,
-    "Missing type parameters for generic type \"Query\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Untyped decorator makes function \"dailystats\" untyped  [misc]": 1
-  },
-  "funnel/cli/refresh/markdown.py": {
-    "Call to untyped function \"command\" in typed context  [no-untyped-call]": 1,
-    "Missing type parameters for generic type \"MarkdownModel\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Untyped decorator makes function \"markdown\" untyped  [misc]": 1
-  },
-  "funnel/devtest.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Missing type parameters for generic type \"Callable\"  [type-arg]": 3,
-    "Missing type parameters for generic type \"Iterable\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 2,
-    "Returning Any from function declared to return \"Iterable[bytes]\"  [no-any-return]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[str], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/extapi/boxoffice.py": {
-    "Call to untyped function \"get_orders\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/extapi/explara.py": {
-    "Call to untyped function \"get_orders\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"strip_or_empty\" in typed context  [no-untyped-call]": 10,
-    "Call to untyped function \"url_for\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/forms/account.py": {
-    "\"User\" has no attribute \"emailclaims\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"emails\"; maybe \"email\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"phones\"; maybe \"phone\"?  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "funnel/forms/auth_client.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "funnel/forms/helpers.py": {
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/forms/login.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Incompatible types in assignment (expression has type \"Union[UserEmail, UserEmailClaim, UserPhone, EmailAddress, None]\", variable has type \"Union[UserEmail, UserEmailClaim, UserPhone, None]\")  [assignment]": 1
-  },
-  "funnel/forms/membership.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/forms/notification.py": {
-    "\"User\" has no attribute \"notification_preferences\"  [attr-defined]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1
-  },
-  "funnel/forms/profile.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1
-  },
-  "funnel/forms/project.py": {
-    "\"Project\" has no attribute \"schedule_start_at\"  [attr-defined]": 1,
-    "Item \"ManagedState\" of \"Union[ManagedState, ManagedStateGroup]\" has no attribute \"transitions\"  [union-attr]": 1,
-    "Item \"ManagedStateGroup\" of \"Union[ManagedState, ManagedStateGroup]\" has no attribute \"transitions\"  [union-attr]": 1
-  },
-  "funnel/forms/proposal.py": {
-    "\"Project\" has no attribute \"labels\"  [attr-defined]": 3,
-    "\"Proposal\" has no attribute \"formlabels\"  [attr-defined]": 2,
-    "\"Proposal\" has no attribute \"memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"projects_as_editor\"  [attr-defined]": 1
-  },
-  "funnel/forms/sync_ticket.py": {
-    "\"Project\" has no attribute \"ticket_events\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/forms/venue.py": {
-    "\"Project\" has no attribute \"venues\"  [attr-defined]": 1
-  },
-  "funnel/loginproviders/github.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/loginproviders/google.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 2
-  },
-  "funnel/loginproviders/init_app.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/loginproviders/linkedin.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/loginproviders/twitter.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/loginproviders/zoom.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/models/auth_client.py": {
-    "\"AuthClient\" has no attribute \"credentials\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"client_permissions\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"teams\"  [attr-defined]": 1,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Incompatible return value type (got \"Optional[User]\", expected \"User\")  [return-value]": 1,
-    "Incompatible return value type (got \"Query[AuthClientTeamPermissions]\", expected \"Query[AuthClientUserPermissions]\")  [return-value]": 1,
-    "Incompatible types in assignment (expression has type \"Set[Union[str, Any]]\", variable has type \"Tuple[str, ...]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"Set[str]\", variable has type \"Tuple[str, ...]\")  [assignment]": 1,
-    "Missing type parameters for generic type \"Iterable\"  [type-arg]": 3,
-    "Missing type parameters for generic type \"List\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Query\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Tuple\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"datetime\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/models/comment.py": {
-    "\"BaseMixin\" has no attribute \"__tablename__\"  [attr-defined]": 1,
-    "\"BaseMixin\" has no attribute \"title\"  [attr-defined]": 1,
-    "\"Comment\" has no attribute \"in_reply_to\"; maybe \"in_reply_to_id\"?  [attr-defined]": 2,
-    "\"Commentset\" has no attribute \"comments\"  [attr-defined]": 1,
-    "\"Commentset\" has no attribute \"project\"  [attr-defined]": 4,
-    "\"Commentset\" has no attribute \"proposal\"  [attr-defined]": 5,
-    "\"Commentset\" has no attribute \"update\"  [attr-defined]": 2,
-    "Argument 1 to \"setter\" of \"_InPlace\" has incompatible type \"Callable[[Comment, Optional[User]], None]\"; expected \"_HybridSetterType[Union[User, DuckTypeUser]]\"  [arg-type]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Incompatible return value type (got \"Union[DuckTypeUser, User, None]\", expected \"Union[User, DuckTypeUser]\")  [return-value]": 1,
-    "Missing type parameters for generic type \"RoleAccessProxy\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"BaseMixin\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1,
-    "Statement is unreachable  [unreachable]": 2
-  },
-  "funnel/models/commentset_membership.py": {
-    "Incompatible types in assignment (expression has type \"Mapped[Commentset]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Item \"None\" of \"Optional[CommentsetMembership]\" has no attribute \"is_muted\"  [union-attr]": 2,
-    "Item \"None\" of \"Optional[CommentsetMembership]\" has no attribute \"replace\"  [union-attr]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/contact_exchange.py": {
-    "\"User\" has no attribute \"scanned_contacts\"  [attr-defined]": 2,
-    "Argument \"timezone\" to \"ProjectId\" has incompatible type \"Union[_UTCclass, StaticTzInfo, DstTzInfo]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 2 to \"DateCountContacts\" has incompatible type \"Callable[[Any], int]\"; expected \"int\"  [arg-type]": 1,
-    "Argument 2 to \"contacts_for_project_and_date\" of \"ContactExchange\" has incompatible type \"ProjectId\"; expected \"Project\"  [arg-type]": 1,
-    "Argument 3 to \"DateCountContacts\" has incompatible type \"Query[ContactExchange]\"; expected \"Collection[ContactExchange]\"  [arg-type]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"RoleMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TimestampMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Need type annotation for \"query\"  [var-annotated]": 1
-  },
-  "funnel/models/draft.py": {
-    "Missing type parameters for generic type \"MultiDict\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"types.jsonb_dict\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"NoIdMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/email_address.py": {
-    "Argument 1 to \"filter\" of \"Query\" has incompatible type \"Optional[ColumnElement[Any]]\"; expected \"Union[ColumnElement[bool], _HasClauseElement, SQLCoreOperations[bool], ExpressionElementRole[bool], Callable[[], ColumnElement[bool]], LambdaElement]\"  [arg-type]": 1,
-    "Argument 1 to \"is_available_for\" of \"EmailAddress\" has incompatible type \"Optional[EmailAddressMixin]\"; expected \"EmailAddressMixin\"  [arg-type]": 2,
-    "Item \"None\" of \"Optional[Any]\" has no attribute \"has_identity\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"ColumnElement\"  [type-arg]": 5,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"sqlalchemy.orm.attributes\" does not explicitly export attribute \"NO_VALUE\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1
-  },
-  "funnel/models/geoname.py": {
-    "\"GeoName\" has no attribute \"alternate_titles\"  [attr-defined]": 1,
-    "\"GeoName\" has no attribute \"has_admin1code\"; maybe \"admin1code\"?  [attr-defined]": 3,
-    "\"GeoName\" has no attribute \"has_admin2code\"; maybe \"admin2code\"?  [attr-defined]": 3,
-    "\"GeoName\" has no attribute \"has_country\"; maybe \"country\"?  [attr-defined]": 4,
-    "\"Type[GeoName]\" has no attribute \"alternate_titles\"  [attr-defined]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Incompatible types in assignment (expression has type \"Optional[GeoName]\", target has type \"GeoName\")  [assignment]": 2,
-    "Item \"None\" of \"Optional[GeoAdmin1Code]\" has no attribute \"title\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[GeoAdmin2Code]\" has no attribute \"title\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Redundant cast to \"List[str]\"  [redundant-cast]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/models/helpers.py": {
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2,
-    "Class cannot subclass \"furl\" (has type \"Any\")  [misc]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Missing type parameters for generic type \"Type\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UrlType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/models/label.py": {
-    "\"Label\" has no attribute \"main_label\"; maybe \"is_main_label\" or \"main_label_id\"?  [attr-defined]": 12,
-    "\"Proposal\" has no attribute \"labels\"  [attr-defined]": 16,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Case\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/models/membership_mixin.py": {
-    "Argument 1 to \"merge_and_replace\" of \"ImmutableMembershipMixin\" has incompatible type \"Profile\"; expected \"User\"  [arg-type]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Incompatible return value type (got \"Optional[str]\", expected \"str\")  [return-value]": 1,
-    "Incompatible types in assignment (expression has type \"Tuple[int, str, Any]\", variable has type \"Union[SQLCoreOperations[int], int]\")  [assignment]": 3,
-    "Invalid index type \"int\" for \"Type[MEMBERSHIP_RECORD_TYPE]\"; expected type \"Union[str, Tuple[Any, ...]]\"  [index]": 1,
-    "Missing type parameters for generic type \"AmendMembership\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"ColumnElement\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"tuple\"  [type-arg]": 3,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Non-overlapping equality check (left operand type: \"int\", right operand type: \"Tuple[int, str, Any]\")  [comparison-overlap]": 8,
-    "Returning Any from function declared to return \"MembershipType\"  [no-any-return]": 1,
-    "Signature of \"seq\" incompatible with supertype \"ReorderMixin\"  [override]": 1,
-    "Signature of \"subject\" incompatible with supertype \"ImmutableMembershipMixin\"  [override]": 2,
-    "Statement is unreachable  [unreachable]": 2
-  },
-  "funnel/models/moderation.py": {
-    "Call to untyped function \"get_all\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1
-  },
-  "funnel/models/notification.py": {
-    "\"UUID\" has no attribute \"in_\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"active_site_membership\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"main_notification_preferences\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"notification_preferences\"  [attr-defined]": 4,
-    "\"User\" has no attribute \"organization_admin_memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"projects_as_crew_memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"proposal_memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"rsvps\"  [attr-defined]": 1,
-    "Argument 1 to \"column_keyed_dict\" has incompatible type \"InstrumentedAttribute[str]\"; expected \"Union[Type[Any], Callable[[Any], <nothing>]]\"  [arg-type]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Missing type parameters for generic type \"Notification\"  [type-arg]": 9,
-    "Missing type parameters for generic type \"NotificationType\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Query\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"Type\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"NoIdMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"sqlalchemy.orm.exc\" does not explicitly export attribute \"NoResultFound\"  [attr-defined]": 1,
-    "Redundant cast to \"Union[_F, _D]\"  [redundant-cast]": 1,
-    "Returning Any from function declared to return \"NotificationPreferences\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 5
-  },
-  "funnel/models/notification_types.py": {
-    "Missing type parameters for generic type \"Notification\"  [type-arg]": 15,
-    "Returning Any from function declared to return \"Profile\"  [no-any-return]": 2
-  },
-  "funnel/models/organization_membership.py": {
-    "Cannot determine type of \"__table_args__\" in base class \"ImmutableUserMembershipMixin\"  [misc]": 1,
-    "Cannot determine type of \"is_active\"  [has-type]": 4,
-    "Cannot determine type of \"is_invite\"  [has-type]": 3,
-    "Incompatible types in assignment (expression has type \"Mapped[Organization]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/phone_number.py": {
-    "Argument 1 to \"is_available_for\" of \"PhoneNumber\" has incompatible type \"Optional[PhoneNumberMixin]\"; expected \"PhoneNumberMixin\"  [arg-type]": 2,
-    "Item \"None\" of \"Optional[Any]\" has no attribute \"has_identity\"  [union-attr]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"sqlalchemy.orm.attributes\" does not explicitly export attribute \"NO_VALUE\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/models/profile.py": {
-    "\"Organization\" has no attribute \"teams\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"projects\"  [attr-defined]": 1,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Incompatible return value type (got \"Union[User, Organization, None]\", expected \"Union[User, Organization]\")  [return-value]": 1,
-    "Missing type parameters for generic type \"Case\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UrlType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Need type annotation for \"is_active\"  [var-annotated]": 1,
-    "Returning Any from function declared to return \"List[Team]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/models/project.py": {
-    "\"Profile\" has no attribute \"project_redirects\"  [attr-defined]": 2,
-    "\"Profile\" has no attribute \"projects\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"proposals\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"schedule_end_at\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"schedule_start_at\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"projects_as_crew_active_memberships\"  [attr-defined]": 2,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 9,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Case\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"types.jsonb_dict\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TimestampMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TimezoneType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UrlType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"ColumnElement[bool]\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 4
-  },
-  "funnel/models/project_membership.py": {
-    "Cannot determine type of \"is_active\"  [has-type]": 6,
-    "Cannot determine type of \"is_invite\"  [has-type]": 1,
-    "Cannot determine type of \"user_id\"  [has-type]": 4,
-    "Incompatible types in assignment (expression has type \"Mapped[Project]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Missing type parameters for generic type \"tuple\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/proposal.py": {
-    "\"__Project\" has no attribute \"id\"  [attr-defined]": 3,
-    "\"__Project\" has no attribute \"proposals\"; maybe \"proposals_all\"?  [attr-defined]": 1,
-    "\"__Project\" has no attribute \"subprojects\"  [attr-defined]": 6,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Cannot determine type of \"project_child_role_map\"  [has-type]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 15,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Incompatible types in assignment (expression has type \"Mapped[int]\", base class \"ReorderMixin\" defined the type as \"Mapped[Union[int, UUID]]\")  [assignment]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedIdNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/proposal_membership.py": {
-    "Cannot determine type of \"is_active\"  [has-type]": 2,
-    "Cannot determine type of \"is_invite\"  [has-type]": 1,
-    "Cannot determine type of \"seq\"  [has-type]": 1,
-    "Cannot determine type of \"user_id\"  [has-type]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Incompatible types in assignment (expression has type \"Mapped[Proposal]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"Mapped[int]\", base class \"ReorderMixin\" defined the type as \"Mapped[Union[int, UUID]]\")  [assignment]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"User\"  [no-any-return]": 1
-  },
-  "funnel/models/reorder_mixin.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"QueryProperty\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/rsvp.py": {
-    "\"Project\" has no attribute \"rsvps\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"rsvps\"  [attr-defined]": 2,
-    "\"__Project\" has no attribute \"rsvps\"  [attr-defined]": 1,
-    "Cannot determine type of \"project_child_role_map\"  [has-type]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 6,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Module \"funnel.models\" does not explicitly export attribute \"NoIdMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[UserEmail]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"int\"  [no-any-return]": 1
-  },
-  "funnel/models/saved.py": {
-    "\"User\" has no attribute \"saved_projects\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"saved_sessions\"  [attr-defined]": 2,
-    "\"__Project\" has no attribute \"saved_by\"; maybe \"is_saved_by\"?  [attr-defined]": 1,
-    "\"__User\" has no attribute \"saved_sessions\"; maybe \"saved_sessions_in\"?  [attr-defined]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"NoIdMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/session.py": {
-    "\"Project\" has no attribute \"rooms\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"schedule_start_at\"  [attr-defined]": 3,
-    "\"Project\" has no attribute \"sessions\"  [attr-defined]": 1,
-    "\"Proposal\" has no attribute \"first_user\"  [attr-defined]": 1,
-    "\"__Project\" has no attribute \"query\"  [attr-defined]": 1,
-    "\"__Project\" has no attribute \"sessions\"  [attr-defined]": 2,
-    "\"__Project\" has no attribute \"timezone\"  [attr-defined]": 2,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Cannot determine type of \"project_child_role_map\"  [has-type]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 6,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Invalid self argument \"__Project\" to attribute function \"calendar_weeks\" with type \"Callable[[Project, Any], Any]\"  [misc]": 2,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedIdNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Need type annotation for \"next_session_at\"  [var-annotated]": 1,
-    "Need type annotation for \"schedule_end_at\"  [var-annotated]": 1,
-    "Need type annotation for \"schedule_start_at\"  [var-annotated]": 1,
-    "Returning Any from function declared to return \"Optional[Session]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Optional[User]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Optional[datetime]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1
-  },
-  "funnel/models/shortlink.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"ColumnElement\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Comparator\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"NoIdMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UrlType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Non-overlapping equality check (left operand type: \"ColumnsClauseRole\", right operand type: \"int\")  [comparison-overlap]": 1,
-    "Returning Any from function declared to return \"ColumnElement[Any]\"  [no-any-return]": 1
-  },
-  "funnel/models/site_membership.py": {
-    "Cannot determine type of \"is_active\"  [has-type]": 1,
-    "Incompatible types in assignment (expression has type \"None\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"None\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[int]\")  [assignment]": 1,
-    "Missing type parameters for generic type \"tuple\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declared_attr\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/sponsor_membership.py": {
-    "Cannot determine type of \"is_active\"  [has-type]": 4,
-    "Cannot determine type of \"is_invite\"  [has-type]": 4,
-    "Cannot determine type of \"profile_id\"  [has-type]": 6,
-    "Cannot determine type of \"seq\"  [has-type]": 2,
-    "Incompatible types in assignment (expression has type \"Mapped[Project]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"Mapped[Proposal]\", base class \"ImmutableMembershipMixin\" defined the type as \"Mapped[Optional[Model]]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"Mapped[int]\", base class \"ReorderMixin\" defined the type as \"Mapped[Union[int, UUID]]\")  [assignment]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 2
-  },
-  "funnel/models/sync_ticket.py": {
-    "\"GetTitleMixin\" has no attribute \"ticket_events\"  [attr-defined]": 2,
-    "\"TicketParticipant\" has no attribute \"ticket_events\"  [attr-defined]": 4,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 16,
-    "Call to untyped function \"make_key\" in typed context  [no-untyped-call]": 2,
-    "Cannot determine type of \"project_child_role_map\"  [has-type]": 4,
-    "Function is missing a return type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"url_for\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"List\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"with_roles\"  [attr-defined]": 1
-  },
-  "funnel/models/update.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Query\"  [type-arg]": 3,
-    "Missing type parameters for generic type \"Sequence\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedIdNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TimestampMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"ColumnElement[bool]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/models/user.py": {
-    "\"FromClause\" has no attribute \"name\"  [attr-defined]": 3,
-    "\"PhoneNumber\" has no attribute \"allow_sm\"  [attr-defined]": 1,
-    "\"PhoneNumber\" has no attribute \"allow_wa\"  [attr-defined]": 1,
-    "\"Type[User]\" has no attribute \"teams\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"active_organization_owner_memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"active_site_membership\"  [attr-defined]": 3,
-    "\"User\" has no attribute \"active_user_sessions\"; maybe \"active_user_count\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"emailclaims\"  [attr-defined]": 6,
-    "\"User\" has no attribute \"emails\"; maybe \"email\"?  [attr-defined]": 6,
-    "\"User\" has no attribute \"externalids\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"phones\"; maybe \"phone\"?  [attr-defined]": 6,
-    "\"User\" has no attribute \"revoke_all_auth_client_permissions\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"revoke_all_auth_tokens\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"teams\"  [attr-defined]": 5,
-    "Argument 1 to \"add_for\" of \"EmailAddress\" has incompatible type \"User\"; expected \"Optional[EmailAddressMixin]\"  [arg-type]": 2,
-    "Argument 1 to \"filter\" of \"Query\" has incompatible type \"Optional[ColumnElement[Any]]\"; expected \"Union[ColumnElement[bool], _HasClauseElement, SQLCoreOperations[bool], ExpressionElementRole[bool], Callable[[], ColumnElement[bool]], LambdaElement]\"  [arg-type]": 3,
-    "Argument 1 to \"joinedload\" has incompatible type \"Optional[Profile]\"; expected \"Union[str, QueryableAttribute[Any]]\"  [arg-type]": 4,
-    "Argument 2 to \"filter\" of \"Query\" has incompatible type \"Optional[ColumnElement[Any]]\"; expected \"Union[ColumnElement[bool], _HasClauseElement, SQLCoreOperations[bool], ExpressionElementRole[bool], Callable[[], ColumnElement[bool]], LambdaElement]\"  [arg-type]": 3,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"UserPhone\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 9,
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Incompatible return value type (got \"Optional[PhoneNumber]\", expected \"PhoneNumber\")  [return-value]": 1,
-    "Incompatible return value type (got \"Union[Any, InstrumentedAttribute[Any]]\", expected \"str\")  [return-value]": 1,
-    "Incompatible return value type (got \"Union[ManagedStateInstance[User], bool]\", expected \"bool\")  [return-value]": 3,
-    "Incompatible types in assignment (expression has type \"Mapped[EmailAddress]\", base class \"EmailAddressMixin\" defined the type as \"Callable[[Type[EmailAddressMixin]], Mapped[EmailAddress]]\")  [assignment]": 2,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"name\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[str]\" has no attribute \"lower\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"Label\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"List\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"LocaleType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TSVectorType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"TimezoneType\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"hybrid_property\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "No overload variant of \"failsafe_add\" matches argument types \"scoped_session[Session]\", \"UserEmail\", \"User\", \"EmailAddress\"  [call-overload]": 1,
-    "No overload variant of \"failsafe_add\" matches argument types \"scoped_session[Session]\", \"UserPhone\", \"User\", \"PhoneNumber\"  [call-overload]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"Union[UserEmail, UserEmailClaim, None]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Union[UserEmail, UserPhone, None]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2,
-    "Signature of \"name\" incompatible with supertype \"SharedProfileMixin\"  [override]": 2
-  },
-  "funnel/models/user_session.py": {
-    "\"UserSession\" has no attribute \"authtokens\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"DynamicMapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/user_signals.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 18
-  },
-  "funnel/models/utils.py": {
-    "\"FromClause\" has no attribute \"name\"  [attr-defined]": 2,
-    "\"Model\" has no attribute \"id\"  [attr-defined]": 2,
-    "Call to untyped function \"do_migrate_table\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Module \"funnel.models.user\" does not explicitly export attribute \"db\"  [attr-defined]": 1
-  },
-  "funnel/models/venue.py": {
-    "\"Type[Project]\" has no attribute \"primary_venue\"  [attr-defined]": 1,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 7,
-    "Cannot determine type of \"project_child_role_map\"  [has-type]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"BaseScopedNameMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"CoordinatesMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"Mapped\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"UuidMixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/models/video_mixin.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Incompatible return value type (got \"Tuple[str, Optional[str]]\", expected \"Tuple[str, str]\")  [return-value]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"declarative_mixin\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 1
-  },
-  "funnel/proxies/__init__.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "funnel/proxies/request.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"response_vary\"  [attr-defined]": 1,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 1
-  },
-  "funnel/registry.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"OrderedDict\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 1
-  },
-  "funnel/serializers.py": {
-    "Missing type parameters for generic type \"KeyRotationWrapper\"  [type-arg]": 3
-  },
-  "funnel/signals.py": {
-    "Module \"flask.signals\" does not explicitly export attribute \"Namespace\"  [attr-defined]": 1
-  },
-  "funnel/transports/base.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1
-  },
-  "funnel/transports/email/send.py": {
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1
-  },
-  "funnel/transports/sms/send.py": {
-    "Argument 1 has incompatible type \"PhoneNumber\"; expected \"str\"  [arg-type]": 1,
-    "Missing type parameters for generic type \"Callable\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"set\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 3
-  },
-  "funnel/transports/sms/template.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Pattern\"  [type-arg]": 1
-  },
-  "funnel/typing.py": {
-    "Missing type parameters for generic type \"Callable\"  [type-arg]": 1
-  },
-  "funnel/utils/markdown/base.py": {
-    "Missing type parameters for generic type \"Callable\"  [type-arg]": 1,
-    "Module \"mdit_py_plugins.anchors\" does not explicitly export attribute \"anchors_plugin\"  [attr-defined]": 1,
-    "Module \"mdit_py_plugins.container\" does not explicitly export attribute \"container_plugin\"  [attr-defined]": 1,
-    "Module \"mdit_py_plugins.deflist\" does not explicitly export attribute \"deflist_plugin\"  [attr-defined]": 1,
-    "Module \"mdit_py_plugins.footnote\" does not explicitly export attribute \"footnote_plugin\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/block_code_ext.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/del_tag.py": {
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/embeds.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 1,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/footnote_ext.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 1,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/ins_tag.py": {
-    "Call to untyped function \"push\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"scanDelims\" in typed context  [no-untyped-call]": 1,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1,
-    "Non-overlapping equality check (left operand type: \"Token\", right operand type: \"Literal['+']\")  [comparison-overlap]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/mark_tag.py": {
-    "Call to untyped function \"push\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"scanDelims\" in typed context  [no-untyped-call]": 1,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1,
-    "Non-overlapping equality check (left operand type: \"Token\", right operand type: \"Literal['=']\")  [comparison-overlap]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/sub_tag.py": {
-    "Call to untyped function \"push\" in typed context  [no-untyped-call]": 3,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/sup_tag.py": {
-    "Call to untyped function \"push\" in typed context  [no-untyped-call]": 3,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 2,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/mdit_plugins/toc.py": {
-    "Call to untyped function \"push\" in typed context  [no-untyped-call]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Dict\"  [type-arg]": 3,
-    "Missing type parameters for generic type \"MutableMapping\"  [type-arg]": 3,
-    "Module \"markdown_it.renderer\" does not explicitly export attribute \"OptionsDict\"  [attr-defined]": 1
-  },
-  "funnel/utils/markdown/tabs.py": {
-    "Call to untyped function \"_class_attr\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 6,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4
-  },
-  "funnel/utils/misc.py": {
-    "Missing type parameters for generic type \"List\"  [type-arg]": 1
-  },
-  "funnel/views/account.py": {
-    "\"Flask\" has no attribute \"geoip_asn\"  [attr-defined]": 2,
-    "\"Flask\" has no attribute \"geoip_city\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"active_organization_admin_memberships\"  [attr-defined]": 2,
-    "\"User\" has no attribute \"active_organization_owner_memberships\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"emails\"; maybe \"email\"?  [attr-defined]": 2,
-    "\"User\" has no attribute \"phones\"; maybe \"phone\"?  [attr-defined]": 1,
-    "Argument \"email\" to \"get\" of \"UserEmail\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 1 to \"add_email\" of \"User\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 1 to \"all\" of \"UserEmailClaim\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 1 to \"get\" of \"dict\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 1 to \"send_email_verify_link\" has incompatible type \"UserEmailClaim\"; expected \"UserEmail\"  [arg-type]": 2,
-    "Call to untyped function \"UserPhone\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"login_internal\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"logout_internal\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"RoleAccessProxy\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"List[RoleAccessProxy[Any]]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Optional[str]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"User\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 3
-  },
-  "funnel/views/account_delete.py": {
-    "\"User\" has no attribute \"clients\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"organizations_as_owner\"; maybe \"organizations_as_owner_ids\"?  [attr-defined]": 1,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 1
-  },
-  "funnel/views/account_reset.py": {
-    "\"User\" has no attribute \"active_user_sessions\"; maybe \"active_user_count\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"externalids\"  [attr-defined]": 2,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"logout_internal\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"mark_transport_active\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Returning Any from function declared to return \"Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]\"  [no-any-return]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 3,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[str, str], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/api/account.py": {
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 2
-  },
-  "funnel/views/api/email_events.py": {
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/api/markdown.py": {
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/api/oauth.py": {
-    "Argument 1 to \"oauth_auth_error\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Iterable\"  [type-arg]": 3,
-    "No overload variant of \"failsafe_add\" matches argument types \"scoped_session[Session]\", \"AuthToken\", \"User\", \"AuthClient\"  [call-overload]": 1,
-    "No overload variant of \"failsafe_add\" matches argument types \"scoped_session[Session]\", \"AuthToken\", \"UserSession\", \"AuthClient\"  [call-overload]": 1,
-    "Redundant cast to \"Optional[str]\"  [redundant-cast]": 8,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 2
-  },
-  "funnel/views/api/pwa.py": {
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 3
-  },
-  "funnel/views/api/resource.py": {
-    "\"Organization\" has no attribute \"fullname\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"emails\"; maybe \"email\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"externalids\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"oldids\"  [attr-defined]": 10,
-    "\"User\" has no attribute \"organizations_as_admin\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"organizations_as_owner\"; maybe \"organizations_as_owner_ids\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"phones\"; maybe \"phone\"?  [attr-defined]": 1,
-    "\"User\" has no attribute \"teams\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 9,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 7,
-    "Module \"funnel.typing\" does not explicitly export attribute \"Response\"  [attr-defined]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 2
-  },
-  "funnel/views/api/sms_events.py": {
-    "Incompatible types in assignment (expression has type \"Tuple[int, Any]\", variable has type \"Union[SQLCoreOperations[int], int]\")  [assignment]": 10,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[str], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/api/support.py": {
-    "\"PhoneNumber\" has no attribute \"used_in_user_phone\"  [attr-defined]": 2
-  },
-  "funnel/views/auth_client.py": {
-    "\"AuthClient\" has no attribute \"credentials\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"teams\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Incompatible types in assignment (expression has type \"AuthClientTeamPermissions\", variable has type \"Optional[AuthClientUserPermissions]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"List[AuthClientTeamPermissions]\", variable has type \"List[AuthClientUserPermissions]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"Optional[AuthClientTeamPermissions]\", variable has type \"Optional[AuthClientUserPermissions]\")  [assignment]": 1,
-    "Item \"AuthClientUserPermissions\" of \"Optional[AuthClientUserPermissions]\" has no attribute \"team\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[AuthClientUserPermissions]\" has no attribute \"access_permissions\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[AuthClientUserPermissions]\" has no attribute \"team\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[User]\" has no attribute \"buid\"  [union-attr]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 2
-  },
-  "funnel/views/auth_notify.py": {
-    "Call to untyped function \"notify_org_data_changed\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 4,
-    "Need type annotation for \"client_users\" (hint: \"client_users: Dict[<type>, <type>] = ...\")  [var-annotated]": 1
-  },
-  "funnel/views/comment.py": {
-    "\"Comment\" has no attribute \"in_reply_to\"; maybe \"in_reply_to_id\"?  [attr-defined]": 1,
-    "\"Commentset\" has no attribute \"add_subscriber\"  [attr-defined]": 4,
-    "\"Commentset\" has no attribute \"remove_subscriber\"  [attr-defined]": 3,
-    "\"Commentset\" has no attribute \"update_last_seen_at\"  [attr-defined]": 2,
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"submit\" of \"CommentModeratorReport\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[Comment]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Union[Comment, Commentset]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/views/contact.py": {
-    "Argument \"archived\" to \"grouped_counts_for\" of \"ContactExchange\" has incompatible type \"Optional[bool]\"; expected \"bool\"  [arg-type]": 1,
-    "Argument 3 to \"contacts_for_project\" of \"ContactExchange\" has incompatible type \"Optional[bool]\"; expected \"bool\"  [arg-type]": 1,
-    "Argument 4 to \"contacts_for_project_and_date\" of \"ContactExchange\" has incompatible type \"Optional[bool]\"; expected \"bool\"  [arg-type]": 1,
-    "Call to untyped function \"contacts_to_csv\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"get_project\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]\"  [no-any-return]": 2
-  },
-  "funnel/views/decorators.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Missing type parameters for generic type \"Dict\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"Set\"  [type-arg]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Response\"  [no-any-return]": 1
-  },
-  "funnel/views/email.py": {
-    "\"UserEmail\" has no attribute \"verification_code\"  [attr-defined]": 1,
-    "List item 0 has incompatible type \"Tuple[str, Optional[str]]\"; expected \"Union[User, Tuple[Optional[str], str], str]\"  [list-item]": 1
-  },
-  "funnel/views/errors.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 1,
-    "\"Response\" has no attribute \"data\"  [attr-defined]": 2,
-    "Incompatible return value type (got \"werkzeug.sansio.response.Response\", expected \"Union[Union[str, werkzeug.wrappers.response.Response, Dict[str, Any]], Tuple[Union[str, werkzeug.wrappers.response.Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, werkzeug.wrappers.response.Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, werkzeug.wrappers.response.Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]\")  [return-value]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Value of type variable \"T_error_handler\" of function cannot be \"Callable[[HTTPException], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1,
-    "Value of type variable \"T_error_handler\" of function cannot be \"Callable[[NotFound], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/helpers.py": {
-    "\"Flask\" has no attribute \"_get_current_object\"  [attr-defined]": 1,
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 1,
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 1,
-    "Call to untyped function \"localize_date\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"localize_timestamp\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 3,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"bytes\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/views/index.py": {
-    "\"Type[Project]\" has no attribute \"next_session_at\"  [attr-defined]": 3,
-    "Argument 1 has incompatible type \"Callable[[int, int], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"; expected \"Callable[..., Union[Union[Response, Mapping[str, Any]], Tuple[Union[Response, Mapping[str, Any]]], Tuple[Union[Response, Mapping[str, Any]], Union[List[Tuple[str, str]], Dict[str, str], Headers]], Tuple[Union[Response, Mapping[str, Any]], int], Tuple[Union[Response, Mapping[str, Any]], int, Union[List[Tuple[str, str]], Dict[str, str], Headers]]]]\"  [arg-type]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 5,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[str], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 1
-  },
-  "funnel/views/jobs.py": {
-    "Argument 1 to \"parse_locations\" of \"GeoName\" has incompatible type \"Union[Any, InstrumentedAttribute[Any]]\"; expected \"str\"  [arg-type]": 1,
-    "Call to untyped function \"app_context\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"get_tickets\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"import_from_list\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Item \"None\" of \"Optional[Project]\" has no attribute \"location\"  [union-attr]": 2,
-    "Item \"None\" of \"Optional[Project]\" has no attribute \"locations\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Project]\" has no attribute \"parsed_location\"  [union-attr]": 1,
-    "Item \"Project\" of \"Optional[Project]\" has no attribute \"locations\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 1,
-    "Need type annotation for \"geonames\"  [var-annotated]": 1
-  },
-  "funnel/views/label.py": {
-    "\"Label\" has no attribute \"main_label\"; maybe \"is_main_label\" or \"main_label_id\"?  [attr-defined]": 2,
-    "\"Project\" has no attribute \"all_labels\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"labels\"  [attr-defined]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/views/login.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 4,
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 2,
-    "Argument 1 to \"send_email_verify_link\" has incompatible type \"UserEmailClaim\"; expected \"UserEmail\"  [arg-type]": 1,
-    "Call to untyped function \"get_user_extid\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"login_internal\" in typed context  [no-untyped-call]": 6,
-    "Call to untyped function \"logout_client\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"logout_internal\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"mark_transport_active\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"register_internal\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"set_loginmethod_cookie\" in typed context  [no-untyped-call]": 6,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Missing type parameters for generic type \"OtpSession\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]\"  [no-any-return]": 8,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 4,
-    "Value of type variable \"T_route\" of function cannot be \"Callable[[str], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"  [type-var]": 2
-  },
-  "funnel/views/login_session.py": {
-    "\"Flask\" has no attribute \"geoip_asn\"  [attr-defined]": 2,
-    "\"Flask\" has no attribute \"geoip_city\"  [attr-defined]": 2,
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 1,
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 1,
-    "\"UserSession\" has no attribute \"auth_clients\"  [attr-defined]": 2,
-    "Argument 1 to \"issubset\" of \"frozenset\" has incompatible type \"Union[Set[str], None, Any]\"; expected \"Iterable[object]\"  [arg-type]": 1,
-    "Argument 1 to \"secret_is\" of \"AuthClientCredential\" has incompatible type \"Optional[str]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 2 to \"set\" of \"Statsd\" has incompatible type \"Union[int, UUID]\"; expected \"str\"  [arg-type]": 2,
-    "Call to untyped function \"_client_login_inner\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"app_context\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"logout_internal\" in typed context  [no-untyped-call]": 4,
-    "Call to untyped function \"mark_transport_active\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 7,
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 9,
-    "Missing type parameters for generic type \"ReturnDecorator\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"Type\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Optional[Profile]\"  [no-any-return]": 1
-  },
-  "funnel/views/membership.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 2,
-    "\"Organization\" has no attribute \"active_admin_memberships\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"active_crew_memberships\"  [attr-defined]": 4,
-    "Argument 1 to \"render_with\" has incompatible type \"Dict[str, Union[str, Callable[[Dict[Any, Any]], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]]]\"; expected \"Union[Dict[str, Union[str, Callable[..., Union[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int, Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Callable[[Dict[str, Any], StartResponse], Iterable[bytes]]]]]], str, None]\"  [arg-type]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 6,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Item \"None\" of \"Optional[Organization]\" has no attribute \"active_admin_memberships\"  [union-attr]": 2,
-    "Item \"Organization\" of \"Optional[Organization]\" has no attribute \"active_admin_memberships\"  [union-attr]": 2,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1
-  },
-  "funnel/views/mixins.py": {
-    "\"Project\" has no attribute \"is_saved_by\"  [attr-defined]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Incompatible return value type (got \"Tuple[Optional[UUID], MultiDict[Any, Any]]\", expected \"Union[Tuple[None, None], Tuple[int, Dict[Any, Any]]]\")  [return-value]": 1,
-    "Missing type parameters for generic type \"MultiDict\"  [type-arg]": 1,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1,
-    "Returning Any from function declared to return \"Profile\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]], None]\"  [no-any-return]": 1,
-    "Statement is unreachable  [unreachable]": 1,
-    "Subclass of \"Project\" and \"ProjectRedirect\" cannot exist: would have incompatible method signatures  [unreachable]": 1
-  },
-  "funnel/views/notification.py": {
-    "\"None\" has no attribute \"created_at\"  [attr-defined]": 1,
-    "\"User\" has no attribute \"main_notification_preferences\"  [attr-defined]": 1,
-    "Call to untyped function \"unsubscribe_short_url\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"unsubscribe_token\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"unsubscribe_url\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 6,
-    "Function is missing a type annotation  [no-untyped-def]": 9,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Item \"None\" of \"Optional[Notification[_D, _F]]\" has no attribute \"dispatch\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Notification[_D, _F]]\" has no attribute \"type\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Query[Any]]\" has no attribute \"order_by\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"has_transport\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"identity\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"is_revoked\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"notification\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"rollup_previous\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"user\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[UserNotification]\" has no attribute \"views\"  [union-attr]": 1,
-    "Item \"None\" of \"Union[Type[AuthClient], Type[Comment], Type[CommentModeratorReport], Type[Commentset], Type[ImmutableMembershipMixin], Type[Organization], Type[Profile], Type[Project], Type[Proposal], Type[Rsvp], Type[Session], Type[Team], Type[TicketParticipant], Type[Update], Type[User], Type[UserOldId], Type[UserSession], Type[Venue], Type[VenueRoom], None]\" has no attribute \"updated_at\"  [union-attr]": 1,
-    "Item \"None\" of \"Union[UserEmail, UserPhone, None]\" has no attribute \"transport_hash\"  [union-attr]": 2,
-    "Item \"datetime\" of \"Union[datetime, Any]\" has no attribute \"desc\"  [union-attr]": 1,
-    "Returning Any from function declared to return \"RenderNotification\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1,
-    "Untyped decorator makes function \"dispatch_transport_email\" untyped  [misc]": 1
-  },
-  "funnel/views/notification_feed.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "funnel/views/notification_preferences.py": {
-    "\"User\" has no attribute \"notification_preferences\"  [attr-defined]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 2
-  },
-  "funnel/views/notifications/account_notification.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 4
-  },
-  "funnel/views/notifications/comment_notification.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 13
-  },
-  "funnel/views/notifications/organization_membership_notification.py": {
-    "Definition of \"notification\" in base class \"RenderShared\" is incompatible with definition in base class \"RenderNotification\"  [misc]": 2,
-    "Missing type parameters for generic type \"NotificationType\"  [type-arg]": 1
-  },
-  "funnel/views/notifications/project_crew_notification.py": {
-    "Definition of \"notification\" in base class \"RenderShared\" is incompatible with definition in base class \"RenderNotification\"  [misc]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Incompatible return value type (got \"Optional[User]\", expected \"User\")  [return-value]": 1,
-    "Missing type parameters for generic type \"NotificationType\"  [type-arg]": 1
-  },
-  "funnel/views/notifications/project_starting_notification.py": {
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2
-  },
-  "funnel/views/notifications/proposal_notification.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 6,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/views/notifications/rsvp_notification.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 6
-  },
-  "funnel/views/notifications/update_notification.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 4
-  },
-  "funnel/views/organization.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"is_protected\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"is_safe_to_delete\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"make_public\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"url_for\"  [union-attr]": 2
-  },
-  "funnel/views/otp.py": {
-    "Call to untyped function \"SmsMessage\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Missing type parameters for generic type \"OtpSession\"  [type-arg]": 3
-  },
-  "funnel/views/profile.py": {
-    "\"Profile\" has no attribute \"draft_projects\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"draft_projects_for\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"listed_projects\"  [attr-defined]": 2,
-    "\"Profile\" has no attribute \"projects\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"sponsored_projects\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"sponsored_proposals\"  [attr-defined]": 1,
-    "\"Profile\" has no attribute \"unscheduled_projects_for\"  [attr-defined]": 1,
-    "Argument 1 has incompatible type \"Callable[[ProfileView, int, int], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]\"; expected \"Callable[..., Union[Union[Response, Mapping[str, Any]], Tuple[Union[Response, Mapping[str, Any]]], Tuple[Union[Response, Mapping[str, Any]], Union[List[Tuple[str, str]], Dict[str, str], Headers]], Tuple[Union[Response, Mapping[str, Any]], int], Tuple[Union[Response, Mapping[str, Any]], int, Union[List[Tuple[str, str]], Dict[str, str], Headers]]]]\"  [arg-type]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 5,
-    "Incompatible return value type (got \"Dict[str, Collection[Any]]\", expected \"Union[Dict[str, object], Tuple[Dict[str, object], int], Tuple[Dict[str, object], int, Dict[str, str]], Response]\")  [return-value]": 1,
-    "Item \"None\" of \"Optional[User]\" has no attribute \"projects_as_crew\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[User]\" has no attribute \"public_proposals\"  [union-attr]": 3,
-    "Item \"User\" of \"Optional[User]\" has no attribute \"projects_as_crew\"  [union-attr]": 1,
-    "Item \"User\" of \"Optional[User]\" has no attribute \"public_proposals\"  [union-attr]": 3,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/views/project.py": {
-    "\"Project\" has no attribute \"proposals\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"rsvp_count_going\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"rsvp_for\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"rsvps_with\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"ticket_clients\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"ticket_events\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"ticket_types\"  [attr-defined]": 1,
-    "Argument \"draft_revision\" to \"render_form\" has incompatible type \"Optional[str]\"; expected \"Optional[int]\"  [arg-type]": 1,
-    "Argument \"referrer\" to \"get_next_url\" has incompatible type \"str\"; expected \"bool\"  [arg-type]": 2,
-    "Argument 1 to \"render_with\" has incompatible type \"Dict[str, Union[str, Callable[[Dict[Any, Any]], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]]]\"; expected \"Union[Dict[str, Union[str, Callable[..., Union[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int, Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Callable[[Dict[str, Any], StartResponse], Iterable[bytes]]]]]], str, None]\"  [arg-type]": 4,
-    "Call to untyped function \"delete_draft\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"get_rsvp_state_csv\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Incompatible return value type (got \"Union[ManagedStateInstance[Project], bool]\", expected \"bool\")  [return-value]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"bool\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 3
-  },
-  "funnel/views/project_sponsor.py": {
-    "Call to untyped function \"edit_sponsor_form\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/views/proposal.py": {
-    "\"Proposal\" has no attribute \"memberships\"  [attr-defined]": 2,
-    "Argument \"proposal\" to \"session_edit\" has incompatible type \"Union[Proposal, ProposalSuuidRedirect]\"; expected \"Optional[Proposal]\"  [arg-type]": 1,
-    "Argument 1 to \"render_with\" has incompatible type \"Dict[str, Union[str, Callable[[Dict[Any, Any]], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]]]\"; expected \"Union[Dict[str, Union[str, Callable[..., Union[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int, Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Callable[[Dict[str, Any], StartResponse], Iterable[bytes]]]]]], str, None]\"  [arg-type]": 1,
-    "Call to untyped function \"collaborators\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Item \"Proposal\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"memberships\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"commentset\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"edited_at\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"featured\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"memberships\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"name\"  [union-attr]": 1,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"project\"  [union-attr]": 10,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"title\"  [union-attr]": 3,
-    "Item \"ProposalSuuidRedirect\" of \"Union[Proposal, ProposalSuuidRedirect]\" has no attribute \"update_description\"  [union-attr]": 1,
-    "Module \"baseframe.forms\" has no attribute \"render_template\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1
-  },
-  "funnel/views/schedule.py": {
-    "\"Project\" has no attribute \"proposals_all\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"rooms\"  [attr-defined]": 2,
-    "\"Project\" has no attribute \"scheduled_sessions\"  [attr-defined]": 5,
-    "\"Project\" has no attribute \"venues\"  [attr-defined]": 3,
-    "\"Proposal\" has no attribute \"labels\"  [attr-defined]": 2,
-    "\"VenueRoom\" has no attribute \"scheduled_sessions\"  [attr-defined]": 1,
-    "Argument 1 to \"render_with\" has incompatible type \"Dict[str, Union[str, Callable[[Dict[Any, Any]], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]]]\"; expected \"Union[Dict[str, Union[str, Callable[..., Union[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int, Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Callable[[Dict[str, Any], StartResponse], Iterable[bytes]]]]]], str, None]\"  [arg-type]": 1,
-    "Call to untyped function \"localize_date\" in typed context  [no-untyped-call]": 4,
-    "Call to untyped function \"update_schedule_timestamps\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 2,
-    "Missing type parameters for generic type \"list\"  [type-arg]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Module \"sqlalchemy.orm.exc\" does not explicitly export attribute \"NoResultFound\"  [attr-defined]": 1
-  },
-  "funnel/views/search.py": {
-    "\"datetime\" has no attribute \"desc\"  [attr-defined]": 1,
-    "Argument 1 to \"load_only\" has incompatible type \"Union[int, UUID]\"; expected \"Union[str, QueryableAttribute[Any]]\"  [arg-type]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Incompatible return value type (got \"Union[Callable[[Comment], str], str, Any]\", expected \"ColumnElement[str]\")  [return-value]": 1,
-    "Incompatible types in assignment (expression has type \"sqlalchemy.orm.query.Query[Any]\", variable has type \"coaster.sqlalchemy.model.Query[Any]\")  [assignment]": 1,
-    "Missing type parameters for generic type \"Function\"  [type-arg]": 33,
-    "Missing type parameters for generic type \"Query\"  [type-arg]": 4,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Returning Any from function declared to return \"ColumnElement[str]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"int\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "funnel/views/session.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 1,
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_in_json\"  [attr-defined]": 3,
-    "\"Project\" has no attribute \"rooms\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"scheduled_sessions\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"venues\"  [attr-defined]": 1,
-    "\"Proposal\" has no attribute \"first_user\"  [attr-defined]": 1,
-    "Call to untyped function \"rooms_list\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"update_schedule_timestamps\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1,
-    "No overload variant of \"failsafe_add\" matches argument types \"scoped_session[Session]\", \"Session\", \"Union[int, UUID]\", \"int\"  [call-overload]": 1
-  },
-  "funnel/views/shortlink.py": {
-    "Module \"funnel.typing\" does not explicitly export attribute \"Response\"  [attr-defined]": 1
-  },
-  "funnel/views/siteadmin.py": {
-    "\"Comment\" has no attribute \"is_reviewed_by\"  [attr-defined]": 1,
-    "Argument 1 to \"Cast\" has incompatible type \"str\"; expected \"Union[ColumnElement[Any], _HasClauseElement, SQLCoreOperations[Any], ExpressionElementRole[Any], Callable[[], ColumnElement[Any]], LambdaElement]\"  [arg-type]": 1,
-    "Call to untyped function \"get_all\" of \"CommentModeratorReport\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"get_one\" of \"CommentModeratorReport\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"submit\" of \"CommentModeratorReport\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Module \"funnel.models\" does not explicitly export attribute \"sa\"  [attr-defined]": 1,
-    "Non-overlapping equality check (left operand type: \"int\", right operand type: \"Tuple[int, str, Any]\")  [comparison-overlap]": 2
-  },
-  "funnel/views/sitemap.py": {
-    "Missing type parameters for generic type \"list\"  [type-arg]": 7,
-    "Returning Any from function declared to return \"Union[SupportsDunderLT[Any], SupportsDunderGT[Any]]\"  [no-any-return]": 1,
-    "Untyped decorator makes function \"query_profile\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"query_project\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"query_proposal\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"query_session\" untyped  [misc]": 1,
-    "Untyped decorator makes function \"query_update\" untyped  [misc]": 1
-  },
-  "funnel/views/ticket_event.py": {
-    "\"Project\" has no attribute \"ticket_clients\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"ticket_events\"  [attr-defined]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "funnel/views/ticket_participant.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"ticket_participants\"  [attr-defined]": 1,
-    "Argument 2 to \"ticket_participant_data\" has incompatible type \"Union[int, UUID]\"; expected \"int\"  [arg-type]": 1,
-    "Call to untyped function \"ticket_participant_badge_data\" in typed context  [no-untyped-call]": 4,
-    "Call to untyped function \"ticket_participant_checkin_data\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Item \"None\" of \"Optional[TicketEventParticipant]\" has no attribute \"checked_in\"  [union-attr]": 1,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1
-  },
-  "funnel/views/update.py": {
-    "\"Project\" has no attribute \"draft_updates\"  [attr-defined]": 1,
-    "\"Project\" has no attribute \"published_updates\"; maybe \"published_at\"?  [attr-defined]": 1,
-    "Argument 1 to \"render_with\" has incompatible type \"Dict[str, Union[str, Callable[[Dict[Any, Any]], Union[Union[str, Response, Dict[str, Any]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str]], Tuple[Union[str, Response, Dict[str, Any]], Union[Dict[str, str], List[Tuple[str, str]]]], Tuple[Union[str, Response, Dict[str, Any]], Union[int, str], Union[Dict[str, str], List[Tuple[str, str]]]]]]]]\"; expected \"Union[Dict[str, Union[str, Callable[..., Union[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int], Tuple[Union[Response, str, bytes, List[Any], Mapping[str, Any], Iterator[str], Iterator[bytes]], int, Union[Headers, Mapping[str, Union[str, List[str], Tuple[str, ...]]], Sequence[Tuple[str, Union[str, List[str], Tuple[str, ...]]]]]], Callable[[Dict[str, Any], StartResponse], Iterable[bytes]]]]]], str, None]\"  [arg-type]": 1,
-    "Call to untyped function \"dispatch_notification\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Module \"funnel.views.project\" does not explicitly export attribute \"ProjectViewMixin\"  [attr-defined]": 1
-  },
-  "funnel/views/venue.py": {
-    "\"Project\" has no attribute \"primary_venue\"  [attr-defined]": 4,
-    "\"Project\" has no attribute \"venues\"  [attr-defined]": 2
-  },
-  "funnel/views/video.py": {
-    "Returning Any from function declared to return \"Optional[VideoData]\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 1
-  },
-  "migrations/env.py": {
-    "Call to untyped function \"get_metadata\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"run_migrations_offline\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"run_migrations_online\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Incompatible types in assignment (expression has type \"Dict[<nothing>, <nothing>]\", target has type \"Dict[str, Optional[str]]\")  [assignment]": 1
-  },
-  "migrations/versions/047ebdac558b_complement_email_md5sum_with_blake2b.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/07ebe99161d5_add_banner_image_url_to_sessio.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/09562978e3de_move_aside_old_user_and_team_tables.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 6,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 6
-  },
-  "migrations/versions/0b25df40d307_add_labels.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/0fae06340346_add_version_numbers_for_timestamped_.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/111c9755ae39_switch_to_timestamptz.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/1195a2789872_proposal_video_blogp.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/140c9b68d65b_team_model.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/14d7082476c0_proposalspace_image_.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/18052b0cd282_scoped_id_for_propos.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3
-  },
-  "migrations/versions/1829e53eba75_add_search_vectors.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 3,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 3
-  },
-  "migrations/versions/1925329c798a_added_venue_room_det.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 10,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/1bb2df0df8e2_profiles_and_userbas.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/1bd91b02ced3_merge_comment_notification_types.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/1c9cbf3a1e5e_add_commenset_memberships.py": {
-    "Argument 1 to \"where\" of \"Select\" has incompatible type \"bool\"; expected \"Union[ColumnElement[bool], _HasClauseElement, SQLCoreOperations[bool], ExpressionElementRole[bool], Callable[[], ColumnElement[bool]], LambdaElement]\"  [arg-type]": 2,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 4,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 3
-  },
-  "migrations/versions/1d5e1a11661a_add_json_field_rsvp.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/1fcee2e6280_added_session.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/20c10335b553_add_project_livestream_urls.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/2151c9f8e955_replace_allow_columns_with_has_columns.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/222b78a8508d_remove_organization_description.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 3,
-    "Value of type \"Optional[Row[Tuple[int]]]\" is not indexable  [index]": 1
-  },
-  "migrations/versions/22fb4e1e3139_add_ticket_client.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 5
-  },
-  "migrations/versions/277ba2ca9e3e_add_proposal_sponsor_membership.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/284c10efdbce_deprecate_session_speaker_bio.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"session_description\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/294362dc7e49_add_organization_state.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/2cbfbcca4737_uuid_columns_for_proposal_and_session.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/2d2797b91909_schema_sync.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/2d73dbe935dc_naming_fixes_for_event_models.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/2db4d4be1fdf_proposal_space_redirect.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/321b11b6a413_add_participant_uuid_field.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/380089617763_add_title_to_ticket_type.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/382cde270594_create_lastuser_tables.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 6,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 6,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 16,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 25
-  },
-  "migrations/versions/3847982f1472_update_comment_notification_preferences.py": {
-    "Argument 1 to \"execute\" has incompatible type \"Delete\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 1
-  },
-  "migrations/versions/39eed1e99156_add_title_to_event.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/41a4531be082_remove_account_name.py": {
-    "Argument 1 to \"execute\" has incompatible type \"Insert\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 1,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/41b3af7e4449_migrating_preview_video_to_video_field.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 4,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "No overload variant of \"__getitem__\" of \"Row\" matches argument type \"str\"  [call-overload]": 9
-  },
-  "migrations/versions/447728ca6d2e_add_buy_tickets_url.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/4845fd12dbfd_keep_revoked_timestamp.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/4aea03545045_sponsor_label_check_constraint.py": {
-    "Argument 3 to \"create_check_constraint\" has incompatible type \"ColumnElement[bool]\"; expected \"Union[str, BinaryExpression[Any], TextClause]\"  [arg-type]": 1
-  },
-  "migrations/versions/4b630fb42760_init.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 23,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/4b7fe9b25c6c_removed_legacy_name_from_project.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/4b80fb451c8e_project_tri_state_columns.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 3,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 3
-  },
-  "migrations/versions/4dbf686f4380_added_location_to_pr.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/4f805eefa9f4_urls_now_use_string_instead_of_text.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 20,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 20,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/522d776a42ed_event_models.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 13
-  },
-  "migrations/versions/523c53593e3c_proposalspace_explor.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/5290f9238875_feedback.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/530c22761e27_fix_column_lengths.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/542fd8471e84_match_old_to_new_user_and_team_columns.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/55097480a655_event_timezone.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/56ba15eff9ad_saved_projects_and_sessions.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/58588eba8cb8_room_bgcolor_default.py": {
-    "\"FromClause\" has no attribute \"update\"  [attr-defined]": 1
-  },
-  "migrations/versions/5e06feda611d_session_start_and_end_column_names.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/5f1ab3e04f73_drop_support_for_128_bit_blake2b_hash_.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/5f465411775c_project_end_at_after_start_at.py": {
-    "Argument 3 to \"create_check_constraint\" has incompatible type \"ColumnElement[bool]\"; expected \"Union[str, BinaryExpression[Any], TextClause]\"  [arg-type]": 4
-  },
-  "migrations/versions/60a132ae73f1_url_field_leng.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 24
-  },
-  "migrations/versions/60ee1687f59c_project_cfp_end_at_after_cfp_start_at.py": {
-    "Argument 3 to \"create_check_constraint\" has incompatible type \"ColumnElement[bool]\"; expected \"Union[str, BinaryExpression[Any], TextClause]\"  [arg-type]": 1
-  },
-  "migrations/versions/62d770006955_drop_old_user_and_team_columns.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/63c44675b6cd_migrate_to_phonenumber.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/664141d5ec56_add_video_mixin_to_proposal_and_session.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/6835596b1eee_shortlink_model.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/69c2ced88981_team_org_uuid.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/6d031c17a6ee_start_enums_at_1.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/6d3599c52873_post_model_field_name_fix.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/6f98e24760d_session_speaker.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/70ffbc1bcf88_logo_url_banner_url_hasjob_embed.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3
-  },
-  "migrations/versions/71fcac85957c_populate_membership_models.py": {
-    "Argument 1 to \"dict\" has incompatible type \"CursorResult[Any]\"; expected \"Iterable[Tuple[<nothing>, <nothing>]]\"  [arg-type]": 5,
-    "Need type annotation for \"admin_dict\" (hint: \"admin_dict: Dict[<type>, <type>] = ...\")  [var-annotated]": 1,
-    "Need type annotation for \"admins_dict\" (hint: \"admins_dict: Dict[<type>, <type>] = ...\")  [var-annotated]": 1,
-    "Need type annotation for \"checkin_dict\" (hint: \"checkin_dict: Dict[<type>, <type>] = ...\")  [var-annotated]": 1,
-    "Need type annotation for \"owners_dict\" (hint: \"owners_dict: Dict[<type>, <type>] = ...\")  [var-annotated]": 1,
-    "Need type annotation for \"review_dict\" (hint: \"review_dict: Dict[<type>, <type>] = ...\")  [var-annotated]": 1
-  },
-  "migrations/versions/7aa9eb80aab4_add_sysadmin_flag.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/7d5b77aada1e_add_geoname_models.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 4,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 4,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 30,
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/7f8114c73092_add_rsvp_uuid.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/82303877b746_update_proposalmembership_structure.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/832a4481cda9_tagline_for_profile.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/83b6643891ec_hash_check_constraint.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/851473d61beb_rename_post_to_update.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 6,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 6
-  },
-  "migrations/versions/887db555cca9_adding_uuid_to_commentset.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/896137ace892_remove_voteset_and_vote.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/90cc904ece17_add_badge_template_to_event.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/931be3605dc4_notification_models.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 8
-  },
-  "migrations/versions/9333436765cd_add_emailaddress.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/94ce3a9b7a3a_draft_model.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/99e99507a595_add_commentset_state.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/9a0d8fa7da29_project_location.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/9aa60ff2a0ea_migrate_to_urltype.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 20
-  },
-  "migrations/versions/9ad724b3e8cc_remove_userphoneclaim.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/a116118d086b_add_frozen_title.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/a1ab7bd78649_post_model.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/a5dbb3f843e4_add_start_end_check_constraints.py": {
-    "Argument 3 to \"create_check_constraint\" has incompatible type \"ColumnElement[bool]\"; expected \"Union[str, BinaryExpression[Any], TextClause]\"  [arg-type]": 3
-  },
-  "migrations/versions/abfda6e2f41d_rename_to_comment_in_reply_to.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/ad5013552ec6_simplify_proposal_fields.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 10,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"proposal_body\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/ae075a249493_migrate_email_addresses.py": {
-    "Argument 1 to \"execute\" has incompatible type \"Delete\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 1,
-    "Call to untyped function \"canonical_email_representation\" in typed context  [no-untyped-call]": 3,
-    "Call to untyped function \"email_blake2b128_hash\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"email_blake2b160_hash\" in typed context  [no-untyped-call]": 6,
-    "Call to untyped function \"email_domain\" in typed context  [no-untyped-call]": 5,
-    "Call to untyped function \"email_md5sum\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"email_normalized\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 6,
-    "Function is missing a type annotation  [no-untyped-def]": 8,
-    "Value of type \"Optional[Row[Any]]\" is not indexable  [index]": 3
-  },
-  "migrations/versions/ae68621248af_primary_venue.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 3,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 3
-  },
-  "migrations/versions/aebd5a9e5af1_project_timestamps.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/b34aa62af7fc_uuid_columns_for_project_profile_user_team.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 7,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/b61a489d34a4_contactexchange_notes_and_metadata.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/b7165507d80c_track_oauth2_refresh_token_and_expiry.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/b8a87e6a24f1_versionid_is_now_revisionid_and_in_more_.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/bd465803af3a_add_sponsormembership.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/c3069d33419a_comment_uuid_field.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/c38fa391613f_contact_exchange_model_change.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 2,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/ca578c1b82e8_populate_usersession_geonameid_from_ip_.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Statement is unreachable  [unreachable]": 1
-  },
-  "migrations/versions/cad24ab35cc2_limit_session_duration_to_24h.py": {
-    "Argument 3 to \"create_check_constraint\" has incompatible type \"ColumnElement[bool]\"; expected \"Union[str, BinaryExpression[Any], TextClause]\"  [arg-type]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/ccfad4d5e383_rename_proposalspace_to_project.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 4,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 4
-  },
-  "migrations/versions/d0a6fab28b7f_add_label_to_project_crew_membership.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/d576f55f9eba_proposal_instructions.py": {
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/e2b28adfa135_add_proposal_suuid_redirect.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Module \"coaster.utils\" has no attribute \"uuid2suuid\"; maybe \"uuid2buid\"?  [attr-defined]": 1
-  },
-  "migrations/versions/e2be4ab896d3_migrate_old_labels.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 7,
-    "Call to untyped function \"UnicodeText\" in typed context  [no-untyped-call]": 3,
-    "No overload variant of \"__getitem__\" of \"Row\" matches argument type \"str\"  [call-overload]": 21,
-    "Unsupported operand types for < (\"int\" and \"None\")  [operator]": 2,
-    "Value of type \"Optional[Row[Any]]\" is not indexable  [index]": 6
-  },
-  "migrations/versions/e3bf172763bc_use_timezone_type.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 2
-  },
-  "migrations/versions/e4f17fe2cce8_record_usersession_login_service.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1
-  },
-  "migrations/versions/ea1ea3b0ff95_rename_post_constraints_to_update_.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 6,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 6
-  },
-  "migrations/versions/eec2fad0f3e9_venue_uuid_field.py": {
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "migrations/versions/f346a7cc783a_use_underscores_in_account_names.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "migrations/versions/f8204bcd438_move_content_into_description.py": {
-    "No overload variant of \"__getitem__\" of \"Row\" matches argument type \"str\"  [call-overload]": 5
-  },
-  "migrations/versions/f9c44ecb5999_rename_ticket_event_models.py": {
-    "Argument 1 to \"execute\" has incompatible type \"DDL\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 6,
-    "Call to untyped function \"DDL\" in typed context  [no-untyped-call]": 6
-  },
-  "migrations/versions/fa05ebecbc0f_populate_proposalmembership.py": {
-    "Argument 1 to \"execute\" has incompatible type \"Delete\"; expected \"Union[str, TextClause, Update]\"  [arg-type]": 1,
-    "Call to untyped function \"get_progressbar\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"membership_values\" in typed context  [no-untyped-call]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "migrations/versions/fb90ab2af4c2_add_phonenumber.py": {
-    "Call to untyped function \"Unicode\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "tests/conftest.py": {
-    "\"Callable[[str], User]\" has no attribute \"usermap\"  [attr-defined]": 1,
-    "Call to untyped function \"safe_repr\" in typed context  [no-untyped-call]": 10,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation  [no-untyped-def]": 26,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 57,
-    "Missing type parameters for generic type \"Iterator\"  [type-arg]": 5,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1,
-    "No return value expected  [return-value]": 2,
-    "Returning Any from function declared to return \"Flask\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"Label\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"List[Any]\"  [no-any-return]": 2,
-    "Returning Any from function declared to return \"Organization\"  [no-any-return]": 4,
-    "Returning Any from function declared to return \"Project\"  [no-any-return]": 7,
-    "Returning Any from function declared to return \"Proposal\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"SQLAlchemy\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Session\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Team\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"Union[Engine, Connection]\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"User\"  [no-any-return]": 21,
-    "Returning Any from function declared to return \"str\"  [no-any-return]": 2,
-    "Returning Any from function declared to return Module  [no-any-return]": 5
-  },
-  "tests/cypress/cypress_dropdb_test.py": {
-    "Call to untyped function \"drop_models\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1
-  },
-  "tests/cypress/cypress_initdb_test.py": {
-    "Call to untyped function \"init_models\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"is_verified\"  [union-attr]": 1
-  },
-  "tests/e2e/account/register_test.py": {
-    "Call to untyped function \"element_to_be_clickable\" in typed context  [no-untyped-call]": 6,
-    "Function is missing a type annotation  [no-untyped-def]": 17
-  },
-  "tests/e2e/basic/live_server_test.py": {
-    "Call to untyped function \"element_to_be_clickable\" in typed context  [no-untyped-call]": 2,
-    "Call to untyped function \"visibility_of_element_located\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "tests/e2e/conftest.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1
-  },
-  "tests/integration/views/account_delete_test.py": {
-    "\"Organization\" has no attribute \"active_admin_memberships\"  [attr-defined]": 1,
-    "\"Organization\" has no attribute \"admin_users\"  [attr-defined]": 1,
-    "\"Organization\" has no attribute \"owner_users\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Returning Any from function declared to return \"None\"  [no-any-return]": 1,
-    "Returning Any from function declared to return \"OrganizationMembership\"  [no-any-return]": 3,
-    "Returning Any from function declared to return \"User\"  [no-any-return]": 1
-  },
-  "tests/integration/views/comment_moderation_test.py": {
-    "\"Comment\" has no attribute \"is_reviewed_by\"  [attr-defined]": 2,
-    "Call to untyped function \"submit\" of \"CommentModeratorReport\" in typed context  [no-untyped-call]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4
-  },
-  "tests/integration/views/conftest.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Returning Any from function declared to return \"User\"  [no-any-return]": 1
-  },
-  "tests/integration/views/label_views_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4
-  },
-  "tests/integration/views/login_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 7,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 36
-  },
-  "tests/integration/views/membership_views_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/integration/views/oauth_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/integration/views/project_views_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/cli/periodic_stats_test.py": {
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 1
-  },
-  "tests/unit/forms/account_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5
-  },
-  "tests/unit/forms/login_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 23
-  },
-  "tests/unit/forms/proposal_forms_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2
-  },
-  "tests/unit/models/auth_client_AuthClientUserPermissions_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/models/auth_client_AuthClient_test.py": {
-    "Argument 1 to \"owner_is\" of \"AuthClient\" has incompatible type \"None\"; expected \"User\"  [arg-type]": 1,
-    "Incompatible types in assignment (expression has type \"List[str]\", variable has type \"Tuple[Any, ...]\")  [assignment]": 1,
-    "Item \"None\" of \"Optional[User]\" has no attribute \"fullname\"  [union-attr]": 1
-  },
-  "tests/unit/models/auth_client_AuthToken_test.py": {
-    "\"Organization\" has no attribute \"owner_users\"  [attr-defined]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Item \"None\" of \"Optional[UserSession]\" has no attribute \"user\"  [union-attr]": 2
-  },
-  "tests/unit/models/auth_client_ScopeMixin_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Incompatible types in assignment (expression has type \"List[str]\", variable has type \"Tuple[str, ...]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"None\", variable has type \"Tuple[str, ...]\")  [assignment]": 1,
-    "Incompatible types in assignment (expression has type \"str\", variable has type \"Tuple[str, ...]\")  [assignment]": 3,
-    "Statement is unreachable  [unreachable]": 1
-  },
-  "tests/unit/models/db_test.py": {
-    "Call to untyped function \"SmsMessage\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"UserPhone\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"make_fixtures\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "tests/unit/models/email_address_test.py": {
-    "Call to untyped function \"configure_mappers\" in typed context  [no-untyped-call]": 1,
-    "Class cannot subclass \"BaseMixin\" (has type \"Any\")  [misc]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 11,
-    "Missing type parameters for generic type \"Generator\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 2,
-    "Name \"models.BaseMixin\" is not defined  [name-defined]": 4
-  },
-  "tests/unit/models/helpers_test.py": {
-    "Call to untyped function \"spam\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4,
-    "Non-overlapping identity check (left operand type: \"Type[OriginalClass]\", right operand type: \"Type[ReopenedClass]\")  [comparison-overlap]": 1,
-    "Non-overlapping identity check (left operand type: \"Type[ReopenedClass]\", right operand type: \"Type[OriginalClass]\")  [comparison-overlap]": 1
-  },
-  "tests/unit/models/label_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 7
-  },
-  "tests/unit/models/merge_membership_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 8
-  },
-  "tests/unit/models/merge_notification_test.py": {
-    "\"Organization\" has no attribute \"active_admin_memberships\"  [attr-defined]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 8,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 9,
-    "Missing type parameters for generic type \"Notification\"  [type-arg]": 1
-  },
-  "tests/unit/models/merge_team_test.py": {
-    "\"User\" has no attribute \"teams\"  [attr-defined]": 3,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/models/models_utils_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5
-  },
-  "tests/unit/models/notification_test.py": {
-    "\"User\" has no attribute \"notification_preferences\"  [attr-defined]": 6,
-    "Call to untyped function \"UserPhone\" in typed context  [no-untyped-call]": 1,
-    "Definition of \"document\" in base class \"ProjectIsParent\" is incompatible with definition in base class \"Notification\"  [misc]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 9,
-    "Item \"AuthClient\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Comment\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"CommentModeratorReport\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Commentset\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"ImmutableMembershipMixin\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Organization\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Profile\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Project\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"Team\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"User\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"UserOldId\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"UserSession\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Item \"VenueRoom\" of \"Union[AuthClient, Comment, CommentModeratorReport, Commentset, ImmutableMembershipMixin, Organization, Profile, Project, Proposal, Rsvp, Session, Team, TicketParticipant, Update, User, UserOldId, UserSession, Venue, VenueRoom]\" has no attribute \"project\"  [union-attr]": 1,
-    "Missing type parameters for generic type \"Notification\"  [type-arg]": 3
-  },
-  "tests/unit/models/phone_number_test.py": {
-    "Call to untyped function \"configure_mappers\" in typed context  [no-untyped-call]": 1,
-    "Class cannot subclass \"BaseMixin\" (has type \"Any\")  [misc]": 4,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 13,
-    "Missing type parameters for generic type \"Generator\"  [type-arg]": 2,
-    "Module \"funnel.models\" does not explicitly export attribute \"relationship\"  [attr-defined]": 2,
-    "Name \"models.BaseMixin\" is not defined  [name-defined]": 4
-  },
-  "tests/unit/models/profile_name_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 10
-  },
-  "tests/unit/models/profile_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"logo_url\"  [union-attr]": 4,
-    "Item \"None\" of \"Optional[Profile]\" has no attribute \"name\"  [union-attr]": 1
-  },
-  "tests/unit/models/project_crew_membership_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 2,
-    "Item \"None\" of \"Optional[ProjectCrewMembership]\" has no attribute \"revoke\"  [union-attr]": 1,
-    "Non-overlapping equality check (left operand type: \"int\", right operand type: \"Tuple[int, str, Any]\")  [comparison-overlap]": 3
-  },
-  "tests/unit/models/project_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4,
-    "Unsupported operand types for < (\"datetime\" and \"None\")  [operator]": 1
-  },
-  "tests/unit/models/proposal_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/models/session_test.py": {
-    "\"Project\" has no attribute \"next_session_from\"  [attr-defined]": 1,
-    "\"Type[Project]\" has no attribute \"starting_at\"  [attr-defined]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Missing type parameters for generic type \"tuple\"  [type-arg]": 4
-  },
-  "tests/unit/models/shortlink_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6
-  },
-  "tests/unit/models/site_membership_test.py": {
-    "Call to untyped function \"invalidate_cache\" in typed context  [no-untyped-call]": 7,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5
-  },
-  "tests/unit/models/sponsor_membership_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 8
-  },
-  "tests/unit/models/sync_ticket_test.py": {
-    "\"GetTitleMixin\" has no attribute \"ticket_types\"  [attr-defined]": 1,
-    "Call to untyped function \"bulk_upsert\" in typed context  [no-untyped-call]": 1,
-    "Call to untyped function \"import_from_list\" in typed context  [no-untyped-call]": 3,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Item \"None\" of \"Optional[TicketParticipant]\" has no attribute \"ticket_events\"  [union-attr]": 10,
-    "Item \"TicketParticipant\" of \"Optional[TicketParticipant]\" has no attribute \"ticket_events\"  [union-attr]": 10
-  },
-  "tests/unit/models/user_Organization_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Redundant cast to \"str\"  [redundant-cast]": 1
-  },
-  "tests/unit/models/user_UserEmail_test.py": {
-    "Argument \"email\" to \"get\" of \"UserEmail\" has incompatible type \"Union[Any, str, None]\"; expected \"str\"  [arg-type]": 1,
-    "Argument 1 to \"email_blake2b160_hash\" has incompatible type \"Union[Any, str, None]\"; expected \"str\"  [arg-type]": 1,
-    "Item \"str\" of \"Union[Literal[''], UserEmail]\" has no attribute \"email\"  [union-attr]": 2
-  },
-  "tests/unit/models/user_UserExternalId_test.py": {
-    "Argument \"userid\" to \"get\" of \"UserExternalId\" has incompatible type \"Union[Any, str, None]\"; expected \"str\"  [arg-type]": 1,
-    "Argument \"username\" to \"get\" of \"UserExternalId\" has incompatible type \"Union[Any, str, None]\"; expected \"str\"  [arg-type]": 1,
-    "Item \"str\" of \"Union[Literal[''], UserEmail]\" has no attribute \"email\"  [union-attr]": 9
-  },
-  "tests/unit/models/user_UserPhone_test.py": {
-    "Call to untyped function \"UserPhone\" in typed context  [no-untyped-call]": 2
-  },
-  "tests/unit/models/user_User_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 18
-  },
-  "tests/unit/models/user_session_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Item \"None\" of \"Optional[UserSession]\" has no attribute \"revoked_at\"  [union-attr]": 1
-  },
-  "tests/unit/proxies/request_wants_test.py": {
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_fragment\"  [attr-defined]": 5,
-    "\"LocalProxy[RequestWants]\" has no attribute \"html_in_json\"  [attr-defined]": 2,
-    "\"LocalProxy[RequestWants]\" has no attribute \"htmx\"  [attr-defined]": 2,
-    "\"LocalProxy[RequestWants]\" has no attribute \"json\"  [attr-defined]": 3,
-    "Call to untyped function \"init_app\" in typed context  [no-untyped-call]": 1,
-    "Function is missing a return type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 7,
-    "Module \"funnel.proxies\" does not explicitly export attribute \"request_wants\"  [attr-defined]": 1
-  },
-  "tests/unit/tests/conftest_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/transports/aws_ses/ses_notices_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 2
-  },
-  "tests/unit/transports/sms_send_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/transports/sms_template_test.py": {
-    "Class cannot subclass \"MyMessage\" (has type \"Any\")  [misc]": 1
-  },
-  "tests/unit/utils/markdown/conftest.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Missing type parameters for generic type \"Dict\"  [type-arg]": 1
-  },
-  "tests/unit/utils/markdown/markdown_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/utils/mustache_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 2
-  },
-  "tests/unit/views/account_menu_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/views/account_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4
-  },
-  "tests/unit/views/api_shortlink_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5
-  },
-  "tests/unit/views/helpers_test.py": {
-    "Call to untyped function \"cleanurl_filter\" in typed context  [no-untyped-call]": 18,
-    "Function is missing a return type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/views/login_session_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/views/notification_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 5,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3
-  },
-  "tests/unit/views/notifications/conftest.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1,
-    "Returning Any from function declared to return \"None\"  [no-any-return]": 1
-  },
-  "tests/unit/views/notifications/organization_membership_notification_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 4,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Returning Any from function declared to return \"ProjectCrewMembership\"  [no-any-return]": 3
-  },
-  "tests/unit/views/notifications/project_crew_notification_test.py": {
-    "Call to untyped function \"role_columns\" in typed context  [no-untyped-call]": 6,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 15,
-    "Returning Any from function declared to return \"ProjectCrewMembership\"  [no-any-return]": 6
-  },
-  "tests/unit/views/project_spa_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 2,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 5,
-    "Missing type parameters for generic type \"dict\"  [type-arg]": 3
-  },
-  "tests/unit/views/project_sponsorship_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 3,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4,
-    "Item \"None\" of \"Optional[ProjectSponsorMembership]\" has no attribute \"is_promoted\"  [union-attr]": 1,
-    "Item \"None\" of \"Optional[ProjectSponsorMembership]\" has no attribute \"label\"  [union-attr]": 1
-  },
-  "tests/unit/views/project_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/views/search_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 11,
-    "Module \"funnel.models\" does not explicitly export attribute \"Query\"  [attr-defined]": 1
-  },
-  "tests/unit/views/session_temp_vars_test.py": {
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/views/shortlink_test.py": {
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 4
-  },
-  "tests/unit/views/siteadmin_test.py": {
-    "\"User\" has no attribute \"active_site_membership\"  [attr-defined]": 2,
-    "Function is missing a return type annotation  [no-untyped-def]": 1,
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 3,
-    "Returning Any from function declared to return \"SiteMembership\"  [no-any-return]": 1
-  },
-  "tests/unit/views/sitemap_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 1
-  },
-  "tests/unit/views/video_test.py": {
-    "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 6
-  }
-}
diff --git a/package-lock.json b/package-lock.json
index 0e93a8272..c6d733dd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,12 +110,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.22.13",
+        "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
       },
       "engines": {
@@ -123,30 +123,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
-      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
+      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.7",
+        "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0",
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -162,12 +162,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -201,14 +201,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -217,17 +217,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz",
+      "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "semver": "^6.3.1"
@@ -257,9 +257,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -331,9 +331,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -441,9 +441,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -459,9 +459,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -482,23 +482,23 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz",
+      "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -510,9 +510,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -521,9 +521,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -536,14 +536,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
+        "@babel/plugin-transform-optional-chaining": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -552,6 +552,22 @@
         "@babel/core": "^7.13.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
+      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
@@ -628,9 +644,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -643,9 +659,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -800,9 +816,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -815,9 +831,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
-      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
+      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -833,14 +849,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -850,9 +866,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -865,9 +881,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -880,12 +896,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -896,12 +912,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
-      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -913,18 +929,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
+      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
@@ -936,13 +952,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
+        "@babel/template": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -952,9 +968,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -967,12 +983,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -983,9 +999,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -998,9 +1014,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
-      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1014,12 +1030,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1030,9 +1046,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
-      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1046,12 +1062,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1061,13 +1078,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1078,9 +1095,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
-      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1094,9 +1111,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1109,9 +1126,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
-      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1125,9 +1142,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1140,12 +1157,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1156,12 +1173,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1173,13 +1190,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
+      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20"
       },
@@ -1191,12 +1208,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1223,9 +1240,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1238,9 +1255,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
-      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1254,9 +1271,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
-      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1270,16 +1287,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
-      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
+      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
+        "@babel/compat-data": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.15"
+        "@babel/plugin-transform-parameters": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1289,13 +1306,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
+        "@babel/helper-replace-supers": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1305,9 +1322,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
-      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1321,9 +1338,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1338,9 +1355,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1353,12 +1370,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1369,13 +1386,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
-      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
@@ -1387,9 +1404,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1402,9 +1419,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1418,9 +1435,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1433,9 +1450,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1448,9 +1465,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1464,9 +1481,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1479,9 +1496,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1494,9 +1511,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1509,9 +1526,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1524,12 +1541,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1540,12 +1557,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1556,12 +1573,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1572,25 +1589,26 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
-      "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
+      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.2",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
+        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.22.5",
-        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1602,59 +1620,58 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.2",
-        "@babel/plugin-transform-async-to-generator": "^7.22.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.23.0",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.15",
-        "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.23.0",
-        "@babel/plugin-transform-dotall-regex": "^7.22.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.11",
-        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.15",
-        "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.11",
-        "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
-        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.23.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.0",
-        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.5",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+        "@babel/plugin-transform-for-of": "^7.23.6",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
-        "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.23.0",
-        "@babel/plugin-transform-parameters": "^7.22.15",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
-        "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.10",
-        "@babel/plugin-transform-reserved-words": "^7.22.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
-        "@babel/plugin-transform-spread": "^7.22.5",
-        "@babel/plugin-transform-sticky-regex": "^7.22.5",
-        "@babel/plugin-transform-template-literals": "^7.22.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.23.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.6",
-        "babel-plugin-polyfill-corejs3": "^0.8.5",
-        "babel-plugin-polyfill-regenerator": "^0.5.3",
+        "babel-plugin-polyfill-corejs2": "^0.4.7",
+        "babel-plugin-polyfill-corejs3": "^0.8.7",
+        "babel-plugin-polyfill-regenerator": "^0.5.4",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
@@ -1686,9 +1703,9 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.7.tgz",
+      "integrity": "sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1711,20 +1728,20 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1732,12 +1749,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
@@ -1751,9 +1768,9 @@
       "integrity": "sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A=="
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.10.2.tgz",
-      "integrity": "sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==",
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.11.1.tgz",
+      "integrity": "sha512-L5UInv8Ffd6BPw0P3EF7JLYAMeEbclY7+6Q11REt8vhih8RuLreKtPy/xk8wPxs4EQgYqzI7cdgpiYwWlbS/ow==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -1768,12 +1785,12 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.0.tgz",
-      "integrity": "sha512-tFfcxRIlOWiQDFhjBSWJ10MxcvbCIsRr6V64SgrcaY0MwNk32cUOcCuNlWo8VjV4qRQCgNgUAnIeo0svkk4R5Q==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz",
+      "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.2.0",
+        "@codemirror/state": "^6.4.0",
         "@codemirror/view": "^6.0.0",
         "@lezer/common": "^1.1.0"
       }
@@ -1791,9 +1808,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.6.tgz",
-      "integrity": "sha512-E4C8CVupBksXvgLSme/zv31x91g06eZHSph7NczVxZW+/K+3XgJGWNT//2WLzaKSBoxpAjaOi5ZnPU1SHhjh3A==",
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.7.tgz",
+      "integrity": "sha512-y9hWSSO41XlcL4uYwWyk0lEgTHcelWWfRuqmvcAmxfCs0HNWZdriWo/EU43S63SxEZpc1Hd50Itw7ktfQvfkUg==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -1821,9 +1838,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.2.tgz",
-      "integrity": "sha512-wmwM9Y5n/e4ndU51KcYDaQnb9goYdhXjU71dDW9goOc1VUTIPph6WKAPdJ6BzC0ZFy+UTsDwTXGWSP370RH69Q==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz",
+      "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
         "@codemirror/lang-html": "^6.0.0",
@@ -1835,12 +1852,12 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.9.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.2.tgz",
-      "integrity": "sha512-QGTQXSpAKDIzaSE96zNK1UfIUhPgkT1CLjh1N5qVzZuxgsEOhz5RqaN8QCIdyOQklGLx3MgHd9YrE3X3+Pl1ow==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz",
+      "integrity": "sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
         "@lezer/common": "^1.1.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0",
@@ -1858,16 +1875,16 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.3.1.tgz",
-      "integrity": "sha512-88e4HhMtKJyw6fKprGaN/yZfiaoGYOi2nM45YCUC6R/kex9sxFWBDGatS1vk4lMgnWmdIIB9tk8Gj1LmL8YfvA=="
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz",
+      "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A=="
     },
     "node_modules/@codemirror/view": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.0.tgz",
-      "integrity": "sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.0.tgz",
+      "integrity": "sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ==",
       "dependencies": {
-        "@codemirror/state": "^6.1.4",
+        "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -2073,41 +2090,42 @@
       }
     },
     "node_modules/@lezer/common": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.1.0.tgz",
-      "integrity": "sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.0.tgz",
+      "integrity": "sha512-Wmvlm4q6tRpwiy20TnB3yyLTZim38Tkc50dPY8biQRwqE+ati/wD84rm3N15hikvdT4uSg9phs9ubjvcLmkpKg=="
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz",
-      "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.6.tgz",
+      "integrity": "sha512-/HhbnfXchRc995VdDH9TBzd1B2CO/A4uhOhELqGjd7Bymgc+tGlb0W9Vp5GA1Otq8Ef4JCXpuKmr4hH3aFny6A==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz",
-      "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz",
+      "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.6.tgz",
-      "integrity": "sha512-Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.8.tgz",
+      "integrity": "sha512-EXseJ3pUzWxE6XQBQdqWHZqqlGQRSuNMBcLb6mZWS2J2v+QZhOObD+3ZIKIcm59ntTzyor4LqFTb72iJc3k23Q==",
       "dependencies": {
-        "@lezer/common": "^1.0.0",
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.9",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.9.tgz",
-      "integrity": "sha512-7Uv8mBBE6l44spgWEZvEMdDqGV+FIuY7kJ1o5TFm+jxIuxydO3PcKJYiINij09igd1D/9P7l2KDqpkN8c3bM6A==",
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.12.tgz",
+      "integrity": "sha512-kwO5MftUiyfKBcECMEDc4HYnc10JME9kTJNPVoCXqJj/Y+ASWF0rgstORi3BThlQI6SoPSshrK5TjuiLFnr29A==",
       "dependencies": {
         "@lezer/highlight": "^1.1.3",
         "@lezer/lr": "^1.3.0"
@@ -2122,9 +2140,9 @@
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.1.0.tgz",
-      "integrity": "sha512-JYOI6Lkqbl83semCANkO3CKbKc0pONwinyagBufWBm+k4yhIcqfCF8B8fpEpvJLmIy7CAfwiq7dQ/PzUZA340g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.2.0.tgz",
+      "integrity": "sha512-d7MwsfAukZJo1GpPrcPGa3MxaFFOqNp0gbqF+3F7pTeNDOgeJN1muXzx1XXDPt+Ac+/voCzsH7qXqnn+xReG/g==",
       "dependencies": {
         "@lezer/common": "^1.0.0",
         "@lezer/highlight": "^1.0.0"
@@ -2272,9 +2290,9 @@
       }
     },
     "node_modules/@types/d3": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.2.tgz",
-      "integrity": "sha512-Y4g2Yb30ZJmmtqAJTqMRaqXwRawfvpdpVmyEYEcyGNhrQI/Zvkq3k7yE1tdN07aFSmNBfvmegMQ9Fe2qy9ZMhw==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/d3-axis": "*",
@@ -2309,185 +2327,185 @@
       }
     },
     "node_modules/@types/d3-array": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.0.tgz",
-      "integrity": "sha512-tjU8juPSfhMnu6mJZPOCVVGba4rZoE0tjHDPb81PYwA8CzbaFscGjgkUM7juUJu6iWA1cCVWNEVwxZ5HN9Jj8Q=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="
     },
     "node_modules/@types/d3-axis": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.5.tgz",
-      "integrity": "sha512-ufDAV3SQzju+uB3Jlty7SUb/jMigjpIlvDDcSGvGmmO6OT/sNO93UE0dRzwWOZeBLzrLSA0CQM4bf3iq1std3A==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dependencies": {
         "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-brush": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.5.tgz",
-      "integrity": "sha512-JROQXZNq1X6QdWstESDUv1VilwZ2hBCQnWB91yal+5yZvYwGQvYsGCjrkHGfKK/8/AcX1JnERmpQzdDDuLRUsA==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dependencies": {
         "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-chord": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.5.tgz",
-      "integrity": "sha512-rs26AIhJjtc+XLR4YQU8IjPTLOlDVO4PR1y+pVFYEHzKh2tE5tYz3MF4QV6iz7HboXQEaYpJQt8dH9uUkne8yA=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg=="
     },
     "node_modules/@types/d3-color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.2.tgz",
-      "integrity": "sha512-At+Ski7dL8Bs58E8g8vPcFJc8tGcaC12Z4m07+p41+DRqnZQcAlp3NfYjLrhNYv+zEyQitU1CUxXNjqUyf+c0g=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
     },
     "node_modules/@types/d3-contour": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.5.tgz",
-      "integrity": "sha512-wLvjwdOQVd1NL1IcW90CCt1VtpeZ3V20p/OTXlkT8uAiprrJnq2PNNnRNe1QCez4U9aMU29Z14zpJQVLW1+Lcg==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/geojson": "*"
       }
     },
     "node_modules/@types/d3-delaunay": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.3.tgz",
-      "integrity": "sha512-+Lf5NPKZ4JBC9tbudVkKceQXRxU3jJs0el9aKQvinMtdnFSOG84eVXyhCNgIFuXNQO3iIcYs7sgzN359FEOZnQ=="
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw=="
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.5.tgz",
-      "integrity": "sha512-hxvq2kc+9hydVppo21JCGfcM0tLTh1DXnG3MLN0KlxsNZJH4bsdl1iXDuWtXFpWWlBrCMwSqlnoLPDxNAZU3Bg=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ=="
     },
     "node_modules/@types/d3-drag": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.5.tgz",
-      "integrity": "sha512-arHyAGvO0NEGGPCU2jTb31TlXeSxwty1bIxr5wOFOCVqVjgriXloLWXoRp39Oa0Y/qXxcAVMIonAWLrtLxUZAQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dependencies": {
         "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-dsv": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.5.tgz",
-      "integrity": "sha512-73WZR3QFOaSRVz9iOrebTbTnbo7xjcgS/i0Cq5zy0jMXPO3v/JbkTD3Zqii1eYE6v4EJ78g5VP407rm+p8fdlA=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g=="
     },
     "node_modules/@types/d3-ease": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.1.tgz",
-      "integrity": "sha512-VZofjpEt8HWv3nxUAosj5o/+4JflnJ7Bbv07k17VO3T2WRuzGdZeookfaF60iVh5RdhVG49LE5w6LIshVUC6rg=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="
     },
     "node_modules/@types/d3-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.5.tgz",
-      "integrity": "sha512-Rc8pb6H0RRLpAV2hEXduykUgcDUOhjSLTLmCIeo6ejzgs4SaITh/EteMb3p5Env3Hqjsqw0fCksyqopHHzMkMg==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dependencies": {
         "@types/d3-dsv": "*"
       }
     },
     "node_modules/@types/d3-force": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.7.tgz",
-      "integrity": "sha512-rsok4CEvPLyVWRPsFiBhanJc3up03H/EARVz4d8soPh8drv82YMuAckYy4yv8g4/81JwCng5U5/o9aj9d0T6bQ=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.9.tgz",
+      "integrity": "sha512-IKtvyFdb4Q0LWna6ymywQsEYjK/94SGhPrMfEr1TIc5OBeziTi+1jcCvttts8e0UWZIxpasjnQk9MNk/3iS+kA=="
     },
     "node_modules/@types/d3-format": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.3.tgz",
-      "integrity": "sha512-kxuLXSAEJykTeL/EI3tUiEfGqru7PRdqEy099YBnqFl+fF167UVSB4+wntlZv86ZdoYf0DHjsRHnTIm8kcH7qw=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g=="
     },
     "node_modules/@types/d3-geo": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.0.6.tgz",
-      "integrity": "sha512-wblAES3b+C3hvp4VakwECEKtHquT/xc6K4HOna95LM1j1fd7s7WmU4V+JMQZfKhNCMkV2vWD+ZUgY2Uj6gqfuA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dependencies": {
         "@types/geojson": "*"
       }
     },
     "node_modules/@types/d3-hierarchy": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.5.tgz",
-      "integrity": "sha512-DEcBUj1IL3WyPLDlh4m2nsNXnMLITXM5Vwcu4G85yJHtf2cVGPBjgky3L11WBnT+ayHKf06Tchk5mY1eGmd4WQ=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.6.tgz",
+      "integrity": "sha512-qlmD/8aMk5xGorUvTUWHCiumvgaUXYldYjNVOWtYoTYY/L+WwIEAmJxUmTgr9LoGNG0PPAOmqMDJVDPc7DOpPw=="
     },
     "node_modules/@types/d3-interpolate": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.3.tgz",
-      "integrity": "sha512-6OZ2EIB4lLj+8cUY7I/Cgn9Q+hLdA4DjJHYOQDiHL0SzqS1K9DL5xIOVBSIHgF+tiuO9MU1D36qvdIvRDRPh+Q==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dependencies": {
         "@types/d3-color": "*"
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.1.tgz",
-      "integrity": "sha512-blRhp7ki7pVznM8k6lk5iUU9paDbVRVq+/xpf0RRgSJn5gr6SE7RcFtxooYGMBOc1RZiGyqRpVdu5AD0z0ooMA=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.2.tgz",
+      "integrity": "sha512-WAIEVlOCdd/NKRYTsqCpOMHQHemKBEINf8YXMYOtXH0GA7SY0dqMB78P3Uhgfy+4X+/Mlw2wDtlETkN6kQUCMA=="
     },
     "node_modules/@types/d3-polygon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.1.tgz",
-      "integrity": "sha512-nrcWPk7B9qs6xnpq60Cls44zm9eDmFAv65qi/N/emh/oftnG6uYz49aIS0mdFaGeJxVN8H3pHneMuZMV8EwFdw=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA=="
     },
     "node_modules/@types/d3-quadtree": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.4.tgz",
-      "integrity": "sha512-B725MopFDIOQ6njFbeOxIEf42HVO2Xv+FmcxQISdOKErvLbFqWz3Riu+OWujUYoogreqqyHBHcGGL/JzzXQYsw=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg=="
     },
     "node_modules/@types/d3-random": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.2.tgz",
-      "integrity": "sha512-8QhsqkKs6mymAZMrg3ZFXPxKA34rdgp3ZrtB8o6mhFsKAd1gOvR1gocWnca+kmXypQdwgnzKm9gZE2Uw8NjjKw=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ=="
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.6.tgz",
-      "integrity": "sha512-lo3oMLSiqsQUovv8j15X4BNEDOsnHuGjeVg7GRbAuB2PUa1prK5BNSOu6xixgNf3nqxPl4I1BqJWrPvFGlQoGQ==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-scale-chromatic": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.1.tgz",
-      "integrity": "sha512-Ob7OrwiTeQXY/WBBbRHGZBOn6rH1h7y3jjpTSKYqDEeqFjktql6k2XSgNwLrLDmAsXhEn8P9NHDY4VTuo0ZY1w=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+      "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw=="
     },
     "node_modules/@types/d3-selection": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.8.tgz",
-      "integrity": "sha512-pxCZUfQyedq/DIlPXIR5wE1mIH37omOdx1yxRudL3KZ4AC+156jMjOv1z5RVlGq62f8WX2kyO0hTVgEx627QFg=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
+      "integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg=="
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.4.tgz",
-      "integrity": "sha512-M2/xsWPsjaZc5ifMKp1EBp0gqJG0eO/zlldJNOC85Y/5DGsBQ49gDkRJ2h5GY7ZVD6KUumvZWsylSbvTaJTqKg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
       "dependencies": {
         "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.2.tgz",
-      "integrity": "sha512-kbdRXTmUgNfw5OTE3KZnFQn6XdIc4QGroN5UixgdrXATmYsdlPQS6pEut9tVlIojtzuFD4txs/L+Rq41AHtLpg=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw=="
     },
     "node_modules/@types/d3-time-format": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.2.tgz",
-      "integrity": "sha512-wr08C1Gh77qaN8JIkrn5Rz/bdt5M9bdEqFmEOcYhUSq2t2sHvLTBfb4XAtGB3D4hm0ubj50NXWWXoXyp5tPXDg=="
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg=="
     },
     "node_modules/@types/d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-GGTvzKccVEhxmRfJEB6zhY9ieT4UhGVUIQaBzFpUO9OXy2ycAlnPCSJLzmGGgqt3KVjqN3QCQB4g1rsZnHsWhg=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="
     },
     "node_modules/@types/d3-transition": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.6.tgz",
-      "integrity": "sha512-K0To23B5UxNwFtKORnS5JoNYvw/DnknU5MzhHIS9czJ/lTqFFDeU6w9lArOdoTl0cZFNdNrMJSFCbRCEHccH2w==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
+      "integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
       "dependencies": {
         "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-zoom": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.6.tgz",
-      "integrity": "sha512-dGZQaXEu7aNcCL71LPpjB58IjoQNM9oDPfQuMUJ7N/fbkcIWGX2PnmUWO1jPJ+RLbZBpRUggJUX8twKRvo2hKQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dependencies": {
         "@types/d3-interpolate": "*",
         "@types/d3-selection": "*"
@@ -2514,14 +2532,14 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz",
-      "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.12",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz",
-      "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA=="
+      "version": "7946.0.13",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",
+      "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ=="
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
@@ -2582,36 +2600,36 @@
       "dev": true
     },
     "node_modules/@types/source-list-map": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.4.tgz",
-      "integrity": "sha512-Kdfm7Sk5VX8dFW7Vbp18+fmAatBewzBILa1raHYxrGEFXT0jNl9x3LWfuW7bTbjEKFNey9Dfkj/UzT6z/NvRlg==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.6.tgz",
+      "integrity": "sha512-5JcVt1u5HDmlXkwOD2nslZVllBBc7HDuOICfiZah2Z0is8M8g+ddAEawbmd3VjedfDHBzxCaXLs07QEmb7y54g==",
       "dev": true
     },
     "node_modules/@types/tapable": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.10.tgz",
-      "integrity": "sha512-q8F20SdXG5fdVJQ5yxsVlH+f+oekP42QeHv4s5KlrxTMT0eopXn7ol1rhxMcksf8ph7XNv811iVDE2hOpUvEPg==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.12.tgz",
+      "integrity": "sha512-bTHG8fcxEqv1M9+TD14P8ok8hjxoOCkfKc8XXLaaD05kI7ohpeI956jtDOD3XHKBQrlyPughUtzm1jtVhHpA5Q==",
       "dev": true
     },
     "node_modules/@types/trusted-types": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.5.tgz",
-      "integrity": "sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true
     },
     "node_modules/@types/uglify-js": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.3.tgz",
-      "integrity": "sha512-ToldSfJ6wxO21cakcz63oFD1GjqQbKzhZCD57eH7zWuYT5UEZvfUoqvrjX5d+jB9g4a/sFO0n6QSVzzn5sMsjg==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg==",
       "dev": true,
       "dependencies": {
         "source-map": "^0.6.1"
       }
     },
     "node_modules/@types/webpack": {
-      "version": "4.41.35",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.35.tgz",
-      "integrity": "sha512-XRC6HLGHtNfN8/xWeu1YUQV1GSE+28q8lSqvcJ+0xt/zW9Wmn4j9pCSvaXPyRlCKrl5OuqECQNEJUy2vo8oWqg==",
+      "version": "4.41.38",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz",
+      "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -2623,9 +2641,9 @@
       }
     },
     "node_modules/@types/webpack-sources": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.2.tgz",
-      "integrity": "sha512-acCzhuVe+UJy8abiSFQWXELhhNMZjQjQKpLNEi1pKGgKXZj0ul614ATcx4kkhunPost6Xw+aCq8y8cn1/WwAiA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-4nZOdMwSPHZ4pTEZzSp0AsTM4K7Qmu40UKW4tJDiOVs20UzYF9l+qUe4s0ftfN0pin06n+5cWWDJXH+sbhAiDw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -2653,13 +2671,16 @@
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.15.tgz",
-      "integrity": "sha512-FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
       "dependencies": {
-        "@babel/parser": "^7.18.4",
+        "@babel/parser": "^7.23.5",
         "postcss": "^8.4.14",
         "source-map": "^0.6.1"
+      },
+      "optionalDependencies": {
+        "prettier": "^1.18.2 || ^2.0.0"
       }
     },
     "node_modules/@webassemblyjs/ast": {
@@ -3370,13 +3391,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
-      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
+      "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -3384,12 +3405,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz",
-      "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
+      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
         "core-js-compat": "^3.33.1"
       },
       "peerDependencies": {
@@ -3397,12 +3418,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
-      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
+      "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -3496,9 +3517,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
       "dev": true,
       "funding": [
         {
@@ -3515,9 +3536,9 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       },
       "bin": {
@@ -3611,9 +3632,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001561",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
-      "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
+      "version": "1.0.30001576",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz",
+      "integrity": "sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==",
       "dev": true,
       "funding": [
         {
@@ -3977,12 +3998,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.33.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz",
-      "integrity": "sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==",
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
+      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.22.1"
+        "browserslist": "^4.22.2"
       },
       "funding": {
         "type": "opencollective",
@@ -4031,9 +4052,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/cypress": {
       "version": "11.2.0",
@@ -4096,7 +4117,10 @@
       "version": "14.18.63",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
       "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
@@ -4226,9 +4250,9 @@
       "dev": true
     },
     "node_modules/cytoscape": {
-      "version": "3.27.0",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.27.0.tgz",
-      "integrity": "sha512-pPZJilfX9BxESwujODz5pydeGi+FBrXq1rcaB1mfhFXXFJ9GjE6CNndAk+8jPzoXGD+16LtSS4xlYEIUiW4Abg==",
+      "version": "3.28.1",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz",
+      "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==",
       "dependencies": {
         "heap": "^0.2.6",
         "lodash": "^4.17.21"
@@ -4933,9 +4957,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.576",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz",
-      "integrity": "sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==",
+      "version": "1.4.628",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.628.tgz",
+      "integrity": "sha512-2k7t5PHvLsufpP6Zwk0nof62yLOsCf032wZx7/q0mv8gwlXjhcxI3lz6f0jBr0GrnWKcm3burXzI3t5IrcdUxw==",
       "dev": true
     },
     "node_modules/elkjs": {
@@ -5360,9 +5384,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.7",
@@ -5381,7 +5405,7 @@
         "object.groupby": "^1.0.1",
         "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -6214,7 +6238,7 @@
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flat-cache/node_modules/rimraf": {
@@ -6700,9 +6724,9 @@
       "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
     },
     "node_modules/htmx.org": {
-      "version": "1.9.7",
-      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.7.tgz",
-      "integrity": "sha512-bHONSJ3WBtMG5Ex6xmC+t///rCKINrrPNeZ0Nq9cylVbzZ9ZGjWn1z60hripbqZeIM3WSpEATgm+MglDIK5WVQ=="
+      "version": "1.9.10",
+      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.10.tgz",
+      "integrity": "sha512-UgchasltTCrTuU2DQLom3ohHrBvwr7OqpwyAVJ9VxtNBng4XKkVsqrv0Qr3srqvM9ZNI3f1MmvVQQqK7KW/bTA=="
     },
     "node_modules/http-signature": {
       "version": "1.3.6",
@@ -8087,9 +8111,9 @@
       }
     },
     "node_modules/lint-staged/node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
+      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
       "dev": true,
       "dependencies": {
         "path-key": "^4.0.0"
@@ -8619,14 +8643,14 @@
       }
     },
     "node_modules/markmap-common": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/markmap-common/-/markmap-common-0.15.3.tgz",
-      "integrity": "sha512-a40FfdzFEKoyIhd5KDsV6FfkM55WWi2spRq/cUCsOZd8e4PAHMc9auCEjdxTWRiS2EGzET9sPpvyAmPSTva+/w==",
+      "version": "0.15.6",
+      "resolved": "https://registry.npmjs.org/markmap-common/-/markmap-common-0.15.6.tgz",
+      "integrity": "sha512-uBJkdHvkppTiaw+IXau6aVQgN6F/o2BT6l6QghavQLrd6r7H5Ce7/EcMAg+T4RwBKqzJoraLARkIWARXuqmOgw==",
       "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.22.6",
         "@gera2ld/jsx-dom": "^2.2.2",
-        "npm2url": "^0.2.1"
+        "npm2url": "^0.2.4"
       }
     },
     "node_modules/markmap-lib": {
@@ -8688,9 +8712,9 @@
       }
     },
     "node_modules/markmap-view": {
-      "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/markmap-view/-/markmap-view-0.15.4.tgz",
-      "integrity": "sha512-6PJnoPZHiQIb0YE+fg0Ht1ptEXgf9QOOTBEiC2DrzjAbZ3rrRa2g+0VhpZ+9vSzDsUa+m/IGz4xkiNepuPfs5w==",
+      "version": "0.15.8",
+      "resolved": "https://registry.npmjs.org/markmap-view/-/markmap-view-0.15.8.tgz",
+      "integrity": "sha512-/QrVf2cxgsMUEO256SQd9w1VykT4XTF6cJwUHiUO/dF4UjyIkTQ2TMzhoVGjj2XzppQtS2mjXcjPq2ePX16RUA==",
       "dependencies": {
         "@babel/runtime": "^7.22.6",
         "@gera2ld/jsx-dom": "^2.2.2",
@@ -8978,9 +9002,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
       "dev": true
     },
     "node_modules/non-layered-tidy-tree-layout": {
@@ -9010,9 +9034,9 @@
       }
     },
     "node_modules/npm2url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/npm2url/-/npm2url-0.2.1.tgz",
-      "integrity": "sha512-Ls7mMyud1Kk0EisqsTt2TPtM7gLRvgmvDxOg3FPI5zjfhQ+ZFNBXX2K9VT7vo+HqUsz/uCiIxkcO0SvIuneVug==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/npm2url/-/npm2url-0.2.4.tgz",
+      "integrity": "sha512-arzGp/hQz0Ey+ZGhF64XVH7Xqwd+1Q/po5uGiBbzph8ebX6T0uvt3N7c1nBHQNsQVykQgHhqoRTX7JFcHecGuw==",
       "peer": true
     },
     "node_modules/object-assign": {
@@ -9042,13 +9066,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
         "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
@@ -9444,9 +9468,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.33",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
       "funding": [
         {
           "type": "opencollective",
@@ -9462,7 +9486,7 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -9483,7 +9507,7 @@
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -9752,9 +9776,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
@@ -10146,9 +10170,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
-      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "version": "1.69.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz",
+      "integrity": "sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -10163,9 +10187,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
-      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
+      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
       "dev": true,
       "dependencies": {
         "neo-async": "^2.6.2"
@@ -10629,9 +10653,9 @@
       "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="
     },
     "node_modules/stylis": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz",
-      "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz",
+      "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ=="
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
@@ -10794,9 +10818,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
-      "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==",
+      "version": "5.26.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz",
+      "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -10817,11 +10841,11 @@
       "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.8"
+        "terser": "^5.26.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -11036,9 +11060,9 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
@@ -11347,9 +11371,9 @@
       "integrity": "sha512-nah+xbVInVJaO6+C5PEUqaougmv8BN8aa7ZCtmVQcX6eWIZGRukckFtseXSI7KD7/nXtwkJe624y42T0r+L+AQ=="
     },
     "node_modules/vega": {
-      "version": "5.25.0",
-      "resolved": "https://registry.npmjs.org/vega/-/vega-5.25.0.tgz",
-      "integrity": "sha512-lr+uj0mhYlSN3JOKbMNp1RzZBenWp9DxJ7kR3lha58AFNCzzds7pmFa7yXPbtbaGhB7Buh/t6n+Bzk3Y0VnF5g==",
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/vega/-/vega-5.27.0.tgz",
+      "integrity": "sha512-iYMQZYb2nlJBLCsUZ88pvun2sTcFcLE7GKJWisndLo+KYNMQIRePQ7X2FRuy8yvRRNxfO8XhjImh4OwxZvyYVA==",
       "dependencies": {
         "vega-crossfilter": "~4.1.1",
         "vega-dataflow": "~5.7.5",
@@ -11358,25 +11382,25 @@
         "vega-expression": "~5.1.0",
         "vega-force": "~4.2.0",
         "vega-format": "~1.1.1",
-        "vega-functions": "~5.13.2",
+        "vega-functions": "~5.14.0",
         "vega-geo": "~4.4.1",
         "vega-hierarchy": "~4.1.1",
         "vega-label": "~1.2.1",
         "vega-loader": "~4.5.1",
-        "vega-parser": "~6.2.0",
+        "vega-parser": "~6.2.1",
         "vega-projection": "~1.6.0",
         "vega-regression": "~1.2.0",
         "vega-runtime": "~6.1.4",
-        "vega-scale": "~7.3.0",
-        "vega-scenegraph": "~4.10.2",
+        "vega-scale": "~7.3.1",
+        "vega-scenegraph": "~4.11.2",
         "vega-statistics": "~1.9.0",
         "vega-time": "~2.1.1",
-        "vega-transforms": "~4.10.2",
-        "vega-typings": "~0.24.0",
+        "vega-transforms": "~4.11.1",
+        "vega-typings": "~1.1.0",
         "vega-util": "~1.17.2",
-        "vega-view": "~5.11.1",
+        "vega-view": "~5.12.0",
         "vega-view-transforms": "~4.5.9",
-        "vega-voronoi": "~4.2.1",
+        "vega-voronoi": "~4.2.2",
         "vega-wordcloud": "~4.1.4"
       }
     },
@@ -11406,9 +11430,9 @@
       }
     },
     "node_modules/vega-embed": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.23.0.tgz",
-      "integrity": "sha512-8Iava57LdROsatqsOhMLErHYaBpZBB7yZJlSVU3/xOK3l8Ft5WFnj5fm3OOAVML97/0yULE7LRVjXW5hV3fSpg==",
+      "version": "6.24.0",
+      "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.24.0.tgz",
+      "integrity": "sha512-ANCksO3lXhdLzQn7Mfistm1dsRwQhxTYICVpru7TMc+Ywe7C4vOLWuaVv9Qvem2IgQyuVCal0EoTMKvIVYykFg==",
       "bundleDependencies": [
         "yallist"
       ],
@@ -11416,11 +11440,11 @@
         "fast-json-patch": "^3.1.1",
         "json-stringify-pretty-compact": "^3.0.0",
         "semver": "^7.5.4",
-        "tslib": "^2.6.1",
+        "tslib": "^2.6.2",
         "vega-interpreter": "^1.0.5",
         "vega-schema-url-parser": "^2.2.0",
         "vega-themes": "^2.14.0",
-        "vega-tooltip": "^0.33.0",
+        "vega-tooltip": "^0.34.0",
         "yallist": "*"
       },
       "peerDependencies": {
@@ -11508,9 +11532,9 @@
       }
     },
     "node_modules/vega-functions": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.2.tgz",
-      "integrity": "sha512-YE1Xl3Qi28kw3vdXVYgKFMo20ttd3+SdKth1jUNtBDGGdrOpvPxxFhZkVqX+7FhJ5/1UkDoAYs/cZY0nRKiYgA==",
+      "version": "5.14.0",
+      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz",
+      "integrity": "sha512-Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-color": "^3.1.0",
@@ -11519,7 +11543,7 @@
         "vega-expression": "^5.1.0",
         "vega-scale": "^7.3.0",
         "vega-scenegraph": "^4.10.2",
-        "vega-selections": "^5.4.1",
+        "vega-selections": "^5.4.2",
         "vega-statistics": "^1.8.1",
         "vega-time": "^2.1.1",
         "vega-util": "^1.17.1"
@@ -11575,9 +11599,9 @@
       }
     },
     "node_modules/vega-lite": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.1.tgz",
-      "integrity": "sha512-3iXmzdAVZCGHrvdh6hIM8OY55auXA1EIDzFLaYdq27e99Dr+WXTEa00ilqQUPdrpS0sE1ZqK4Ikhgg5x8SOtLw==",
+      "version": "5.16.3",
+      "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.3.tgz",
+      "integrity": "sha512-F3HO/BqlyyB1D0tf/+qy1JOmq7bHtG/nvsXcgNVUFjgVgvVKL4sMnxVnYzSsIg10x/6RFxLfwWJSd0cA8MuuUA==",
       "dependencies": {
         "json-stringify-pretty-compact": "~3.0.0",
         "tslib": "~2.6.2",
@@ -11612,15 +11636,15 @@
       }
     },
     "node_modules/vega-parser": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz",
-      "integrity": "sha512-as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.1.tgz",
+      "integrity": "sha512-F79bQXt6fMkACR+TfFl7ueehKO26yCR/3iRZxhU7/pgHerx/d8K8pf2onMguu3NAN4eitT+PPuTgkDZtcqo9Qg==",
       "dependencies": {
         "vega-dataflow": "^5.7.5",
         "vega-event-selector": "^3.0.1",
-        "vega-functions": "^5.13.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
+        "vega-functions": "^5.14.0",
+        "vega-scale": "^7.3.1",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-projection": {
@@ -11654,9 +11678,9 @@
       }
     },
     "node_modules/vega-scale": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz",
-      "integrity": "sha512-pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.1.tgz",
+      "integrity": "sha512-tyTlaaCpHN2Ik/PPKl/j9ThadBDjPtypqW1D7IsUSkzfoZ7RPlI2jwAaoj2C/YW5jFRbEOx3njmjogp48I5CvA==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-interpolate": "^3.0.1",
@@ -11666,9 +11690,9 @@
       }
     },
     "node_modules/vega-scenegraph": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz",
-      "integrity": "sha512-R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA==",
+      "version": "4.11.2",
+      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.11.2.tgz",
+      "integrity": "sha512-PXSvv/L7Ek+9mwOTPLpzgkXdfGCR+AcWV5aquPGrqCWoiIF49VJkKFNT1HWxj3RZJX0XKo2r7SuXvRBb9EJ1aA==",
       "dependencies": {
         "d3-path": "^3.1.0",
         "d3-shape": "^3.2.0",
@@ -11684,26 +11708,15 @@
       "integrity": "sha512-yAtdBnfYOhECv9YC70H2gEiqfIbVkq09aaE4y/9V/ovEFmH9gPKaEgzIZqgT7PSPQjKhsNkb6jk6XvSoboxOBw=="
     },
     "node_modules/vega-selections": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz",
-      "integrity": "sha512-EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.2.tgz",
+      "integrity": "sha512-99FUhYmg0jOJr2/K4TcEURmJRkuibrCDc8KBUX7qcQEITzrZ5R6a4QE+sarCvbb3hi8aA9GV2oyST6MQeA9mgQ==",
       "dependencies": {
-        "d3-array": "3.2.2",
+        "d3-array": "3.2.4",
         "vega-expression": "^5.0.1",
         "vega-util": "^1.17.1"
       }
     },
-    "node_modules/vega-selections/node_modules/d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
-      "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/vega-statistics": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.9.0.tgz",
@@ -11732,17 +11745,17 @@
       }
     },
     "node_modules/vega-tooltip": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.33.0.tgz",
-      "integrity": "sha512-jMcvH2lP20UfyvO2KAEdloiwRyasikaiLuNFhzwrrzf2RamGTxP4G7B2OZ2QENfrGUH05Z9ei5tn/eErdzOaZQ==",
+      "version": "0.34.0",
+      "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.34.0.tgz",
+      "integrity": "sha512-TtxwkcLZ5aWQTvKGlfWDou8tISGuxmqAW1AgGZjrDpf75qsXvgtbPdRAAls2LZMqDxpr5T1kMEZs9XbSpiI8yw==",
       "dependencies": {
         "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-transforms": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.2.tgz",
-      "integrity": "sha512-sJELfEuYQ238PRG+GOqQch8D69RYnJevYSGLsRGQD2LxNz3j+GlUX6Pid+gUEH5HJy22Q5L0vsTl2ZNhIr4teQ==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.1.tgz",
+      "integrity": "sha512-DDbqEQnvy9/qEvv0bAKPqAuzgaNb7Lh2xKJFom2Yzx4tZHCl8dnKxC1lH9JnJlAMdtZuiNLPARUkf3pCNQ/olw==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "vega-dataflow": "^5.7.5",
@@ -11752,14 +11765,14 @@
       }
     },
     "node_modules/vega-typings": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.2.tgz",
-      "integrity": "sha512-fW02GElYoqweCCaPqH6iH44UZnzXiX9kbm1qyecjU3k5s0vtufLI7Yuz/a/uL37mEAqTMQplBBAlk0T9e2e1Dw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-1.1.0.tgz",
+      "integrity": "sha512-uI6RWlMiGRhsgmw/LzJtjCc0kwhw2f0JpyNMTAnOy90kE4e4CiaZN5nJp8S9CcfcBoPEZHc166AOn2SSNrKn3A==",
       "dependencies": {
         "@types/geojson": "7946.0.4",
         "vega-event-selector": "^3.0.1",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
+        "vega-expression": "^5.1.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-typings/node_modules/@types/geojson": {
@@ -11773,9 +11786,9 @@
       "integrity": "sha512-omNmGiZBdjm/jnHjZlywyYqafscDdHaELHx1q96n5UOz/FlO9JO99P4B3jZg391EFG8dqhWjQilSf2JH6F1mIw=="
     },
     "node_modules/vega-view": {
-      "version": "5.11.1",
-      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.11.1.tgz",
-      "integrity": "sha512-RoWxuoEMI7xVQJhPqNeLEHCezudsf3QkVMhH5tCovBqwBADQGqq9iWyax3ZzdyX1+P3eBgm7cnLvpqtN2hU8kA==",
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.12.0.tgz",
+      "integrity": "sha512-T3GY7UJNVZGrCUrAmE/OCrkoJQyOT/2dCgXgy9EvDMVv/sdrn7o1TMKhSV18nIr0m5A7m4mgKwrmguAfROY85g==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-timer": "^3.0.1",
@@ -11798,9 +11811,9 @@
       }
     },
     "node_modules/vega-voronoi": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz",
-      "integrity": "sha512-zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.2.tgz",
+      "integrity": "sha512-Bq2YOp2MGphhQnUuLwl3dsyBs6MuEU86muTjDbBJg33+HkZtE1kIoQZr+EUHa46NBsY1NzSKddOTu8wcaFrWiQ==",
       "dependencies": {
         "d3-delaunay": "^6.0.2",
         "vega-dataflow": "^5.7.5",
@@ -11840,11 +11853,12 @@
       "dev": true
     },
     "node_modules/vue": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz",
-      "integrity": "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.15",
+        "@vue/compiler-sfc": "2.7.16",
         "csstype": "^3.1.0"
       }
     },
@@ -11872,9 +11886,9 @@
       }
     },
     "node_modules/web-worker": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz",
-      "integrity": "sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz",
+      "integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA=="
     },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
diff --git a/pyproject.toml b/pyproject.toml
index 50ebf30f0..db8d72185 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,6 +24,22 @@ exclude = '''
 )/
 '''
 
+[tool.creosote]
+venvs = [".venv"]
+paths = ["funnel", "tests", "migrations/versions"]
+deps-file = "requirements/base.in"
+exclude-deps = [
+  "argon2-cffi",   # Optional dep for passlib
+  "bcrypt",        # Optional dep for passlib
+  "greenlet",      # Optional dep for SQLAlchemy's asyncio support
+  "gunicorn",      # Not imported, used as server
+  "linkify-it-py", # Optional dep for markdown-it-py
+  "psycopg",       # Optional dep for SQLAlchemy
+  "rq-dashboard",  # Creosote fails to recognise the import
+  "tzdata",        # Resource-only dep, no code to import
+  "urllib3",       # Unused but required to silence a pip-audit warning
+]
+
 [tool.djlint]
 profile = 'jinja'
 extension = '.html.jinja2'
@@ -99,6 +115,7 @@ required_plugins = [
   'pytest-cov',
   'pytest-dotenv',
   'pytest-env',
+  'pytest-lazy-fixture',
   'pytest-rerunfailures',
   'pytest-socket',
   'requests-mock',
@@ -139,8 +156,8 @@ ignore_missing_imports = true
 show_error_codes = true
 warn_unreachable = true
 warn_unused_ignores = true
-warn_redundant_casts = false
-check_untyped_defs = false
+warn_redundant_casts = true
+check_untyped_defs = true
 
 [[tool.mypy.overrides]]
 module = 'tests.*'
@@ -163,22 +180,29 @@ astroid.bases.POSSIBLE_PROPERTIES.add('cached_property')
 [tool.pylint.message_control]
 max-line-length = 88
 disable = [
-  'comparison-with-callable',     # Pylint is confused by SQLAlchemy attributes
-  'cyclic-import',                # We have tail imports all over
-  'duplicate-code',               # Too many false positives
-  'fixme',                        # Our workflow is to tag for future fixes
-  'invalid-name',                 # Flake8 covers our naming convention requirements
-  'line-too-long',                # Long lines are okay if Black doesn't wrap them
-  'no-member',                    # Pylint gets confused over how some members become part of an instance
-  'too-few-public-methods',       # Data classes and validator classes have few methods
-  'too-many-ancestors',           # Our models have a large number of mixin classes
-  'too-many-arguments',           # Callables can have many optional arguments
-  'too-many-instance-attributes', # Some instances are just bags of attributes
-  'too-many-lines',               # We have large files that include all related functionality
-  'too-many-public-methods',      # Models and views have many public methods
-  'unused-argument',              # Arguments required for spec compatibility aren't always used
-  'wrong-import-order',           # Let isort and ruff handle this
-  'wrong-import-position',        # Let black, isort and ruff handle this
+  'attribute-defined-outside-init', # Defer to static type checkers
+  'comparison-with-callable',       # Pylint is confused by SQLAlchemy attributes
+  'cyclic-import',                  # We have tail imports all over
+  'duplicate-code',                 # Too many false positives
+  'fixme',                          # Our workflow is to tag for future fixes
+  'invalid-name',                   # Flake8 covers our naming convention requirements
+  'line-too-long',                  # Long lines are okay if Black doesn't wrap them
+  'no-member',                      # Pylint gets confused over how some members become part of an instance
+  'too-few-public-methods',         # Data classes and validator classes have few methods
+  'too-many-ancestors',             # Our models have a large number of mixin classes
+  'too-many-arguments',             # Callables can have many optional arguments
+  'too-many-instance-attributes',   # Some instances are just bags of attributes
+  'too-many-lines',                 # We have large files that include all related functionality
+  'too-many-public-methods',        # Models and views have many public methods
+  'unused-argument',                # Arguments required for spec compatibility aren't always used
+  'wrong-import-order',             # Let isort and ruff handle this
+  'wrong-import-position',          # Let black, isort and ruff handle this
+
+  # False positives caused by lazy_loader in funnel.models, so we depend on Mypy instead
+  'isinstance-second-argument-not-valid-type',
+  'no-name-in-module',
+  'not-callable',
+  'unsubscriptable-object',
 
   # Temporarily disabled pending audit and fixes
   'missing-class-docstring',
diff --git a/requirements/base.in b/requirements/base.in
index 36e6ab69c..8f9fe6818 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -31,12 +31,14 @@ icalendar
 idna
 ijson
 itsdangerous
+lazy-loader
 linkify-it-py
 markdown-it-py
 mdit-py-plugins
 oauth2client
 passlib
 phonenumbers
+playwright  # Relocated from test.in because of greenlet version pin
 premailer
 progressbar2
 psycopg[binary]
@@ -44,7 +46,7 @@ pycountry
 pyIsEmail
 python-dateutil
 python-dotenv
-python-telegram-bot
+python-telegram-bot>=20.7
 pytz
 PyVimeo
 qrcode
@@ -63,6 +65,5 @@ urllib3[socks]  # Not direct dep; pip-audit complains of dupe urllib[socks] in t
 user-agents
 werkzeug
 whitenoise
-wtforms-sqlalchemy @ git+https://github.com/jace/wtforms-sqlalchemy  # See /pull/1
 z-base-32
 zxcvbn
diff --git a/requirements/base.txt b/requirements/base.txt
index 2dc3e2824..6ad4e5b48 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:283bfde436a7e26a2db6733e1859751510b75cc9
+# SHA1:d3983d30e9f7056d22bea1d34b48936277802127
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -21,13 +21,13 @@ aiohttp-retry==2.8.3
     # via twilio
 aiosignal==1.3.1
     # via aiohttp
-alembic==1.12.1
+alembic==1.13.1
     # via
     #   -r requirements/base.in
     #   flask-migrate
 aniso8601==9.0.1
     # via coaster
-anyio==4.1.0
+anyio==4.2.0
     # via httpx
 argon2-cffi==23.1.0
     # via -r requirements/base.in
@@ -35,9 +35,9 @@ argon2-cffi-bindings==21.2.0
     # via argon2-cffi
 arrow==1.3.0
     # via rq-dashboard
-attrs==23.1.0
+attrs==23.2.0
     # via aiohttp
-babel==2.13.1
+babel==2.14.0
     # via
     #   -r requirements/base.in
     #   flask-babel
@@ -45,7 +45,7 @@ base58==2.1.1
     # via
     #   -r requirements/base.in
     #   coaster
-bcrypt==4.1.1
+bcrypt==4.1.2
     # via -r requirements/base.in
 better-profanity==0.6.1
     # via -r requirements/base.in
@@ -101,7 +101,7 @@ dnspython==2.4.2
     #   baseframe
     #   mxsniff
     #   pyisemail
-emoji==2.8.0
+emoji==2.9.0
     # via baseframe
 filelock==3.13.1
     # via tldextract
@@ -155,9 +155,9 @@ flask-wtf==1.2.1
     # via
     #   -r requirements/base.in
     #   baseframe
-freezegun==1.2.2
+freezegun==1.4.0
     # via rq-scheduler
-frozenlist==1.4.0
+frozenlist==1.4.1
     # via
     #   aiohttp
     #   aiosignal
@@ -166,16 +166,16 @@ furl==2.1.3
     #   -r requirements/base.in
     #   baseframe
     #   coaster
-future==0.18.3
-    # via tuspy
-geoip2==4.7.0
+geoip2==4.8.0
     # via -r requirements/base.in
 grapheme==0.6.0
     # via
     #   -r requirements/base.in
     #   baseframe
 greenlet==3.0.1
-    # via sqlalchemy
+    # via
+    #   playwright
+    #   sqlalchemy
 gunicorn==21.2.0
     # via -r requirements/base.in
 h11==0.14.0
@@ -226,9 +226,11 @@ jinja2==3.1.2
     #   flask-flatpages
 joblib==1.3.2
     # via nltk
+lazy-loader==0.3
+    # via -r requirements/base.in
 linkify-it-py==2.0.2
     # via -r requirements/base.in
-lxml==4.9.3
+lxml==5.1.0
     # via premailer
 mako==1.3.0
     # via alembic
@@ -282,15 +284,17 @@ packaging==23.2
     #   marshmallow
 passlib==1.7.4
     # via -r requirements/base.in
-phonenumbers==8.13.26
+phonenumbers==8.13.27
+    # via -r requirements/base.in
+playwright==1.40.0
     # via -r requirements/base.in
 premailer==3.10.0
     # via -r requirements/base.in
-progressbar2==4.2.0
+progressbar2==4.3.2
     # via -r requirements/base.in
-psycopg[binary]==3.1.13
+psycopg[binary]==3.1.17
     # via -r requirements/base.in
-psycopg-binary==3.1.13
+psycopg-binary==3.1.17
     # via psycopg
 pyasn1==0.5.1
     # via
@@ -299,12 +303,14 @@ pyasn1==0.5.1
     #   rsa
 pyasn1-modules==0.3.0
     # via oauth2client
-pycountry==22.3.5
+pycountry==23.12.11
     # via
     #   -r requirements/base.in
     #   baseframe
 pycparser==2.21
     # via cffi
+pyee==11.0.1
+    # via playwright
 pygments==2.17.2
     # via rich
 pyisemail==2.0.1
@@ -314,7 +320,7 @@ pyisemail==2.0.1
     #   mxsniff
 pyjwt==2.8.0
     # via twilio
-pymdown-extensions==10.5
+pymdown-extensions==10.7
     # via coaster
 pyparsing==3.1.1
     # via httplib2
@@ -361,7 +367,7 @@ redis==5.0.1
     #   rq-dashboard
 redis-sentinel-url==1.0.1
     # via rq-dashboard
-regex==2023.10.3
+regex==2023.12.25
     # via nltk
 requests==2.31.0
     # via
@@ -399,7 +405,7 @@ semantic-version==2.10.0
     # via
     #   baseframe
     #   coaster
-sentry-sdk==1.38.0
+sentry-sdk==1.39.1
     # via baseframe
 six==1.16.0
     # via
@@ -412,12 +418,11 @@ six==1.16.0
     #   orderedmultidict
     #   python-dateutil
     #   requests-file
-    #   tuspy
 sniffio==1.3.0
     # via
     #   anyio
     #   httpx
-sqlalchemy[asyncio]==2.0.23
+sqlalchemy[asyncio]==2.0.25
     # via
     #   -r requirements/base.in
     #   alembic
@@ -442,28 +447,29 @@ tldextract==5.1.1
     #   mxsniff
 tqdm==4.66.1
     # via nltk
-tuspy==1.0.1
+tuspy==1.0.3
     # via pyvimeo
 tweepy==4.14.0
     # via -r requirements/base.in
-twilio==8.10.2
+twilio==8.11.0
     # via -r requirements/base.in
-types-python-dateutil==2.8.19.14
+types-python-dateutil==2.8.19.20240106
     # via arrow
-typing-extensions==4.8.0
+typing-extensions==4.9.0
     # via
     #   -r requirements/base.in
     #   alembic
     #   baseframe
     #   coaster
     #   psycopg
+    #   pyee
     #   python-utils
     #   qrcode
     #   sqlalchemy
     #   typing-inspect
 typing-inspect==0.9.0
     # via dataclasses-json
-tzdata==2023.3
+tzdata==2023.4
     # via -r requirements/base.in
 ua-parser==0.18.0
     # via user-agents
@@ -492,16 +498,14 @@ werkzeug==3.0.1
     #   flask
 whitenoise==6.6.0
     # via -r requirements/base.in
-wtforms==3.1.1
+wtforms==3.1.2
     # via
     #   baseframe
     #   flask-wtf
     #   wtforms-sqlalchemy
-wtforms-sqlalchemy @ git+https://github.com/jace/wtforms-sqlalchemy
-    # via
-    #   -r requirements/base.in
-    #   baseframe
-yarl==1.9.3
+wtforms-sqlalchemy==0.4.1
+    # via baseframe
+yarl==1.9.4
     # via aiohttp
 z-base-32==0.1.3
     # via -r requirements/base.in
diff --git a/requirements/dev.in b/requirements/dev.in
index 1f6446083..6551caf2b 100644
--- a/requirements/dev.in
+++ b/requirements/dev.in
@@ -17,7 +17,7 @@ flake8-print
 flake8-pytest-style
 flask-debugtoolbar
 isort
-lxml-stubs
+mkinit @ git+https://github.com/Erotemic/mkinit
 mypy
 mypy-json-report
 pep8-naming
@@ -28,10 +28,19 @@ pylint
 pyupgrade
 reformat-gherkin
 ruff
+types-beautifulsoup4
 types-chevron
+types-Flask-Migrate
 types-geoip2
+types-greenlet
+types-lxml
 types-mock
+types-passlib
+types-Pillow
+types-pytest-lazy-fixture
 types-python-dateutil
 types-pytz
+types-PyYAML
 types-redis
 types-requests
+types-zxcvbn
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 5e53af31a..6ecfef4c8 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,4 +1,4 @@
-# SHA1:7bfc341e23494b80e1f77e06104f53470de16cfa
+# SHA1:d153108aee6da6a74129125a1e363378d1c88e18
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -12,11 +12,11 @@
     # via
     #   -r requirements/base.in
     #   baseframe
-astroid==3.0.1
+astroid==3.0.2
     # via pylint
-bandit==1.7.5
+bandit==1.7.6
     # via -r requirements/dev.in
-black==23.11.0
+black==23.12.1
     # via -r requirements/dev.in
 build==1.0.3
     # via pip-tools
@@ -24,19 +24,21 @@ cattrs==22.1.0
     # via reformat-gherkin
 cfgv==3.4.0
     # via pre-commit
+colorama==0.4.6
+    # via djlint
 cssbeautifier==1.14.11
     # via djlint
 dill==0.3.7
     # via pylint
-distlib==0.3.7
+distlib==0.3.8
     # via virtualenv
-djlint==1.34.0
+djlint==1.34.1
     # via -r requirements/dev.in
 editorconfig==0.12.3
     # via
     #   cssbeautifier
     #   jsbeautifier
-flake8==6.1.0
+flake8==7.0.0
     # via
     #   -r requirements/dev.in
     #   flake8-annotations
@@ -55,7 +57,7 @@ flake8-assertive==2.1.0
     # via -r requirements/dev.in
 flake8-blind-except==0.2.1
     # via -r requirements/dev.in
-flake8-bugbear==23.11.28
+flake8-bugbear==23.12.2
     # via -r requirements/dev.in
 flake8-builtins==2.2.0
     # via -r requirements/dev.in
@@ -75,7 +77,7 @@ flake8-print==5.0.0
     # via -r requirements/dev.in
 flake8-pytest-style==1.7.2
     # via -r requirements/dev.in
-flask-debugtoolbar==0.13.1
+flask-debugtoolbar==0.14.1
     # via -r requirements/dev.in
 gherkin-official==24.0.0
     # via reformat-gherkin
@@ -87,9 +89,9 @@ html-tag-names==0.1.2
     # via djlint
 html-void-elements==0.1.0
     # via djlint
-identify==2.5.32
+identify==2.5.33
     # via pre-commit
-isort==5.12.0
+isort==5.13.2
     # via
     #   -r requirements/dev.in
     #   flake8-isort
@@ -100,19 +102,19 @@ jsbeautifier==1.14.11
     #   djlint
 json5==0.9.14
     # via djlint
-lxml-stubs==0.4.0
-    # via -r requirements/dev.in
 mccabe==0.7.0
     # via
     #   flake8
     #   pylint
-mypy==1.7.1
+mkinit @ git+https://github.com/Erotemic/mkinit
     # via -r requirements/dev.in
-mypy-json-report==1.0.4
+mypy==1.8.0
+    # via -r requirements/dev.in
+mypy-json-report==1.1.0
     # via -r requirements/dev.in
 nodeenv==1.8.0
     # via pre-commit
-pathspec==0.11.2
+pathspec==0.12.1
     # via
     #   black
     #   djlint
@@ -124,14 +126,14 @@ pip-compile-multi==2.6.3
     # via -r requirements/dev.in
 pip-tools==7.3.0
     # via pip-compile-multi
-platformdirs==4.0.0
+platformdirs==4.1.0
     # via
     #   black
     #   pylint
     #   virtualenv
 po2json==0.2.2
     # via -r requirements/dev.in
-pre-commit==3.5.0
+pre-commit==3.6.0
     # via -r requirements/dev.in
 pycodestyle==2.11.1
     # via
@@ -139,9 +141,9 @@ pycodestyle==2.11.1
     #   flake8-print
 pydocstyle==6.3.0
     # via flake8-docstrings
-pyflakes==3.1.0
+pyflakes==3.2.0
     # via flake8
-pylint==3.0.2
+pylint==3.0.3
     # via -r requirements/dev.in
 pyproject-hooks==1.0.0
     # via build
@@ -149,7 +151,7 @@ pyupgrade==3.15.0
     # via -r requirements/dev.in
 reformat-gherkin==3.0.1
     # via -r requirements/dev.in
-ruff==0.1.6
+ruff==0.1.11
     # via -r requirements/dev.in
 smmap==5.0.1
     # via gitdb
@@ -161,27 +163,51 @@ tokenize-rt==5.2.0
     # via pyupgrade
 toposort==1.10
     # via pip-compile-multi
-types-chevron==0.14.2.5
+types-beautifulsoup4==4.12.0.20240106
+    # via
+    #   -r requirements/dev.in
+    #   types-lxml
+types-chevron==0.14.2.20240106
+    # via -r requirements/dev.in
+types-flask-migrate==4.0.0.7
     # via -r requirements/dev.in
 types-geoip2==3.0.0
     # via -r requirements/dev.in
+types-greenlet==3.0.0.20240106
+    # via -r requirements/dev.in
+types-html5lib==1.1.11.20240106
+    # via types-beautifulsoup4
 types-ipaddress==1.0.8
     # via types-maxminddb
+types-lxml==2023.10.21
+    # via -r requirements/dev.in
 types-maxminddb==1.5.0
     # via types-geoip2
-types-mock==5.1.0.3
+types-mock==5.1.0.20240106
+    # via -r requirements/dev.in
+types-passlib==1.7.7.20240106
+    # via -r requirements/dev.in
+types-pillow==10.1.0.20240106
     # via -r requirements/dev.in
-types-pyopenssl==23.3.0.0
+types-pyopenssl==23.3.0.20240106
     # via types-redis
+types-pytest-lazy-fixture==0.6.3.4
+    # via -r requirements/dev.in
 types-pytz==2023.3.1.1
     # via -r requirements/dev.in
-types-redis==4.6.0.11
+types-pyyaml==6.0.12.12
+    # via -r requirements/dev.in
+types-redis==4.6.0.20240106
+    # via -r requirements/dev.in
+types-requests==2.31.0.20240106
     # via -r requirements/dev.in
-types-requests==2.31.0.10
+types-zxcvbn==4.4.1.20240106
     # via -r requirements/dev.in
-virtualenv==20.24.7
+ubelt==1.3.4
+    # via mkinit
+virtualenv==20.25.0
     # via pre-commit
-wcwidth==0.2.12
+wcwidth==0.2.13
     # via reformat-gherkin
 wheel==0.42.0
     # via pip-tools
diff --git a/requirements/test.in b/requirements/test.in
index a60192222..a39405851 100644
--- a/requirements/test.in
+++ b/requirements/test.in
@@ -1,17 +1,15 @@
 -r base.in
 beautifulsoup4
-colorama
 coverage
 coveralls
 lxml
-playwright
-Pygments
 pytest
 pytest-asyncio
 pytest-bdd
 pytest-cov
 pytest-dotenv
 pytest-env
+pytest-lazy-fixture
 pytest-playwright
 pytest-rerunfailures
 pytest-socket
diff --git a/requirements/test.txt b/requirements/test.txt
index 98a7e2115..01df5423f 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:3a02b3918f5d7af80710e10c5fff973974b064aa
+# SHA1:b4b685efa6e7e10f39723fbea413d5adc1d5b1b4
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -14,8 +14,6 @@
     #   baseframe
 beautifulsoup4==4.12.2
     # via -r requirements/test.in
-colorama==0.4.6
-    # via -r requirements/test.in
 coverage[toml]==6.5.0
     # via
     #   -r requirements/test.in
@@ -33,15 +31,9 @@ parse==1.20.0
     #   pytest-bdd
 parse-type==0.6.2
     # via pytest-bdd
-playwright==1.40.0
-    # via
-    #   -r requirements/test.in
-    #   pytest-playwright
 pluggy==1.3.0
     # via pytest
-pyee==11.0.1
-    # via playwright
-pytest==7.4.3
+pytest==7.4.4
     # via
     #   -r requirements/test.in
     #   pytest-asyncio
@@ -50,14 +42,15 @@ pytest==7.4.3
     #   pytest-cov
     #   pytest-dotenv
     #   pytest-env
+    #   pytest-lazy-fixture
     #   pytest-playwright
     #   pytest-rerunfailures
     #   pytest-socket
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.3
     # via -r requirements/test.in
 pytest-base-url==2.0.0
     # via pytest-playwright
-pytest-bdd==7.0.0
+pytest-bdd==7.0.1
     # via -r requirements/test.in
 pytest-cov==4.1.0
     # via -r requirements/test.in
@@ -65,6 +58,8 @@ pytest-dotenv==0.5.2
     # via -r requirements/test.in
 pytest-env==1.1.3
     # via -r requirements/test.in
+pytest-lazy-fixture==0.6.3
+    # via -r requirements/test.in
 pytest-playwright==0.4.3
     # via -r requirements/test.in
 pytest-rerunfailures==13.0
diff --git a/runfrontendtests.sh b/runfrontendtests.sh
index 55ddc72ca..725cc06b2 100755
--- a/runfrontendtests.sh
+++ b/runfrontendtests.sh
@@ -3,14 +3,18 @@
 # Load config into environment variables
 set -o allexport
 source .flaskenv
+# shellcheck disable=SC1091
 source .env
+# shellcheck disable=SC1091
 source .testenv
+# shellcheck disable=SC1091
 source .env.testing
 set +o allexport
 
 # Break on errors instead of continuing
 set -o errexit
 
+
 python -m tests.test_fixture_initdb
 flask run -p 3002 --no-reload --debugger 2>&1 1>/tmp/funnel-server.log & echo $! > /tmp/funnel-server.pid
 function killserver() {
diff --git a/tests/conftest.py b/tests/conftest.py
index 2444960a5..ab89f8773 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,34 +3,59 @@
 
 from __future__ import annotations
 
+import os.path
 import re
 import time
 import warnings
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Generator
 from contextlib import ExitStack
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from difflib import unified_diff
+from dis import disassemble
+from functools import partial
+from inspect import stack as inspect_stack
+from io import StringIO
+from pprint import saferepr
+from textwrap import indent
 from types import MethodType, ModuleType, SimpleNamespace
-from typing import TYPE_CHECKING, Any, NamedTuple, get_type_hints
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    NamedTuple,
+    Protocol,
+    cast,
+    get_type_hints,
+    runtime_checkable,
+)
 from unittest.mock import patch
 
-import flask_wtf.csrf
+import flask
 import pytest
 import sqlalchemy as sa
+import sqlalchemy.exc as sa_exc
+import sqlalchemy.orm as sa_orm
 import typeguard
-from flask import session
+from flask import Flask, session
+from flask.ctx import AppContext, RequestContext
+from flask.testing import FlaskClient
+from flask.wrappers import Response
 from flask_sqlalchemy import SQLAlchemy
 from flask_sqlalchemy.session import Session as FsaSession
-from sqlalchemy.orm import Session as DatabaseSessionClass
+from flask_wtf.csrf import generate_csrf
+from lxml.html import FormElement, HtmlElement, fromstring  # nosec
+from rich.console import Console
+from rich.highlighter import RegexHighlighter, ReprHighlighter
+from rich.markup import escape as rich_escape
+from rich.syntax import Syntax
+from rich.text import Text
+from sqlalchemy import event
+from sqlalchemy.orm import Session as DatabaseSessionClass, scoped_session
+from werkzeug import run_simple
 
 if TYPE_CHECKING:
-    from flask import Flask
-    from flask.testing import FlaskClient, TestResponse
-    from rich.console import Console
-
     import funnel.models as funnel_models
-
+    from funnel.devtest import BackgroundWorker, CapturedCalls
 
 # --- Pytest config --------------------------------------------------------------------
 
@@ -47,25 +72,6 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     )
 
 
-@pytest.fixture()
-def chrome_options(chrome_options):
-    chrome_options.add_argument('--headless')
-    chrome_options.add_argument('--ignore-ssl-errors=yes')
-    chrome_options.add_argument('--ignore-certificate-errors')
-    return chrome_options
-
-
-@pytest.fixture()
-def firefox_options(firefox_options):
-    firefox_options.add_argument('--headless')
-    return firefox_options
-
-
-@pytest.fixture(scope="session")
-def browser_context_args(browser_context_args):
-    return browser_context_args | {'ignore_https_errors': True}
-
-
 def pytest_collection_modifyitems(items: list[pytest.Function]) -> None:
     """Sort tests to run lower level before higher level."""
     test_order = (
@@ -111,18 +117,31 @@ def pytest_runtest_call(item: pytest.Function) -> None:
         # get_type_hints may fail on Python <3.10 because pytest-bdd appears to have
         # `dict[str, str]` as a type somewhere, and builtin type subscripting isn't
         # supported yet
-        warnings.warn(
-            f"Type annotations could not be retrieved for {item.obj!r}",
+        warnings.warn(  # noqa: B028
+            f"Type annotations could not be retrieved for {item.obj.__qualname__}",
             RuntimeWarning,
-            stacklevel=1,
         )
         return
+    except NameError as exc:
+        pytest.fail(
+            f"{item.obj.__qualname__} has an unknown annotation for {exc.name}."
+            " Is it imported within a TYPE_CHECKING test?"
+        )
 
     for attr, type_ in annotations.items():
         if attr in item.funcargs:
             typeguard.check_type(item.funcargs[attr], type_)
 
 
+# --- Playwright browser config --------------------------------------------------------
+
+
+@pytest.fixture(scope='session')
+def browser_context_args(browser_context_args: dict) -> dict:
+    """The test server uses HTTPS with a self-signed certificate, so no verify."""
+    return browser_context_args | {'ignore_https_errors': True}
+
+
 # --- Import fixtures ------------------------------------------------------------------
 
 
@@ -159,246 +178,252 @@ def funnel_devtest() -> ModuleType:
 # --- Fixtures -------------------------------------------------------------------------
 
 
-@pytest.fixture(scope='session')
-def response_with_forms() -> Any:  # Since the actual return type is defined within
-    from flask.wrappers import Response
-    from lxml.html import FormElement, HtmlElement, fromstring  # nosec
-
-    # --- ResponseWithForms, to make form submission in the test client testing easier
-    # --- Adapted from the abandoned Flask-Fillin package
-
-    _meta_refresh_content_re = re.compile(
-        r"""
-        \s*
-        (?P<timeout>\d+)      # Timeout
-        \s*
-        ;?                    # ; separator for optional URL
-        \s*
-        (?:URL\s*=\s*["']?)?  # Optional 'URL=' or 'URL="' prefix
-        (?P<url>.*?)          # Optional URL
-        (?:["']?\s*)          # Optional closing quote for URL
-        """,
-        re.ASCII | re.IGNORECASE | re.VERBOSE,
-    )
+_meta_refresh_content_re = re.compile(
+    r"""
+    \s*
+    (?P<timeout>\d+)      # Timeout
+    \s*
+    ;?                    # ; separator for optional URL
+    \s*
+    (?:URL\s*=\s*["']?)?  # Optional 'URL=' or 'URL="' prefix
+    (?P<url>.*?)          # Optional URL
+    (?:["']?\s*)          # Optional closing quote for URL
+    """,
+    re.ASCII | re.IGNORECASE | re.VERBOSE,
+)
 
-    class MetaRefreshContent(NamedTuple):
-        """Timeout and optional URL in a Meta Refresh tag."""
 
-        timeout: int
-        url: str | None = None
+class MetaRefreshContent(NamedTuple):
+    """Timeout and optional URL in a Meta Refresh tag."""
 
-    class ResponseWithForms(Response):
-        """
-        Wrapper for the test client response that makes form submission easier.
+    timeout: int
+    url: str | None = None
 
-        Usage::
 
-            def test_mytest(client) -> None:
-                response = client.get('/page_with_forms')
-                form = response.form('login')
-                form.fields['username'] = 'my username'
-                form.fields['password'] = 'secret'
-                form.fields['remember'] = True
-                next_response = form.submit(client)
-        """
+class TestResponse(Response):
+    """
+    Wrapper for the test client response that makes form submission easier.
 
-        _parsed_html: HtmlElement | None = None
+    Usage::
 
-        @property
-        def html(self) -> HtmlElement:
-            """Return the parsed HTML tree."""
-            if self._parsed_html is None:
-                self._parsed_html = fromstring(self.data)
-
-                # add click method to all links
-                def _click(
-                    self: HtmlElement, client: FlaskClient, **kwargs: Any
-                ) -> TestResponse:
-                    # `self` is the `a` element here
-                    path = self.attrib['href']
-                    return client.get(path, **kwargs)
-
-                for link in self._parsed_html.iter('a'):
-                    link.click = MethodType(_click, link)  # type: ignore[attr-defined]
-
-                # add submit method to all forms
-                def _submit(
-                    self: FormElement,
-                    client: FlaskClient,
-                    path: str | None = None,
-                    **kwargs: Any,
-                ) -> TestResponse:
-                    # `self` is the `form` element here
-                    data = dict(self.form_values())
-                    if 'data' in kwargs:
-                        data.update(kwargs['data'])
-                        del kwargs['data']
-                    if path is None:
-                        path = self.action
-                    if 'method' not in kwargs:
-                        kwargs['method'] = self.method
-                    return client.open(path, data=data, **kwargs)
-
-                for form in self._parsed_html.forms:  # type: ignore[attr-defined]
-                    form.submit = MethodType(_submit, form)
-            return self._parsed_html
+        def test_mytest(client) -> None:
+            response = client.get('/page_with_forms')
+            form = response.form('login')
+            form.fields['username'] = 'my username'
+            form.fields['password'] = 'secret'
+            form.fields['remember'] = True
+            next_response = form.submit(client)
+    """
 
+    # Tell Pytest this class isn't a test
+    __test__ = False
+
+    if TYPE_CHECKING:
+        #: Type hint for the `text` cached_property available via
+        #: :class:`werkzeug.test.TestResponse`, which will be used to make a subclass
+        #: of this class in :class:`werkzeug.test.Client`
         @property
-        def forms(self) -> list[FormElement]:
-            """
-            Return list of all forms in the document.
-
-            Contains the LXML form type as documented at
-            http://lxml.de/lxmlhtml.html#forms with an additional `.submit(client)`
-            method to submit the form.
-            """
-            return self.html.forms
-
-        def form(
-            self, id_: str | None = None, name: str | None = None
-        ) -> FormElement | None:
-            """Return the first form matching given id or name in the document."""
-            if id_:
-                forms = self.html.cssselect(f'form#{id_}')
-            elif name:
-                forms = self.html.cssselect(f'form[name={name}]')
-            else:
-                forms = self.forms
-            if forms:
-                return forms[0]
-            return None
+        def text(self) -> str:
+            ...
 
-        def links(self, selector: str = 'a') -> list[HtmlElement]:
-            """Get all the links matching the given CSS selector."""
-            return self.html.cssselect(selector)
+    _parsed_html: HtmlElement | None = None
+
+    @property
+    def html(self) -> HtmlElement:
+        """Return the parsed HTML tree."""
+        if self._parsed_html is None:
+            self._parsed_html = fromstring(self.data)
+
+            # add click method to all links
+            def _click(
+                self: HtmlElement, client: TestClient, **kwargs: Any
+            ) -> TestResponse:
+                # `self` is the `a` element here
+                path = self.attrib['href']
+                return client.get(path, **kwargs)
+
+            for link in self._parsed_html.iter('a'):
+                link.click = MethodType(_click, link)  # type: ignore[attr-defined]
+
+            # add submit method to all forms
+            def _submit(
+                self: FormElement,
+                client: TestClient,
+                path: str | None = None,
+                **kwargs: Any,
+            ) -> TestResponse:
+                # `self` is the `form` element here
+                data = dict(self.form_values())
+                if 'data' in kwargs:
+                    data.update(kwargs['data'])
+                    del kwargs['data']
+                if path is None:
+                    path = self.action
+                if 'method' not in kwargs:
+                    kwargs['method'] = self.method
+                return client.open(path, data=data, **kwargs)
+
+            for form in self._parsed_html.forms:
+                form.submit = MethodType(_submit, form)  # type: ignore[attr-defined]
+        return self._parsed_html
+
+    @property
+    def forms(self) -> list[FormElement]:
+        """
+        Return list of all forms in the document.
 
-        def link(self, selector: str = 'a') -> HtmlElement | None:
-            """Get first link matching the given CSS selector."""
-            links = self.links(selector)
-            if links:
-                return links[0]
+        Contains the LXML form type as documented at
+        http://lxml.de/lxmlhtml.html#forms with an additional `.submit(client)`
+        method to submit the form.
+        """
+        return self.html.forms
+
+    def form(
+        self, id_: str | None = None, name: str | None = None
+    ) -> FormElement | None:
+        """Return the first form matching given id or name in the document."""
+        if id_:
+            forms = cast(list[FormElement], self.html.cssselect(f'form#{id_}'))
+        elif name:
+            forms = cast(list[FormElement], self.html.cssselect(f'form[name={name}]'))
+        else:
+            forms = self.forms
+        if forms:
+            return forms[0]
+        return None
+
+    def links(self, selector: str = 'a') -> list[HtmlElement]:
+        """Get all the links matching the given CSS selector."""
+        return self.html.cssselect(selector)
+
+    def link(self, selector: str = 'a') -> HtmlElement | None:
+        """Get first link matching the given CSS selector."""
+        links = self.links(selector)
+        if links:
+            return links[0]
+        return None
+
+    @property
+    def metarefresh(self) -> MetaRefreshContent | None:
+        """Get content of Meta Refresh tag if present."""
+        meta_elements = self.html.cssselect('meta[http-equiv="refresh"]')
+        if not meta_elements:
             return None
-
-        @property
-        def metarefresh(self) -> MetaRefreshContent | None:
-            """Get content of Meta Refresh tag if present."""
-            meta_elements = self.html.cssselect('meta[http-equiv="refresh"]')
-            if not meta_elements:
-                return None
-            content = meta_elements[0].attrib.get('content')
-            if content is None:
-                return None
-            match = _meta_refresh_content_re.fullmatch(content)
-            if match is None:
-                return None
-            return MetaRefreshContent(int(match['timeout']), match['url'] or None)
-
-    return ResponseWithForms
+        content = meta_elements[0].attrib.get('content')
+        if content is None:
+            return None
+        match = _meta_refresh_content_re.fullmatch(content)
+        if match is None:
+            return None
+        return MetaRefreshContent(int(match['timeout']), match['url'] or None)
 
 
 @pytest.fixture(scope='session')
 def rich_console() -> Console:
-    """Provide a rich console for color output."""
-    from rich.console import Console
-
-    return Console()
-
-
-@pytest.fixture(scope='session')
-def colorama() -> Iterator[SimpleNamespace]:
-    """Provide the colorama print colorizer."""
-    from colorama import Back, Fore, Style, deinit, init
-
-    init()
-    yield SimpleNamespace(Fore=Fore, Back=Back, Style=Style)
-    deinit()
-
-
-@pytest.fixture(scope='session')
-def colorize_code(rich_console: Console) -> Callable[[str, str | None], str]:
-    """Return colorized output for a string of code, for current terminal's colors."""
-
-    def no_colorize(code_string: str, lang: str | None = 'python') -> str:
-        # Pygments is not available or terminal does not support colour output
-        return code_string
-
-    try:
-        from pygments import highlight
-        from pygments.formatters import (
-            Terminal256Formatter,
-            TerminalFormatter,
-            TerminalTrueColorFormatter,
-        )
-        from pygments.lexers import get_lexer_by_name, guess_lexer
-    except ModuleNotFoundError:
-        return no_colorize
-
-    if rich_console.color_system == 'truecolor':
-        formatter = TerminalTrueColorFormatter()
-    elif rich_console.color_system == '256':
-        formatter = Terminal256Formatter()
-    elif rich_console.color_system == 'standard':
-        formatter = TerminalFormatter()
-    else:
-        # color_system is `None` or `'windows'` or something unrecognised. No colours.
-        return no_colorize
+    """Provide a rich console for colour output."""
+    return Console(highlight=False)
 
-    def colorize(code_string: str, lang: str | None = 'python') -> str:
-        if lang in (None, 'auto'):
-            lexer = guess_lexer(code_string)
-        else:
-            lexer = get_lexer_by_name(lang)
-        return highlight(code_string, lexer, formatter).rstrip()
 
-    return colorize
+@runtime_checkable
+class PrintStackProtocol(Protocol):
+    def __call__(self, skip: int = 0, limit: int | None = None) -> None:
+        ...
 
 
 @pytest.fixture(scope='session')
-def print_stack(pytestconfig, colorama, colorize_code) -> Callable[[int, int], None]:
+def print_stack(
+    pytestconfig: pytest.Config, rich_console: Console
+) -> PrintStackProtocol:
     """Print a stack trace up to an outbound call from within this repository."""
-    import os.path
-    from inspect import stack as inspect_stack
-
     boundary_path = str(pytestconfig.rootpath)
     if not boundary_path.endswith('/'):
         boundary_path += '/'
 
-    def func(skip: int = 0, indent: int = 2) -> None:
+    class PathHighlighter(RegexHighlighter):
+        highlights = [
+            r'^(?=(?:\.\./|\.venv/))(?P<blue>.*)',
+            r'^(?!(?:\.\./|\.venv/))(?P<green>.*)',
+            r'(?P<dim>.*/)(?P<bold>.+)',
+        ]
+
+    def func(skip: int = 0, limit: int | None = None) -> None:
         # Retrieve call stack, removing ourselves and as many frames as the caller wants
         # to skip
-        prefix = ' ' * indent
         stack = inspect_stack()[2 + skip :]
+        try:
+            path_highlighter = PathHighlighter()
+            lines: list[Text | Syntax] = []
+            # Reverse list to order from outermost to innermost, and remove outer frames
+            # that are outside our code
+            stack.reverse()
+            while stack and (
+                stack[0].filename.startswith(boundary_path + '.venv/')
+                or not stack[0].filename.startswith(boundary_path)
+            ):
+                stack.pop(0)
+
+            # Find the first exit from our code and keep only that line and later to
+            # remove unnecessary context. "Our code" = anything that is within
+            # boundary_path but not in a top-level `.venv` folder
+            for index, frame_info in enumerate(stack):
+                if stack[0].filename.startswith(
+                    boundary_path + '.venv/'
+                ) or not frame_info.filename.startswith(boundary_path):
+                    stack = stack[index - 1 :]
+                    break
+
+            for frame_info in stack[:limit]:
+                text = Text.assemble(
+                    path_highlighter(
+                        Text(
+                            os.path.relpath(frame_info.filename, boundary_path),
+                            style='pygments.string',
+                        )
+                    ),
+                    (':', 'pygments.text'),
+                    (str(frame_info.lineno), 'pygments.number'),
+                    (' in ', 'dim'),
+                    (frame_info.function, 'pygments.function'),
+                    ('\t', 'pygments.text'),
+                    style='pygments.text',
+                )
+                lines.append(text)
+                if frame_info.code_context:
+                    lines.append(
+                        Syntax(
+                            '\n'.join(
+                                [
+                                    '    ' + line.strip()
+                                    for line in frame_info.code_context
+                                ]
+                            ),
+                            'python',
+                            background_color='default',
+                            word_wrap=True,
+                        )
+                    )
+                else:
+                    dis_file = StringIO()
+                    disassemble(
+                        frame_info.frame.f_code,
+                        lasti=frame_info.frame.f_lasti,
+                        file=dis_file,
+                    )
+                    lines.append(
+                        Syntax(
+                            indent(dis_file.getvalue().rstrip(), '    '),
+                            'python',  # Code is Python bytecode, but this seems to work
+                            background_color='default',
+                            word_wrap=True,
+                        )
+                    )
 
-        lines = []
-        # Reverse list to order from outermost to innermost, and remove outer frames
-        # that are outside our code
-        stack.reverse()
-        while stack and not stack[0].filename.startswith(boundary_path):
-            stack.pop(0)
-
-        # Find the first exit from our code and keep only that line and later to
-        # remove unneccesary context
-        for index, fi in enumerate(stack):
-            if not fi.filename.startswith(boundary_path):
-                stack = stack[index - 1 :]
-                break
-
-        for fi in stack:
-            line_color = (
-                colorama.Fore.RED
-                if fi.filename.startswith(boundary_path)
-                else colorama.Fore.GREEN
-            )
-            code_line = '\n'.join(fi.code_context or []).strip()
-            lines.append(
-                f'{prefix}{line_color}'
-                f'{os.path.relpath(fi.filename)}:{fi.lineno}::{fi.function}'
-                f'\t{colorize_code(code_line)}'
-                f'{colorama.Style.RESET_ALL}'
-            )
-        del stack
+            if limit and limit < len(stack):
+                lines.append(Text.assemble((f'✂️ {len(stack)-limit} more…', 'dim')))
+        finally:
+            del stack
         # Now print the lines
-        print(*lines, sep='\n')  # noqa: T201
+        rich_console.print(*lines)
 
     return func
 
@@ -425,14 +450,14 @@ def unsubscribeapp(funnel) -> Flask:
 
 
 @pytest.fixture()
-def app_context(app) -> Iterator:
+def app_context(app: Flask) -> Generator[AppContext, None, None]:
     """Create an app context for the test."""
     with app.app_context() as ctx:
         yield ctx
 
 
 @pytest.fixture()
-def request_context(app) -> Iterator:
+def request_context(app: Flask) -> Generator[RequestContext, None, None]:
     """Create a request context with default values for the test."""
     with app.test_request_context() as ctx:
         yield ctx
@@ -465,7 +490,7 @@ def request_context(app) -> Iterator:
 
 
 @pytest.fixture(autouse=True)
-def _mock_config(request: pytest.FixtureRequest) -> Iterator:
+def _mock_config(request: pytest.FixtureRequest) -> Generator[None, None, None]:
     """Mock app config (using ``mock_config`` mark)."""
 
     def backup_and_apply_config(
@@ -485,7 +510,7 @@ def backup_and_apply_config(
             app_fixture.config[key] = value
 
     if request.node.get_closest_marker('mock_config'):
-        saved_app_config: dict[str, Any] = {}
+        saved_app_config: dict[Flask, Any] = {}
         for mark in request.node.iter_markers('mock_config'):
             if len(mark.args) < 1:
                 pytest.fail(_mock_config_syntax)
@@ -540,17 +565,13 @@ def _requires_config(request: pytest.FixtureRequest) -> None:
 
 
 @pytest.fixture(scope='session')
-def _app_events(colorama, print_stack, app) -> Iterator:
+def _app_events(
+    rich_console: Console, print_stack: PrintStackProtocol, app: Flask
+) -> Generator[None, None, None]:
     """Fixture to report Flask signals with a stack trace when debugging a test."""
-    from functools import partial
-
-    import flask
 
-    def signal_handler(signal_name, *args, **kwargs):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}Signal:{colorama.Style.NORMAL}"
-            f" {colorama.Fore.YELLOW}{signal_name}{colorama.Style.RESET_ALL}"
-        )
+    def signal_handler(signal_name, *args: Any, **kwargs: Any):
+        rich_console.print(f"[bold]Signal:[/] [yellow]{rich_escape(signal_name)}[/]")
         print_stack(2)  # Skip two stack frames from Blinker
 
     request_started = partial(signal_handler, 'request_started')
@@ -578,7 +599,9 @@ def signal_handler(signal_name, *args, **kwargs):
 
 
 @pytest.fixture()
-def _database_events(models, colorama, colorize_code, print_stack) -> Iterator:
+def _database_events(
+    models: ModuleType, rich_console: Console, print_stack: PrintStackProtocol
+) -> Generator[None, None, None]:
     """
     Fixture to report database session events for debugging a test.
 
@@ -588,102 +611,128 @@ def _database_events(models, colorama, colorize_code, print_stack) -> Iterator:
         def test_whatever() -> None:
             ...
     """
-    from pprint import saferepr
+    repr_highlighter = ReprHighlighter()
 
-    def safe_repr(entity):
+    def safe_repr(entity: Any) -> str:
         try:
             return saferepr(entity)
         except Exception:  # noqa: B902  # pylint: disable=broad-except
             if hasattr(entity, '__class__'):
-                return f'{entity.__class__.__qualname__}(class-repr-error)'
+                return f'<ReprError: class {entity.__class__.__qualname__}>'
+            if hasattr(entity, '__qualname__'):
+                return f'<ReprError: {entity.__qualname__}'
             if hasattr(entity, '__name__'):
-                return f'{entity.__name__}(repr-error)'
-            return 'repr-error'
+                return f'<ReprError: {entity.__name__}'
+            return '<ReprError>'
 
-    @sa.event.listens_for(models.Model, 'init', propagate=True)
-    def event_init(obj, args, kwargs):
+    @event.listens_for(models.Model, 'init', propagate=True)
+    def event_init(obj: funnel_models.Model, args, kwargs):
         rargs = ', '.join(safe_repr(_a) for _a in args)
         rkwargs = ', '.join(f'{_k}={safe_repr(_v)}' for _k, _v in kwargs.items())
         rparams = f'{rargs, rkwargs}' if rargs else rkwargs
-        code = colorize_code(f"{obj.__class__.__qualname__}({rparams})")
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: new:{colorama.Style.NORMAL}" f" {code}"
+        code = f'{obj.__class__.__qualname__}({rparams})'
+        rich_console.print(
+            Text.assemble(('obj:', 'bold'), ' new: ', repr_highlighter(code))
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'transient_to_pending')
-    def event_transient_to_pending(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: transient to pending:{colorama.Style.NORMAL}"
-            f" {colorize_code(safe_repr(obj))}"
+    @event.listens_for(DatabaseSessionClass, 'transient_to_pending')
+    def event_transient_to_pending(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' transient → pending: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'pending_to_transient')
-    def event_pending_to_transient(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: pending to transient:{colorama.Style.NORMAL}"
-            f" {colorize_code(safe_repr(obj))}"
+    @event.listens_for(DatabaseSessionClass, 'pending_to_transient')
+    def event_pending_to_transient(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' pending → transient: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'pending_to_persistent')
-    def event_pending_to_persistent(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: pending to persistent:{colorama.Style.NORMAL}"
-            f" {colorize_code(safe_repr(obj))}"
+    @event.listens_for(DatabaseSessionClass, 'pending_to_persistent')
+    def event_pending_to_persistent(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' pending → persistent: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'loaded_as_persistent')
-    def event_loaded_as_persistent(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: loaded as persistent:{colorama.Style.NORMAL}"
-            f" {safe_repr(obj)}"
+    @event.listens_for(DatabaseSessionClass, 'loaded_as_persistent')
+    def event_loaded_as_persistent(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' loaded as persistent: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'persistent_to_transient')
-    def event_persistent_to_transient(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: persistent to transient:"
-            f"{colorama.Style.NORMAL} {safe_repr(obj)}"
+    @event.listens_for(DatabaseSessionClass, 'persistent_to_transient')
+    def event_persistent_to_transient(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' persistent → transient: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'persistent_to_deleted')
-    def event_persistent_to_deleted(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: persistent to deleted:{colorama.Style.NORMAL}"
-            f" {safe_repr(obj)}"
+    @event.listens_for(DatabaseSessionClass, 'persistent_to_deleted')
+    def event_persistent_to_deleted(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' persistent → deleted: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'deleted_to_detached')
-    def event_deleted_to_detached(_session, obj):
+    @event.listens_for(DatabaseSessionClass, 'deleted_to_detached')
+    def event_deleted_to_detached(_session, obj: funnel_models.Model):
         i = sa.inspect(obj)
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: deleted to detached:{colorama.Style.NORMAL}"
-            f" {obj.__class__.__qualname__}/{i.identity}"
+        rich_console.print(
+            "[bold]obj:[/] deleted → detached:"
+            f" {rich_escape(obj.__class__.__qualname__)}/{i.identity}"
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'persistent_to_detached')
-    def event_persistent_to_detached(_session, obj):
+    @event.listens_for(DatabaseSessionClass, 'persistent_to_detached')
+    def event_persistent_to_detached(_session, obj: funnel_models.Model):
         i = sa.inspect(obj)
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: persistent to detached:"
-            f"{colorama.Style.NORMAL} {obj.__class__.__qualname__}/{i.identity}"
+        rich_console.print(
+            "[bold]obj:[/] persistent → detached:"
+            f" {rich_escape(obj.__class__.__qualname__)}/{i.identity}"
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'detached_to_persistent')
-    def event_detached_to_persistent(_session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: detached to persistent:"
-            f"{colorama.Style.NORMAL} {safe_repr(obj)}"
+    @event.listens_for(DatabaseSessionClass, 'detached_to_persistent')
+    def event_detached_to_persistent(_session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' detached → persistent: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'deleted_to_persistent')
-    def event_deleted_to_persistent(session, obj):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}obj: deleted to persistent:{colorama.Style.NORMAL}"
-            f" {safe_repr(obj)}"
+    @event.listens_for(DatabaseSessionClass, 'deleted_to_persistent')
+    def event_deleted_to_persistent(session, obj: funnel_models.Model):
+        rich_console.print(
+            Text.assemble(
+                ('obj:', 'bold'),
+                ' deleted → persistent: ',
+                repr_highlighter(safe_repr(obj)),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'do_orm_execute')
-    def event_do_orm_execute(orm_execute_state):
+    @event.listens_for(DatabaseSessionClass, 'do_orm_execute')
+    def event_do_orm_execute(orm_execute_state: sa_orm.ORMExecuteState):
         state_is = []
         if orm_execute_state.is_column_load:
             state_is.append("is_column_load")
@@ -702,147 +751,131 @@ def event_do_orm_execute(orm_execute_state):
         class_name = (
             orm_execute_state.bind_mapper.class_.__qualname__
             if orm_execute_state.bind_mapper
-            else None
+            else '<unknown>'
         )
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}exec:{colorama.Style.NORMAL} {class_name}:"
-            f" {', '.join(state_is)}"
+        rich_console.print(
+            Text.assemble(
+                ('exec: ', 'bold'),
+                ', '.join(state_is),
+                (' on ', 'dim'),
+                (class_name, 'repr.call'),
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'after_begin')
-    def event_after_begin(_session, transaction, _connection):
+    @event.listens_for(DatabaseSessionClass, 'after_begin')
+    def event_after_begin(
+        _session, transaction: sa_orm.SessionTransaction, _connection
+    ):
         if transaction.nested:
-            if transaction.parent.nested:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL}"
-                    f" BEGIN (double nested)"
-                )
+            if transaction.parent and transaction.parent.nested:
+                rich_console.print("[bold]session:[/] BEGIN (double nested)")
             else:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL}"
-                    f" BEGIN (nested)"
-                )
+                rich_console.print("[bold]session:[/] BEGIN (nested)")
         else:
-            print(  # noqa: T201
-                f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL} BEGIN (outer)"
+            rich_console.print("[bold]session:[/] BEGIN (outer)")
+        print_stack(0, 5)
+
+    @event.listens_for(DatabaseSessionClass, 'after_commit')
+    def event_after_commit(session: DatabaseSessionClass):
+        rich_console.print(
+            Text.assemble(
+                ('session:', 'bold'), ' COMMIT ', repr_highlighter(repr(session.info))
             )
-        print_stack()
-
-    @sa.event.listens_for(DatabaseSessionClass, 'after_commit')
-    def event_after_commit(session):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL} COMMIT"
-            f" ({session.info!r})"
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'after_flush')
-    def event_after_flush(session, _flush_context):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL} FLUSH"
-            f" ({session.info})"
+    @event.listens_for(DatabaseSessionClass, 'after_flush')
+    def event_after_flush(session: DatabaseSessionClass, _flush_context):
+        rich_console.print(
+            Text.assemble(
+                ('session:', 'bold'), ' FLUSH ', repr_highlighter(repr(session.info))
+            )
         )
 
-    @sa.event.listens_for(DatabaseSessionClass, 'after_rollback')
-    def event_after_rollback(session):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL} ROLLBACK"
-            f" ({session.info})"
+    @event.listens_for(DatabaseSessionClass, 'after_rollback')
+    def event_after_rollback(session: DatabaseSessionClass):
+        rich_console.print(
+            Text.assemble(
+                ('session:', 'bold'), ' ROLLBACK ', repr_highlighter(repr(session.info))
+            )
         )
-        print_stack()
-
-    @sa.event.listens_for(DatabaseSessionClass, 'after_soft_rollback')
-    def event_after_soft_rollback(session, _previous_transaction):
-        print(  # noqa: T201
-            f"{colorama.Style.BRIGHT}session:{colorama.Style.NORMAL} SOFT ROLLBACK"
-            f" ({session.info})"
+        print_stack(0, 5)
+
+    @event.listens_for(DatabaseSessionClass, 'after_soft_rollback')
+    def event_after_soft_rollback(session: DatabaseSessionClass, _previous_transaction):
+        rich_console.print(
+            Text.assemble(
+                ('session:', 'bold'),
+                ' SOFT ROLLBACK ',
+                repr_highlighter(repr(session.info)),
+            )
         )
-        print_stack()
+        print_stack(0, 5)
 
-    @sa.event.listens_for(DatabaseSessionClass, 'after_transaction_create')
-    def event_after_transaction_create(_session, transaction):
+    @event.listens_for(DatabaseSessionClass, 'after_transaction_create')
+    def event_after_transaction_create(
+        _session, transaction: sa_orm.SessionTransaction
+    ):
         if transaction.nested:
-            if transaction.parent.nested:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL}"
-                    f" CREATE (savepoint)"
-                )
+            if transaction.parent and transaction.parent.nested:
+                rich_console.print("[bold]transaction:[/] CREATE (savepoint)")
             else:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL}"
-                    f" CREATE (fixture)"
-                )
+                rich_console.print("[bold]transaction:[/] CREATE (fixture)")
         else:
-            print(  # noqa: T201
-                f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL}"
-                f" CREATE (db)"
-            )
-        print_stack()
+            rich_console.print("[bold]transaction:[/] CREATE (db)")
+        print_stack(0, 5)
 
-    @sa.event.listens_for(DatabaseSessionClass, 'after_transaction_end')
-    def event_after_transaction_end(_session, transaction):
+    @event.listens_for(DatabaseSessionClass, 'after_transaction_end')
+    def event_after_transaction_end(_session, transaction: sa_orm.SessionTransaction):
         if transaction.nested:
-            if transaction.parent.nested:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL} END"
-                    f" (double nested)"
-                )
+            if transaction.parent and transaction.parent.nested:
+                rich_console.print("[bold]transaction:[/] END (double nested)")
             else:
-                print(  # noqa: T201
-                    f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL} END"
-                    f" (nested)"
-                )
+                rich_console.print("[bold]transaction:[/] END (nested)")
         else:
-            print(  # noqa: T201
-                f"{colorama.Style.BRIGHT}transaction:{colorama.Style.NORMAL} END"
-                f" (outer)"
-            )
-        print_stack()
+            rich_console.print("[bold]transaction:[/] END (outer)")
+        print_stack(0, 5)
 
     yield
 
-    sa.event.remove(models.Model, 'init', event_init)
-    sa.event.remove(
+    event.remove(models.Model, 'init', event_init)
+    event.remove(
         DatabaseSessionClass, 'transient_to_pending', event_transient_to_pending
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'pending_to_transient', event_pending_to_transient
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'pending_to_persistent', event_pending_to_persistent
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'loaded_as_persistent', event_loaded_as_persistent
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'persistent_to_transient', event_persistent_to_transient
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'persistent_to_deleted', event_persistent_to_deleted
     )
-    sa.event.remove(
-        DatabaseSessionClass, 'deleted_to_detached', event_deleted_to_detached
-    )
-    sa.event.remove(
+    event.remove(DatabaseSessionClass, 'deleted_to_detached', event_deleted_to_detached)
+    event.remove(
         DatabaseSessionClass, 'persistent_to_detached', event_persistent_to_detached
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'detached_to_persistent', event_detached_to_persistent
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'deleted_to_persistent', event_deleted_to_persistent
     )
-    sa.event.remove(DatabaseSessionClass, 'do_orm_execute', event_do_orm_execute)
-    sa.event.remove(DatabaseSessionClass, 'after_begin', event_after_begin)
-    sa.event.remove(DatabaseSessionClass, 'after_commit', event_after_commit)
-    sa.event.remove(DatabaseSessionClass, 'after_flush', event_after_flush)
-    sa.event.remove(DatabaseSessionClass, 'after_rollback', event_after_rollback)
-    sa.event.remove(
-        DatabaseSessionClass, 'after_soft_rollback', event_after_soft_rollback
-    )
-    sa.event.remove(
+    event.remove(DatabaseSessionClass, 'do_orm_execute', event_do_orm_execute)
+    event.remove(DatabaseSessionClass, 'after_begin', event_after_begin)
+    event.remove(DatabaseSessionClass, 'after_commit', event_after_commit)
+    event.remove(DatabaseSessionClass, 'after_flush', event_after_flush)
+    event.remove(DatabaseSessionClass, 'after_rollback', event_after_rollback)
+    event.remove(DatabaseSessionClass, 'after_soft_rollback', event_after_soft_rollback)
+    event.remove(
         DatabaseSessionClass, 'after_transaction_create', event_after_transaction_create
     )
-    sa.event.remove(
+    event.remove(
         DatabaseSessionClass, 'after_transaction_end', event_after_transaction_end
     )
 
@@ -851,8 +884,8 @@ def _truncate_all_tables(engine: sa.Engine) -> None:
     """Truncate all tables in the given database engine."""
     deadlock_retries = 0
     while True:
-        try:
-            with engine.begin() as transaction:
+        with engine.begin() as transaction:
+            try:
                 transaction.execute(
                     sa.text(
                         '''
@@ -869,34 +902,35 @@ def _truncate_all_tables(engine: sa.Engine) -> None:
                         END; $$'''
                     )
                 )
-            break
-        except sa.exc.OperationalError:
-            # The TRUNCATE TABLE call will occasionally have a deadlock when the
-            # background server process has not finalised the transaction. SQLAlchemy
-            # recasts :exc:`psycopg.errors.DeadlockDetected` as
-            # :exc:`sqlalchemy.exc.OperationalError`. Pytest will show as::
-            #
-            #     ERROR <filename> - sqlalchemy.exc.OperationalError:
-            #     (psycopg.errors.DeadlockDetected) deadlock detected
-            #     DETAIL: Process <pid1> waits for AccessExclusiveLock on relation
-            #     <rel1> of database <db>; blocked by process <pid2>. Process <pid2>
-            #     waits for AccessShareLock on relation <rel2> of database <db>;
-            #     blocked by process <pid1>.
-            #
-            # We overcome the deadlock by rolling back the transaction, sleeping a
-            # second and attempting to truncate again, retrying two more times. If the
-            # deadlock remains unresolved, we raise the error to pytest. We are not
-            # explicitly checking for OperationalError wrapping DeadlockDetected on the
-            # assumption that this retry is safe for all operational errors. Any new
-            # type of non-transient error will be reported by the final raise.
-            if (deadlock_retries := deadlock_retries + 1) > 3:
-                raise
-            transaction.rollback()
+                break
+            except sa_exc.OperationalError:
+                # The TRUNCATE TABLE call will occasionally have a deadlock when the
+                # background server process has not finalised the transaction.
+                # SQLAlchemy recasts :exc:`psycopg.errors.DeadlockDetected` as
+                # :exc:`sqlalchemy.exc.OperationalError`. Pytest will show as::
+                #
+                #     ERROR <filename> - sqlalchemy.exc.OperationalError:
+                #     (psycopg.errors.DeadlockDetected) deadlock detected
+                #     DETAIL: Process <pid1> waits for AccessExclusiveLock on relation
+                #     <rel1> of database <db>; blocked by process <pid2>. Process <pid2>
+                #     waits for AccessShareLock on relation <rel2> of database <db>;
+                #     blocked by process <pid1>.
+                #
+                # We overcome the deadlock by rolling back the transaction, sleeping a
+                # second and attempting to truncate again, retrying two more times. If
+                # the deadlock remains unresolved, we raise the error to pytest. We are
+                # not explicitly checking for OperationalError wrapping DeadlockDetected
+                # on the assumption that this retry is safe for all operational errors.
+                # Any new type of non-transient error will be reported by the final
+                # raise.
+                if (deadlock_retries := deadlock_retries + 1) > 3:
+                    raise
+                transaction.rollback()
             time.sleep(1)
 
 
 @pytest.fixture(scope='session')
-def database(funnel, models, request, app) -> SQLAlchemy:
+def database(funnel, models, request: pytest.FixtureRequest, app: Flask) -> SQLAlchemy:
     """Provide a database structure."""
     with app.app_context():
         models.db.create_all()
@@ -916,11 +950,11 @@ def drop_tables():
 
 @pytest.fixture()
 def db_session_truncate(
-    funnel, app, database, app_context
-) -> Iterator[DatabaseSessionClass]:
+    funnel, app, database: SQLAlchemy, app_context
+) -> Generator[scoped_session, None, None]:
     """Empty the database after each use of the fixture."""
     yield database.session
-    sa.orm.close_all_sessions()
+    sa_orm.close_all_sessions()
 
     # Iterate through all database engines and empty their tables
     for engine in database.engines.values():
@@ -957,20 +991,26 @@ def get_bind(
         if bind is not None:
             return bind
         if mapper is not None:
-            mapper = sa.inspect(mapper)
-            table = mapper.local_table
-            bind_key = table.metadata.info.get('bind_key')
-            return self.bindcts[bind_key].connection
+            mapper_insp: sa_orm.Mapper = sa.inspect(mapper)
+            table = mapper_insp.local_table
+            if isinstance(table, sa.Table):
+                # This is always a table when using SQLAlchemy declarative with
+                # __table__ or __tablename__ in a model
+                bind_key = table.metadata.info.get('bind_key')
+                return self.bindcts[bind_key].connection
+            raise NotImplementedError(  # pragma: no cover
+                f"Unexpected mapper local_table type: {table!r}"
+            )
         if isinstance(clause, sa.Table):
-            bind_key = table.metadata.info.get('bind_key')
+            bind_key = clause.metadata.info.get('bind_key')
             return self.bindcts[bind_key].connection
         return self.bindcts[None].connection
 
 
 @pytest.fixture()
 def db_session_rollback(
-    funnel, app, database, app_context
-) -> Iterator[DatabaseSessionClass]:
+    funnel, app: Flask, database: SQLAlchemy, app_context: AppContext
+) -> Generator[scoped_session, None, None]:
     """Create a nested transaction for the test and rollback after."""
     original_session = database.session
 
@@ -1010,7 +1050,7 @@ def db_session_rollback(
 
 
 @pytest.fixture()
-def db_session(request) -> DatabaseSessionClass:
+def db_session(request: pytest.FixtureRequest) -> scoped_session:
     """
     Database session fixture.
 
@@ -1037,20 +1077,68 @@ def db_session(request) -> DatabaseSessionClass:
         db_session_implementations[
             'truncate'
             if request.node.get_closest_marker('dbcommit')
-            else request.config.getoption('--dbsession')
+            else cast(str, request.config.getoption('--dbsession'))
         ]
     )
 
 
+class TestClient(FlaskClient):
+    """Dummy subclass used for corrected type hints as FlaskClient is not a Generic."""
+
+    # Tell Pytest this class isn't a test
+    __test__ = False
+
+    if TYPE_CHECKING:
+
+        def open(  # type: ignore[override]  # noqa: A001
+            self,
+            *args: Any,
+            buffered: bool = False,
+            follow_redirects: bool = False,
+            **kwargs: Any,
+        ) -> TestResponse:
+            ...
+
+        def get(self, *args: Any, **kw: Any) -> TestResponse:  # type: ignore[override]
+            ...
+
+        def post(self, *args: Any, **kw: Any) -> TestResponse:  # type: ignore[override]
+            ...
+
+        def put(self, *args: Any, **kw: Any) -> TestResponse:  # type: ignore[override]
+            ...
+
+        def delete(  # type: ignore[override]
+            self, *args: Any, **kw: Any
+        ) -> TestResponse:
+            ...
+
+        def patch(  # type: ignore[override]
+            self, *args: Any, **kw: Any
+        ) -> TestResponse:
+            ...
+
+        def options(  # type: ignore[override]
+            self, *args: Any, **kw: Any
+        ) -> TestResponse:
+            ...
+
+        def head(self, *args: Any, **kw: Any) -> TestResponse:  # type: ignore[override]
+            ...
+
+        def trace(  # type: ignore[override]
+            self, *args: Any, **kw: Any
+        ) -> TestResponse:
+            ...
+
+
 @pytest.fixture()
-def client(response_with_forms, app, db_session) -> FlaskClient:
+def client(app: Flask, db_session: scoped_session) -> TestClient:
     """Provide a test client that commits the db session before any action."""
-    from flask.testing import FlaskClient
-
-    client: FlaskClient = FlaskClient(app, response_with_forms, use_cookies=True)
+    client = TestClient(app, TestResponse, use_cookies=True)
     client_open = client.open
 
-    def commit_before_open(*args, **kwargs):
+    def commit_before_open(*args: Any, **kwargs: Any):
         db_session.commit()
         return client_open(*args, **kwargs)
 
@@ -1058,11 +1146,19 @@ def commit_before_open(*args, **kwargs):
     return client
 
 
+@runtime_checkable
+class LiveServerProtocol(Protocol):
+    background_worker: BackgroundWorker
+    transport_calls: CapturedCalls
+    url: str
+    urls: list[str]
+
+
 @pytest.fixture(scope='session')
-def live_server(funnel_devtest, app, database):
+def live_server(
+    funnel_devtest, app: Flask, database: SQLAlchemy
+) -> Generator[LiveServerProtocol, None, None]:
     """Run application in a separate process."""
-    from werkzeug import run_simple
-
     # Use HTTPS for live server (set to False if required)
     use_https = True
     scheme = 'https' if use_https else 'http'
@@ -1100,23 +1196,26 @@ def live_server(funnel_devtest, app, database):
             probe_at=('127.0.0.1', port),
             mock_transports=True,
         ) as server:
-            yield SimpleNamespace(
-                background_worker=server,
-                transport_calls=server.calls,
-                url=f'{scheme}://{app.config["SERVER_NAME"]}/',
-                urls=[
-                    f'{scheme}://{m_app.config["SERVER_NAME"]}/'
-                    for m_app in funnel_devtest.devtest_app.apps_by_host.values()
-                ],
+            yield cast(
+                LiveServerProtocol,
+                SimpleNamespace(
+                    background_worker=server,
+                    transport_calls=server.calls,
+                    url=f'{scheme}://{app.config["SERVER_NAME"]}/',
+                    urls=[
+                        f'{scheme}://{m_app.config["SERVER_NAME"]}/'
+                        for m_app in funnel_devtest.devtest_app.apps_by_host.values()
+                    ],
+                ),
             )
 
 
 @pytest.fixture()
-def csrf_token(app, client) -> str:
+def csrf_token(app: Flask, client: TestClient) -> str:
     """Supply a CSRF token for use in form submissions."""
     field_name = app.config.get('WTF_CSRF_FIELD_NAME', 'csrf_token')
     with app.test_request_context():
-        token = flask_wtf.csrf.generate_csrf()
+        token = generate_csrf()
         assert field_name in session
         session_token = session[field_name]
     with client.session_transaction() as client_session:
@@ -1124,8 +1223,19 @@ def csrf_token(app, client) -> str:
     return token
 
 
+@runtime_checkable
+class LoginFixtureProtocol(Protocol):
+    def as_(self, user: funnel_models.User) -> None:
+        ...
+
+    def logout(self) -> None:
+        ...
+
+
 @pytest.fixture()
-def login(app, client, db_session) -> SimpleNamespace:
+def login(
+    app: Flask, client: TestClient, db_session: scoped_session
+) -> LoginFixtureProtocol:
     """Provide a login fixture."""
 
     def as_(user) -> None:
@@ -1140,11 +1250,11 @@ def as_(user) -> None:
 
     def logout() -> None:
         # TODO: Test this
-        client.delete_cookie(
-            client.server_name, 'lastuser', domain=app.config['LASTUSER_COOKIE_DOMAIN']
-        )
+        client.delete_cookie('lastuser', domain=app.config['LASTUSER_COOKIE_DOMAIN'])
 
-    return SimpleNamespace(as_=as_, logout=logout)
+    return SimpleNamespace(  # pyright: ignore[reportGeneralTypeIssues]
+        as_=as_, logout=logout
+    )
 
 
 # --- Sample data: users, organizations, projects, etc ---------------------------------
@@ -1157,8 +1267,16 @@ def logout() -> None:
 # --- Users
 
 
+@runtime_checkable
+class GetUserProtocol(Protocol):
+    usermap: dict[str, str]
+
+    def __call__(self, user: str) -> funnel_models.User:
+        ...
+
+
 @pytest.fixture()
-def getuser(request) -> Callable[[str], funnel_models.User]:
+def getuser(request: pytest.FixtureRequest) -> GetUserProtocol:
     """Get a user fixture by their name."""
     usermap = {
         "Twoflower": 'user_twoflower',
@@ -1196,12 +1314,14 @@ def func(user: str) -> funnel_models.User:
             pytest.fail(f"No user fixture named {user}")
         return request.getfixturevalue(usermap[user])
 
-    func.usermap = usermap  # Aid for tests
+    func = cast(GetUserProtocol, func)
+    # Aid for tests
+    func.usermap = usermap
     return func
 
 
 @pytest.fixture()
-def user_twoflower(models, db_session) -> funnel_models.User:
+def user_twoflower(models, db_session: scoped_session) -> funnel_models.User:
     """
     Twoflower is a tourist from the Agatean Empire who goes on adventures.
 
@@ -1215,7 +1335,7 @@ def user_twoflower(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_rincewind(models, db_session) -> funnel_models.User:
+def user_rincewind(models, db_session: scoped_session) -> funnel_models.User:
     """
     Rincewind is a wizard and a former member of Unseen University.
 
@@ -1228,7 +1348,7 @@ def user_rincewind(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_death(models, db_session) -> funnel_models.User:
+def user_death(models, db_session: scoped_session) -> funnel_models.User:
     """
     Death is the epoch user, present at the beginning and always having the last word.
 
@@ -1247,7 +1367,7 @@ def user_death(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_mort(models, db_session) -> funnel_models.User:
+def user_mort(models, db_session: scoped_session) -> funnel_models.User:
     """
     Mort is Death's apprentice, and a site admin in tests.
 
@@ -1263,7 +1383,7 @@ def user_mort(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_susan(models, db_session) -> funnel_models.User:
+def user_susan(models, db_session: scoped_session) -> funnel_models.User:
     """
     Susan Sto Helit (also written Sto-Helit) is Death's grand daughter.
 
@@ -1275,7 +1395,7 @@ def user_susan(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_lutze(models, db_session) -> funnel_models.User:
+def user_lutze(models, db_session: scoped_session) -> funnel_models.User:
     """
     Lu-Tze is a history monk and sweeper at the Monastery of Oi-Dong.
 
@@ -1287,7 +1407,7 @@ def user_lutze(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_ridcully(models, db_session) -> funnel_models.User:
+def user_ridcully(models, db_session: scoped_session) -> funnel_models.User:
     """
     Mustrum Ridcully, archchancellor of Unseen University.
 
@@ -1299,7 +1419,7 @@ def user_ridcully(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_librarian(models, db_session) -> funnel_models.User:
+def user_librarian(models, db_session: scoped_session) -> funnel_models.User:
     """
     Librarian of Unseen University, currently an orangutan.
 
@@ -1311,7 +1431,7 @@ def user_librarian(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_ponder_stibbons(models, db_session) -> funnel_models.User:
+def user_ponder_stibbons(models, db_session: scoped_session) -> funnel_models.User:
     """
     Ponder Stibbons, maintainer of Hex, the computer powered by an Anthill Inside.
 
@@ -1323,7 +1443,7 @@ def user_ponder_stibbons(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_vetinari(models, db_session) -> funnel_models.User:
+def user_vetinari(models, db_session: scoped_session) -> funnel_models.User:
     """
     Havelock Vetinari, patrician (aka dictator) of Ankh-Morpork.
 
@@ -1335,7 +1455,7 @@ def user_vetinari(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_vimes(models, db_session) -> funnel_models.User:
+def user_vimes(models, db_session: scoped_session) -> funnel_models.User:
     """
     Samuel Vimes, commander of the Ankh-Morpork City Watch.
 
@@ -1347,7 +1467,7 @@ def user_vimes(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_carrot(models, db_session) -> funnel_models.User:
+def user_carrot(models, db_session: scoped_session) -> funnel_models.User:
     """
     Carrot Ironfoundersson, captain of the Ankh-Morpork City Watch.
 
@@ -1359,7 +1479,7 @@ def user_carrot(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_angua(models, db_session) -> funnel_models.User:
+def user_angua(models, db_session: scoped_session) -> funnel_models.User:
     """
     Delphine Angua von Überwald, member of the Ankh-Morpork City Watch, and foreigner.
 
@@ -1377,7 +1497,7 @@ def user_angua(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_dibbler(models, db_session) -> funnel_models.User:
+def user_dibbler(models, db_session: scoped_session) -> funnel_models.User:
     """
     Cut Me Own Throat (or C.M.O.T) Dibbler, huckster who exploits small opportunities.
 
@@ -1389,7 +1509,7 @@ def user_dibbler(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_wolfgang(models, db_session) -> funnel_models.User:
+def user_wolfgang(models, db_session: scoped_session) -> funnel_models.User:
     """
     Wolfgang von Überwald, brother of Angua, violent shapeshifter.
 
@@ -1402,7 +1522,7 @@ def user_wolfgang(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def user_om(models, db_session) -> funnel_models.User:
+def user_om(models, db_session: scoped_session) -> funnel_models.User:
     """
     Great God Om of the theocracy of Omnia, who has lost his believers.
 
@@ -1418,7 +1538,9 @@ def user_om(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def org_ankhmorpork(models, db_session, user_vetinari) -> funnel_models.Organization:
+def org_ankhmorpork(
+    models, db_session: scoped_session, user_vetinari: funnel_models.User
+) -> funnel_models.Organization:
     """
     City of Ankh-Morpork, here representing the government rather than location.
 
@@ -1434,7 +1556,11 @@ def org_ankhmorpork(models, db_session, user_vetinari) -> funnel_models.Organiza
 
 @pytest.fixture()
 def org_uu(
-    models, db_session, user_ridcully, user_librarian, user_ponder_stibbons
+    models,
+    db_session: scoped_session,
+    user_ridcully: funnel_models.User,
+    user_librarian: funnel_models.User,
+    user_ponder_stibbons: funnel_models.User,
 ) -> funnel_models.Organization:
     """
     Unseen University is located in Ankh-Morpork.
@@ -1469,7 +1595,11 @@ def org_uu(
 
 @pytest.fixture()
 def org_citywatch(
-    models, db_session, user_vetinari, user_vimes, user_carrot
+    models,
+    db_session: scoped_session,
+    user_vetinari: funnel_models.User,
+    user_vimes: funnel_models.User,
+    user_carrot: funnel_models.User,
 ) -> funnel_models.Organization:
     """
     City Watch of Ankh-Morpork (a sub-organization).
@@ -1508,7 +1638,10 @@ def org_citywatch(
 
 @pytest.fixture()
 def project_expo2010(
-    models, db_session, org_ankhmorpork, user_vetinari
+    models,
+    db_session: scoped_session,
+    org_ankhmorpork: funnel_models.Organization,
+    user_vetinari: funnel_models.User,
 ) -> funnel_models.Project:
     """Ankh-Morpork hosts its 2010 expo."""
     db_session.flush()
@@ -1526,7 +1659,10 @@ def project_expo2010(
 
 @pytest.fixture()
 def project_expo2011(
-    models, db_session, org_ankhmorpork, user_vetinari
+    models,
+    db_session: scoped_session,
+    org_ankhmorpork: funnel_models.Organization,
+    user_vetinari: funnel_models.User,
 ) -> funnel_models.Project:
     """Ankh-Morpork hosts its 2011 expo."""
     db_session.flush()
@@ -1544,7 +1680,10 @@ def project_expo2011(
 
 @pytest.fixture()
 def project_ai1(
-    models, db_session, org_uu, user_ponder_stibbons
+    models,
+    db_session: scoped_session,
+    org_uu: funnel_models.Organization,
+    user_ponder_stibbons: funnel_models.User,
 ) -> funnel_models.Project:
     """
     Anthill Inside conference, hosted by Unseen University (an inspired event).
@@ -1571,7 +1710,10 @@ def project_ai1(
 
 @pytest.fixture()
 def project_ai2(
-    models, db_session, org_uu, user_ponder_stibbons
+    models,
+    db_session: scoped_session,
+    org_uu: funnel_models.Organization,
+    user_ponder_stibbons: funnel_models.User,
 ) -> funnel_models.Project:
     """
     Anthill Inside conference, hosted by Unseen University (an inspired event).
@@ -1596,7 +1738,9 @@ def project_ai2(
 
 
 @pytest.fixture()
-def client_hex(models, db_session, org_uu) -> funnel_models.Project:
+def client_hex(
+    models, db_session: scoped_session, org_uu: funnel_models.Organization
+) -> funnel_models.AuthClient:
     """
     Hex, supercomputer at Unseen University, powered by an Anthill Inside.
 
@@ -1614,40 +1758,48 @@ def client_hex(models, db_session, org_uu) -> funnel_models.Project:
     return auth_client
 
 
+@runtime_checkable
+class CredProtocol(Protocol):
+    cred: funnel_models.AuthClientCredential
+    secret: str
+
+
 @pytest.fixture()
-def client_hex_credential(models, db_session, client_hex) -> SimpleNamespace:
+def client_hex_credential(
+    models, db_session: scoped_session, client_hex: funnel_models.AuthClient
+) -> CredProtocol:
     cred, secret = models.AuthClientCredential.new(client_hex)
     db_session.add(cred)
-    return SimpleNamespace(cred=cred, secret=secret)
+    return cast(CredProtocol, SimpleNamespace(cred=cred, secret=secret))
 
 
 @pytest.fixture()
 def all_fixtures(  # pylint: disable=too-many-locals
-    db_session,
-    user_twoflower,
-    user_rincewind,
-    user_death,
-    user_mort,
-    user_susan,
-    user_lutze,
-    user_ridcully,
-    user_librarian,
-    user_ponder_stibbons,
-    user_vetinari,
-    user_vimes,
-    user_carrot,
-    user_angua,
-    user_dibbler,
-    user_wolfgang,
-    user_om,
-    org_ankhmorpork,
-    org_uu,
-    org_citywatch,
-    project_expo2010,
-    project_expo2011,
-    project_ai1,
-    project_ai2,
-    client_hex,
+    db_session: scoped_session,
+    user_twoflower: funnel_models.User,
+    user_rincewind: funnel_models.User,
+    user_death: funnel_models.User,
+    user_mort: funnel_models.User,
+    user_susan: funnel_models.User,
+    user_lutze: funnel_models.User,
+    user_ridcully: funnel_models.User,
+    user_librarian: funnel_models.User,
+    user_ponder_stibbons: funnel_models.User,
+    user_vetinari: funnel_models.User,
+    user_vimes: funnel_models.User,
+    user_carrot: funnel_models.User,
+    user_angua: funnel_models.User,
+    user_dibbler: funnel_models.User,
+    user_wolfgang: funnel_models.User,
+    user_om: funnel_models.User,
+    org_ankhmorpork: funnel_models.User,
+    org_uu: funnel_models.User,
+    org_citywatch: funnel_models.User,
+    project_expo2010: funnel_models.User,
+    project_expo2011: funnel_models.User,
+    project_ai1: funnel_models.User,
+    project_ai2: funnel_models.User,
+    client_hex: funnel_models.User,
 ) -> SimpleNamespace:
     """Return All Discworld fixtures at once."""
     db_session.commit()
@@ -1681,7 +1833,7 @@ def all_fixtures(  # pylint: disable=too-many-locals
 
 
 @pytest.fixture()
-def new_user(models, db_session) -> funnel_models.User:
+def new_user(models, db_session: scoped_session) -> funnel_models.User:
     user = models.User(**TEST_DATA['users']['testuser'])
     db_session.add(user)
     db_session.commit()
@@ -1689,7 +1841,7 @@ def new_user(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def new_user2(models, db_session) -> funnel_models.User:
+def new_user2(models, db_session: scoped_session) -> funnel_models.User:
     user = models.User(**TEST_DATA['users']['testuser2'])
     db_session.add(user)
     db_session.commit()
@@ -1697,7 +1849,7 @@ def new_user2(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def new_user_owner(models, db_session) -> funnel_models.User:
+def new_user_owner(models, db_session: scoped_session) -> funnel_models.User:
     user = models.User(**TEST_DATA['users']['test_org_owner'])
     db_session.add(user)
     db_session.commit()
@@ -1705,7 +1857,7 @@ def new_user_owner(models, db_session) -> funnel_models.User:
 
 
 @pytest.fixture()
-def new_user_admin(models, db_session) -> funnel_models.User:
+def new_user_admin(models, db_session: scoped_session) -> funnel_models.User:
     user = models.User(**TEST_DATA['users']['test_org_admin'])
     db_session.add(user)
     db_session.commit()
@@ -1714,7 +1866,10 @@ def new_user_admin(models, db_session) -> funnel_models.User:
 
 @pytest.fixture()
 def new_organization(
-    models, db_session, new_user_owner, new_user_admin
+    models,
+    db_session: scoped_session,
+    new_user_owner: funnel_models.User,
+    new_user_admin: funnel_models.User,
 ) -> funnel_models.Organization:
     org = models.Organization(owner=new_user_owner, title="Test org", name='test_org')
     db_session.add(org)
@@ -1731,7 +1886,12 @@ def new_organization(
 
 
 @pytest.fixture()
-def new_team(models, db_session, new_user, new_organization) -> funnel_models.Team:
+def new_team(
+    models,
+    db_session: scoped_session,
+    new_user: funnel_models.User,
+    new_organization: funnel_models.Organization,
+) -> funnel_models.Team:
     team = models.Team(title="Owners", account=new_organization)
     db_session.add(team)
     team.users.append(new_user)
@@ -1741,7 +1901,10 @@ def new_team(models, db_session, new_user, new_organization) -> funnel_models.Te
 
 @pytest.fixture()
 def new_project(
-    models, db_session, new_organization, new_user
+    models,
+    db_session: scoped_session,
+    new_organization: funnel_models.Organization,
+    new_user: funnel_models.User,
 ) -> funnel_models.Project:
     project = models.Project(
         account=new_organization,
@@ -1758,7 +1921,10 @@ def new_project(
 
 @pytest.fixture()
 def new_project2(
-    models, db_session, new_organization, new_user_owner
+    models,
+    db_session: scoped_session,
+    new_organization: funnel_models.Organization,
+    new_user_owner: funnel_models.User,
 ) -> funnel_models.Project:
     project = models.Project(
         account=new_organization,
@@ -1774,7 +1940,9 @@ def new_project2(
 
 
 @pytest.fixture()
-def new_main_label(models, db_session, new_project) -> funnel_models.Label:
+def new_main_label(
+    models, db_session: scoped_session, new_project: funnel_models.Project
+) -> funnel_models.Label:
     main_label_a = models.Label(
         title="Parent Label A", project=new_project, description="A test parent label"
     )
@@ -1792,7 +1960,9 @@ def new_main_label(models, db_session, new_project) -> funnel_models.Label:
 
 
 @pytest.fixture()
-def new_main_label_unrestricted(models, db_session, new_project) -> funnel_models.Label:
+def new_main_label_unrestricted(
+    models, db_session: scoped_session, new_project: funnel_models.Project
+) -> funnel_models.Label:
     main_label_b = models.Label(
         title="Parent Label B", project=new_project, description="A test parent label"
     )
@@ -1810,7 +1980,9 @@ def new_main_label_unrestricted(models, db_session, new_project) -> funnel_model
 
 
 @pytest.fixture()
-def new_label(models, db_session, new_project) -> funnel_models.Label:
+def new_label(
+    models, db_session: scoped_session, new_project: funnel_models.Project
+) -> funnel_models.Label:
     label_b = models.Label(title="Label B", icon_emoji="🔟", project=new_project)
     new_project.all_labels.append(label_b)
     db_session.add(label_b)
@@ -1819,7 +1991,12 @@ def new_label(models, db_session, new_project) -> funnel_models.Label:
 
 
 @pytest.fixture()
-def new_proposal(models, db_session, new_user, new_project) -> funnel_models.Proposal:
+def new_proposal(
+    models,
+    db_session: scoped_session,
+    new_user: funnel_models.User,
+    new_project: funnel_models.Project,
+) -> funnel_models.Proposal:
     proposal = models.Proposal(
         created_by=new_user,
         project=new_project,
@@ -1832,8 +2009,8 @@ def new_proposal(models, db_session, new_user, new_project) -> funnel_models.Pro
 
 
 @pytest.fixture()
-def fail_with_diff():
-    def func(left, right):
+def fail_with_diff() -> Callable[[str, str], None]:
+    def func(left: str, right: str) -> None:
         if left != right:
             difference = unified_diff(left.split('\n'), right.split('\n'))
             msg = []
diff --git a/tests/e2e/__init__.py b/tests/e2e/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/account/__init__.py b/tests/e2e/account/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/account/register_test.py b/tests/e2e/account/register_test.py
index cabce120c..39308c211 100644
--- a/tests/e2e/account/register_test.py
+++ b/tests/e2e/account/register_test.py
@@ -4,11 +4,14 @@
 import re
 
 import pytest
+from flask import Flask
 from playwright.sync_api import Page, expect
 from pytest_bdd import given, parsers, scenarios, then, when
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 scenarios('account/register.feature')
 pytestmark = pytest.mark.usefixtures('live_server')
 
@@ -25,17 +28,19 @@
 
 
 @pytest.fixture()
-def published_project(db_session, new_project: models.Project) -> models.Project:
+def published_project(
+    db_session: scoped_session, new_project: models.Project
+) -> models.Project:
     """Published project fixture."""
     new_project.publish()
-    new_project.rsvp_state = models.PROJECT_RSVP_STATE.ALL
+    new_project.rsvp_state = models.ProjectRsvpStateEnum.ALL
     db_session.commit()
     return new_project
 
 
 @pytest.fixture()
 def user_twoflower_with_password_and_contact(
-    db_session, user_twoflower: models.User
+    db_session: scoped_session, user_twoflower: models.User
 ) -> models.User:
     """User fixture with a password and contact."""
     user_twoflower.password = TWOFLOWER_PASSWORD
@@ -66,7 +71,7 @@ def given_anonuser_home_page(live_server, page: Page) -> None:
     target_fixture='anon_username',
 )
 def when_anonuser_navigates_login_and_submits(
-    app, live_server, phone_or_email: str, page: Page
+    app: Flask, live_server, phone_or_email: str, page: Page
 ) -> dict[str, str]:
     if phone_or_email == "a phone number":
         username = ANONYMOUS_PHONE
@@ -76,22 +81,30 @@ def when_anonuser_navigates_login_and_submits(
         pytest.fail("Unknown username type")
     page.click('.header__button')
     wait_until_recaptcha_loaded(page)
-    page.wait_for_selector('input[name=username]').fill(username)
+    selector = page.wait_for_selector('input[name=username]')
+    assert selector is not None
+    selector.fill(username)
     page.click('#form-passwordlogin button')
     return {'phone_or_email': phone_or_email, 'username': username}
 
 
 @then("they are prompted for their name and the OTP, which they provide")
 def then_anonuser_prompted_name_and_otp(anon_username, live_server, page: Page) -> None:
-    page.wait_for_selector('input[name=fullname]').fill('Twoflower')
+    selector = page.wait_for_selector('input[name=fullname]')
+    assert selector is not None
+    selector.fill('Twoflower')
     if anon_username['phone_or_email'] == "a phone number":
         otp = live_server.transport_calls.sms[-1].vars['otp']
     elif anon_username['phone_or_email'] == "an email address":
         subject = live_server.transport_calls.email[-1].subject
-        otp = re.search(r'\b\d{4}\b', subject).group(0)
+        match = re.search(r'\b\d{4}\b', subject)
+        assert match is not None
+        otp = match.group(0)
     else:
         pytest.fail("Unknown username type")
-    page.wait_for_selector('input[name=otp]').fill(otp)
+    selector = page.wait_for_selector('input[name=otp]')
+    assert selector is not None
+    selector.fill(otp)
     page.click('#form-otp button')
 
 
@@ -99,10 +112,9 @@ def then_anonuser_prompted_name_and_otp(anon_username, live_server, page: Page)
 def then_they_are_logged_in(
     user_twoflower_with_password_and_contact, live_server, page: Page
 ) -> None:
-    assert (
-        page.wait_for_selector('.alert__text').inner_text()
-        == "You are now one of us. Welcome aboard!"
-    )
+    selector = page.wait_for_selector('.alert__text')
+    assert selector is not None
+    assert selector.inner_text() == "You are now one of us. Welcome aboard!"
 
 
 @given("Twoflower visitor is on the home page")
@@ -122,26 +134,34 @@ def when_navigate_to_login_page(app, live_server, page: Page):
 @when("submit an email address with password")
 def when_submit_email_password(page: Page) -> None:
     wait_until_recaptcha_loaded(page)
-    page.wait_for_selector('input[name=username]').fill(TWOFLOWER_EMAIL)
+    selector = page.wait_for_selector('input[name=username]')
+    assert selector is not None
+    selector.fill(TWOFLOWER_EMAIL)
     page.click('#use-password-login')
-    page.wait_for_selector('input[name=password]').fill(TWOFLOWER_PASSWORD)
+    selector = page.wait_for_selector('input[name=password]')
+    assert selector is not None
+    selector.fill(TWOFLOWER_PASSWORD)
     page.click('#login-btn')
 
 
 @then("they are logged in")
 def then_logged_in(live_server, page: Page) -> None:
-    assert (
-        page.wait_for_selector('.alert__text').inner_text() == "You are now logged in"
-    )
+    selector = page.wait_for_selector('.alert__text')
+    assert selector is not None
+    assert selector.inner_text() == "You are now logged in"
 
 
 @when("they submit the phone number with password")
 @when("submit a phone number with password")
 def when_submit_phone_password(app, live_server, page: Page) -> None:
     wait_until_recaptcha_loaded(page)
-    page.wait_for_selector('input[name=username]').fill(TWOFLOWER_PHONE)
+    selector = page.wait_for_selector('input[name=username]')
+    assert selector is not None
+    selector.fill(TWOFLOWER_PHONE)
     page.click('#use-password-login')
-    page.wait_for_selector('input[name=password]').fill(TWOFLOWER_PASSWORD)
+    selector = page.wait_for_selector('input[name=password]')
+    assert selector is not None
+    selector.fill(TWOFLOWER_PASSWORD)
     page.click('#login-btn')
 
 
@@ -154,13 +174,17 @@ def given_anonymous_project_page(
 
 @when("they click on follow")
 def when_they_click_follow(page: Page) -> None:
-    page.wait_for_selector("#register-nav").click()
+    selector = page.wait_for_selector("#register-nav")
+    assert selector is not None
+    selector.click()
 
 
 @then("a register modal appears")
 def then_register_modal_appear(page: Page) -> None:
+    selector = page.wait_for_selector('xpath=//*[@id="passwordform"]/p[2]')
+    assert selector is not None
     assert (
-        page.wait_for_selector('xpath=//*[@id="passwordform"]/p[2]').inner_text()
+        selector.inner_text()
         == "Tell us where you’d like to get updates. We’ll send an OTP to confirm."
     )
 
@@ -177,7 +201,9 @@ def when_they_enter_email(page: Page, phone_or_email: str) -> dict[str, str]:
         username = ANONYMOUS_EMAIL
     else:
         pytest.fail("Unknown username type")
-    page.wait_for_selector('input[name=username]').fill(username)
+    selector = page.wait_for_selector('input[name=username]')
+    assert selector is not None
+    selector.fill(username)
     page.click('#form-passwordlogin button')
     return {'phone_or_email': phone_or_email, 'username': username}
 
@@ -215,7 +241,11 @@ def when_twoflower_visits_login_page_recaptcha(app, live_server, page: Page) ->
 
 @then("they submit and Recaptcha validation passes")
 def then_submit_recaptcha_validation_passes(live_server, page: Page) -> None:
-    page.wait_for_selector("input[name=username]").fill(TWOFLOWER_EMAIL)
+    selector = page.wait_for_selector("input[name=username]")
+    assert selector is not None
+    selector.fill(TWOFLOWER_EMAIL)
     page.click('#use-password-login')
-    page.wait_for_selector('input[name=password]').fill(TWOFLOWER_PASSWORD)
+    selector = page.wait_for_selector('input[name=password]')
+    assert selector is not None
+    selector.fill(TWOFLOWER_PASSWORD)
     page.click('#login-btn')
diff --git a/tests/e2e/basic/__init__.py b/tests/e2e/basic/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/basic/live_server_test.py b/tests/e2e/basic/live_server_test.py
index 02db67cb5..c88179337 100644
--- a/tests/e2e/basic/live_server_test.py
+++ b/tests/e2e/basic/live_server_test.py
@@ -2,16 +2,26 @@
 
 import re
 
-from playwright.sync_api import expect
+from flask import Flask
+from playwright.sync_api import Page, expect
 
+from funnel import models
 
-def test_open_homepage(live_server, page, db_session, org_uu):
+from ...conftest import LiveServerProtocol, scoped_session
+
+
+def test_open_homepage(
+    live_server: LiveServerProtocol,
+    page: Page,
+    db_session: scoped_session,
+    org_uu: models.Organization,
+):
     page.goto(live_server.url)
     expect(page).to_have_title(re.compile("Test Hasgeek"))
     expect(page.get_by_text("Past sessions")).to_be_visible()
 
 
-def test_transport_mock_sms(live_server, page, app):
+def test_transport_mock_sms(live_server: LiveServerProtocol, page: Page, app: Flask):
     page.goto(app.url_for('login'))
     textbox = page.locator('#username')
     textbox.fill("8123456789")
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
index c867f8843..895ebe145 100644
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -3,10 +3,11 @@
 
 import pytest
 from pytest_socket import enable_socket
+from sqlalchemy.orm import scoped_session
 
 
 @pytest.fixture()
-def db_session(db_session_truncate):
+def db_session(db_session_truncate: scoped_session) -> scoped_session:
     """Use truncate mode for db session."""
     return db_session_truncate
 
diff --git a/tests/e2e/follow/__init__.py b/tests/e2e/follow/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/views/account_add_test.py b/tests/integration/views/account_add_test.py
index 1676402ca..740793782 100644
--- a/tests/integration/views/account_add_test.py
+++ b/tests/integration/views/account_add_test.py
@@ -10,6 +10,8 @@
 
 from funnel import models
 
+from ...conftest import LoginFixtureProtocol, TestClient
+
 PATCH_EMAIL_VALIDATOR = (
     'funnel.models.email_address.EmailAddress.is_valid_email_address'
 )
@@ -41,7 +43,10 @@ def get_wrong_otp(reference: str) -> str:
 
 
 def test_add_email_wrong_otp(
-    client, csrf_token, login, user_rincewind: models.User
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
 ) -> None:
     """Add a new email address with an OTP and confirm an incorrect OTP is rejected."""
     login.as_(user_rincewind)
@@ -65,7 +70,12 @@ def test_add_email_wrong_otp(
         assert 'OTP is incorrect' in rv2.data.decode()
 
 
-def test_add_email(client, csrf_token, login, user_rincewind: models.User) -> None:
+def test_add_email(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
     """Add a new email address with an OTP."""
     login.as_(user_rincewind)
     assert user_rincewind.emails == []
@@ -89,7 +99,11 @@ def test_add_email(client, csrf_token, login, user_rincewind: models.User) -> No
 
 
 def test_merge_with_email_otp(
-    client, csrf_token, login, useremail_rincewind, user_mort
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    useremail_rincewind: models.AccountEmail,
+    user_mort: models.User,
 ) -> None:
     """Providing a valid OTP for another user's email address causes a merge prompt."""
     login.as_(user_mort)
@@ -115,7 +129,10 @@ def test_merge_with_email_otp(
 
 
 def test_add_phone_wrong_otp(
-    client, csrf_token, login, user_rincewind: models.User
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
 ) -> None:
     """Add a new phone number with an OTP and confirm an incorrect OTP is rejected."""
     login.as_(user_rincewind)
@@ -138,7 +155,12 @@ def test_add_phone_wrong_otp(
     assert 'OTP is incorrect' in rv2.data.decode()
 
 
-def test_add_phone(client, csrf_token, login, user_rincewind: models.User) -> None:
+def test_add_phone(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
     """Add a new phone number with an OTP."""
     login.as_(user_rincewind)
     assert user_rincewind.phones == []
@@ -161,7 +183,11 @@ def test_add_phone(client, csrf_token, login, user_rincewind: models.User) -> No
 
 
 def test_merge_with_phone_otp(
-    client, csrf_token, login, userphone_rincewind, user_mort
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    userphone_rincewind: models.AccountPhone,
+    user_mort: models.User,
 ) -> None:
     """Providing a valid OTP for another user's phone number causes a merge prompt."""
     login.as_(user_mort)
diff --git a/tests/integration/views/account_delete_test.py b/tests/integration/views/account_delete_test.py
index 28994bf85..55f3bf83b 100644
--- a/tests/integration/views/account_delete_test.py
+++ b/tests/integration/views/account_delete_test.py
@@ -1,14 +1,17 @@
 """Tests for account deletion."""
 
 from pytest_bdd import given, parsers, scenarios, then, when
+from sqlalchemy.orm import scoped_session
 
 from funnel import models
 
+from ...conftest import GetUserProtocol, TestClient, TestResponse
+
 scenarios('account/delete_confirm.feature')
 
 
 @given(parsers.parse('{user} has a protected account'), target_fixture='current_user')
-def given_protected_account(getuser, user: str) -> models.User:
+def given_protected_account(getuser: GetUserProtocol, user: str) -> models.User:
     user_obj = getuser(user)
     assert user_obj.is_protected is True
     return user_obj
@@ -21,7 +24,9 @@ def given_sole_owner(current_user: models.Account, org_uu: models.Organization)
 
 @given('they are a co-owner of Unseen University', target_fixture='org_owner')
 def given_coowner(
-    db_session, current_user: models.Account, org_uu: models.Organization
+    db_session: scoped_session,
+    current_user: models.Account,
+    org_uu: models.Organization,
 ) -> models.AccountMembership:
     for membership in org_uu.active_admin_memberships:
         if membership.member == current_user:
@@ -41,22 +46,22 @@ def given_coowner(
 
 
 @when('they visit the delete page', target_fixture='delete_page')
-def when_user_visits_delete_page(client) -> None:
+def when_user_visits_delete_page(client: TestClient) -> TestResponse:
     return client.get('/account/delete')
 
 
 @then('they are cleared to delete the account')
-def then_user_delete_confirm(delete_page) -> None:
+def then_user_delete_confirm(delete_page: TestResponse) -> None:
     assert delete_page.form('form-account-delete') is not None
 
 
 @then('they are told they have organizations without co-owners')
-def then_told_unshared_orgs(delete_page) -> None:
+def then_told_unshared_orgs(delete_page: TestResponse) -> None:
     assert delete_page.form('form-account-delete') is None
     assert "organizations without co-owners" in delete_page.data.decode()
 
 
 @then('they are told their account is protected')
-def then_told_protected_account(delete_page) -> None:
+def then_told_protected_account(delete_page: TestResponse) -> None:
     assert delete_page.form('form-account-delete') is None
     assert "This account is protected" in delete_page.data.decode()
diff --git a/tests/integration/views/comment_moderation_test.py b/tests/integration/views/comment_moderation_test.py
index 53c204d6d..eef5899ce 100644
--- a/tests/integration/views/comment_moderation_test.py
+++ b/tests/integration/views/comment_moderation_test.py
@@ -7,18 +7,20 @@
 
 from funnel import models
 
+from ...conftest import LoginFixtureProtocol, TestClient, scoped_session
+
 
 @pytest.mark.usefixtures('app_context')
 def test_comment_report_same(
-    client,
-    db_session,
-    login,
-    new_user,
-    new_user2,
-    new_user_admin,
-    new_user_owner,
-    new_project,
-    csrf_token,
+    client: TestClient,
+    db_session: scoped_session,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_user2: models.User,
+    new_user_admin: models.User,
+    new_user_owner: models.User,
+    new_project: models.Project,
+    csrf_token: str,
 ) -> None:
     # Let's give new_user site_editor role
     sm = models.SiteMembership(
@@ -56,7 +58,7 @@ def test_comment_report_same(
         db_session.commit()
     report1_id = report1.id
 
-    assert comment.is_reviewed_by(new_user_admin)
+    assert comment.was_reviewed_by(new_user_admin)
 
     login.as_(new_user)
 
@@ -86,15 +88,15 @@ def test_comment_report_same(
 
 @pytest.mark.usefixtures('app_context')
 def test_comment_report_opposing(
-    client,
-    db_session,
-    login,
-    new_user,
-    new_user2,
-    new_user_admin,
-    new_user_owner,
-    new_project,
-    csrf_token,
+    client: TestClient,
+    db_session: scoped_session,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_user2: models.User,
+    new_user_admin: models.User,
+    new_user_owner: models.User,
+    new_project: models.Project,
+    csrf_token: str,
 ) -> None:
     # Let's give new_user site_editor role
     sm = models.SiteMembership(
@@ -149,7 +151,7 @@ def test_comment_report_opposing(
     assert bool(comment2_refetched.state.SPAM) is False
     assert bool(comment2_refetched.state.PUBLIC) is True
     # a new report will be created
-    assert comment2_refetched.is_reviewed_by(new_user)
+    assert comment2_refetched.was_reviewed_by(new_user)
     assert (
         models.CommentModeratorReport.query.filter_by(
             comment=comment2_refetched,
@@ -162,15 +164,15 @@ def test_comment_report_opposing(
 
 @pytest.mark.usefixtures('app_context')
 def test_comment_report_majority_spam(
-    client,
-    db_session,
-    login,
-    new_user,
-    new_user2,
-    new_user_admin,
-    new_user_owner,
-    new_project,
-    csrf_token,
+    client: TestClient,
+    db_session: scoped_session,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_user2: models.User,
+    new_user_admin: models.User,
+    new_user_owner: models.User,
+    new_project: models.Project,
+    csrf_token: str,
 ) -> None:
     # Let's give new_user site_editor role
     sm = models.SiteMembership(
@@ -251,15 +253,15 @@ def test_comment_report_majority_spam(
 
 @pytest.mark.usefixtures('app_context')
 def test_comment_report_majority_ok(
-    client,
-    db_session,
-    login,
-    new_user,
-    new_user2,
-    new_user_admin,
-    new_user_owner,
-    new_project,
-    csrf_token,
+    client: TestClient,
+    db_session: scoped_session,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_user2: models.User,
+    new_user_admin: models.User,
+    new_user_owner: models.User,
+    new_project: models.Project,
+    csrf_token: str,
 ) -> None:
     # Let's give new_user site_editor role
     sm = models.SiteMembership(
diff --git a/tests/integration/views/conftest.py b/tests/integration/views/conftest.py
index 979f9bb36..baccfcdcd 100644
--- a/tests/integration/views/conftest.py
+++ b/tests/integration/views/conftest.py
@@ -9,9 +9,13 @@
 if TYPE_CHECKING:
     from funnel import models
 
+    from ...conftest import GetUserProtocol, LoginFixtureProtocol
+
 
 @given(parsers.parse('{user} is logged in'), target_fixture='current_user')
-def given_user_logged_in(getuser, login, user: str) -> models.User:
+def given_user_logged_in(
+    getuser: GetUserProtocol, login: LoginFixtureProtocol, user: str
+) -> models.User:
     user_obj = getuser(user)
     login.as_(user_obj)
     return user_obj
@@ -23,5 +27,7 @@ def given_user_logged_in(getuser, login, user: str) -> models.User:
 @when('they login')
 @when('he logs in')
 @when('she logs in')
-def current_user_logged_in(login, current_user: models.User) -> None:
+def current_user_logged_in(
+    login: LoginFixtureProtocol, current_user: models.User
+) -> None:
     login.as_(current_user)
diff --git a/tests/integration/views/label_views_test.py b/tests/integration/views/label_views_test.py
index 0f83bf7b3..a1b8aee19 100644
--- a/tests/integration/views/label_views_test.py
+++ b/tests/integration/views/label_views_test.py
@@ -1,13 +1,22 @@
 """Test Label views."""
 
 import pytest
+from flask import Flask
 
 from funnel import models
 
+from ...conftest import LoginFixtureProtocol, TestClient
+
 
 @pytest.mark.dbcommit()
 def test_manage_labels_view(
-    app, client, login, new_project, new_user, new_label, new_main_label
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    new_project: models.Project,
+    new_user: models.User,
+    new_label: models.Label,
+    new_main_label: models.Label,
 ) -> None:
     login.as_(new_user)
     resp = client.get(new_project.url_for('labels'))
@@ -17,37 +26,15 @@ def test_manage_labels_view(
 
 
 @pytest.mark.dbcommit()
-def test_edit_option_label_view(app, client, login, new_user, new_main_label) -> None:
+def test_edit_option_label_view(
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_main_label: models.Label,
+) -> None:
     login.as_(new_user)
     opt_label = new_main_label.options[0]
     resp = client.post(opt_label.url_for('edit'), follow_redirects=True)
     assert "Manage labels" in resp.data.decode('utf-8')
     assert "Only main labels can be edited" in resp.data.decode('utf-8')
-
-
-@pytest.mark.xfail(reason="Broken by Flask-SQLAlchemy 3.0, unclear why")  # FIXME
-def test_main_label_delete(client, login, new_user, new_label) -> None:
-    login.as_(new_user)
-    resp = client.post(new_label.url_for('delete'), follow_redirects=True)
-    assert "Manage labels" in resp.data.decode('utf-8')
-    assert "The label has been deleted" in resp.data.decode('utf-8')
-    label = models.Label.query.get(new_label.id)
-    assert label is None
-
-
-@pytest.mark.xfail(reason="Broken after Flask-SQLAlchemy 3.0, unclear why")  # FIXME
-def test_optioned_label_delete(client, login, new_user, new_main_label) -> None:
-    login.as_(new_user)
-    label_a1 = new_main_label.options[0]
-    label_a2 = new_main_label.options[1]
-
-    # let's delete the main optioned label
-    resp = client.post(new_main_label.url_for('delete'), follow_redirects=True)
-    assert "Manage labels" in resp.data.decode('utf-8')
-    assert "The label has been deleted" in resp.data.decode('utf-8')
-    mlabel = models.Label.query.get(new_main_label.id)
-    assert mlabel is None
-
-    # so the option labels should have been deleted as well
-    for olabel in [label_a1, label_a2]:
-        assert models.Label.query.get(olabel.id) is None
diff --git a/tests/integration/views/login_test.py b/tests/integration/views/login_test.py
index 8cdeeab0d..3dce0dda5 100644
--- a/tests/integration/views/login_test.py
+++ b/tests/integration/views/login_test.py
@@ -1,6 +1,7 @@
 """Tests for the login, logout and register views."""
 # pylint: disable=redefined-outer-name
 
+from collections.abc import Callable, Generator, Iterator
 from datetime import timedelta
 from smtplib import SMTPRecipientsRefused
 from types import SimpleNamespace
@@ -10,13 +11,23 @@
 from flask import redirect, request, session
 from werkzeug.datastructures import MultiDict
 
-from coaster.auth import current_auth
 from coaster.utils import utcnow
 
-from funnel.registry import LoginCallbackError, LoginInitError, LoginProviderData
+from funnel import forms, models
+from funnel.auth import current_auth
+from funnel.loginproviders import GitHubProvider
+from funnel.registry import (
+    LoginCallbackError,
+    LoginInitError,
+    LoginProvider,
+    LoginProviderData,
+    login_registry,
+)
 from funnel.transports import TransportConnectionError, TransportRecipientError
 from funnel.views.otp import OtpSession
 
+from ...conftest import LoginFixtureProtocol, TestClient, scoped_session
+
 pytestmark = pytest.mark.filterwarnings(
     "ignore:Object of type <AccountPhone> not in session",
     "ignore:Object of type <AccountEmail> not in session",
@@ -49,11 +60,9 @@
 
 # This fixture needs session scope as login_registry doesn't take kindly to lost items
 @pytest.fixture(scope='session')
-def loginhub(funnel):
+def loginhub() -> Generator[LoginProvider, None, None]:
     """Fake login provider for tests."""
-    funnel.registry.login_registry[
-        'loginhub'
-    ] = funnel.loginproviders.github.GitHubProvider(  # nosec
+    login_registry['loginhub'] = GitHubProvider(  # nosec
         'loginhub',
         "Login Hub",
         at_login=True,
@@ -62,19 +71,21 @@ def loginhub(funnel):
         key='no-key',
         secret='no-secret',
     )
-    yield funnel.registry.login_registry['loginhub']
-    del funnel.registry.login_registry['loginhub']
+    yield login_registry['loginhub']
+    del login_registry['loginhub']
 
 
 @pytest.fixture()
-def user_rincewind_with_password(user_rincewind):
+def user_rincewind_with_password(user_rincewind: models.User) -> models.User:
     """User fixture with a password."""
     user_rincewind.password = COMPLEX_TEST_PASSWORD
     return user_rincewind
 
 
 @pytest.fixture()
-def user_rincewind_phone(db_session, user_rincewind):
+def user_rincewind_phone(
+    db_session: scoped_session, user_rincewind: models.User
+) -> models.AccountPhone:
     """User phone fixture."""
     accountphone = user_rincewind.add_phone(RINCEWIND_PHONE)
     db_session.add(accountphone)
@@ -82,7 +93,9 @@ def user_rincewind_phone(db_session, user_rincewind):
 
 
 @pytest.fixture()
-def user_rincewind_email(db_session, user_rincewind):
+def user_rincewind_email(
+    db_session: scoped_session, user_rincewind: models.User
+) -> models.AccountEmail:
     """User email fixture."""
     accountemail = user_rincewind.add_email(RINCEWIND_EMAIL)
     db_session.add(accountemail)
@@ -90,14 +103,14 @@ def user_rincewind_email(db_session, user_rincewind):
 
 
 @pytest.fixture()
-def user_rincewind_with_weak_password(user_rincewind):
+def user_rincewind_with_weak_password(user_rincewind: models.User) -> models.User:
     """User fixture with a weak password."""
     user_rincewind.password = WEAK_TEST_PASSWORD
     return user_rincewind
 
 
 @pytest.fixture()
-def mock_loginhub_do(loginhub):
+def mock_loginhub_do(loginhub: LoginProvider) -> Generator[Callable, None, None]:
     """Mock LoginHub login provider's do method."""
     with patch(
         PATCH_LOGINHUB_DO,
@@ -107,7 +120,9 @@ def mock_loginhub_do(loginhub):
 
 
 @pytest.fixture()
-def mock_loginhub_callback(loginhub):
+def mock_loginhub_callback(
+    loginhub: Iterator[LoginProvider],
+) -> Generator[Callable, None, None]:
     """Mock LoginHub login provider's callback method."""
     with patch(
         PATCH_LOGINHUB_CALLBACK,
@@ -121,12 +136,12 @@ def mock_loginhub_callback(loginhub):
         yield mock
 
 
-def test_user_rincewind_has_username(user_rincewind) -> None:
+def test_user_rincewind_has_username(user_rincewind: models.User) -> None:
     """Confirm user fixture has the username required for further tests."""
     assert user_rincewind.username == RINCEWIND_USERNAME
 
 
-def test_user_register_otp_sms(client, csrf_token) -> None:
+def test_user_register_otp_sms(client: TestClient, csrf_token: str) -> None:
     """Providing an unknown phone number sends an OTP and registers an account."""
     with patch(PATCH_SMS_SEND, return_value=None) as mock:
         rv1 = client.post(
@@ -161,7 +176,7 @@ def test_user_register_otp_sms(client, csrf_token) -> None:
         assert current_auth.user.fullname == "Rincewind"
 
 
-def test_user_register_otp_email(client, csrf_token) -> None:
+def test_user_register_otp_email(client: TestClient, csrf_token: str) -> None:
     """Providing an unknown email address sends an OTP and registers an account."""
     with patch(PATCH_EMAIL_OTP_LOGIN, autospec=True) as mock:
         rv1 = client.post(
@@ -197,7 +212,7 @@ def test_user_register_otp_email(client, csrf_token) -> None:
         assert str(current_auth.user.email) == RINCEWIND_EMAIL
 
 
-def test_user_register_otp_email_malformed(client, csrf_token: str) -> None:
+def test_user_register_otp_email_malformed(client: TestClient, csrf_token: str) -> None:
     """Having an @ does not always make it an email."""
     rv = client.post(
         '/login',
@@ -214,7 +229,7 @@ def test_user_register_otp_email_malformed(client, csrf_token: str) -> None:
 
 
 @pytest.mark.mock_config('app', {'MAIL_SERVER': 'mocked'})
-def test_user_register_otp_email_invalid(client, csrf_token: str) -> None:
+def test_user_register_otp_email_invalid(client: TestClient, csrf_token: str) -> None:
     """Providing an invalid address that passes form validation but not SMTP."""
     with patch('flask_mailman.message.EmailMessage.send', autospec=True) as mock:
         mock.side_effect = SMTPRecipientsRefused(
@@ -234,7 +249,12 @@ def test_user_register_otp_email_invalid(client, csrf_token: str) -> None:
         assert "This email address is not valid" in rv.data.decode()
 
 
-def test_user_logout(client, csrf_token, login, user_rincewind) -> None:
+def test_user_logout(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
     """Logout works as a POST request."""
     with client:
         login.as_(user_rincewind)
@@ -258,7 +278,10 @@ def test_user_logout(client, csrf_token, login, user_rincewind) -> None:
     ],
 )
 def test_login_usernames(
-    client, csrf_token, login_username, password_status_auth
+    client: TestClient,
+    csrf_token: str,
+    login_username: str,
+    password_status_auth: SimpleNamespace,
 ) -> None:
     """Test how the login view responds to correct, incorrect and missing password."""
     with client:
@@ -281,7 +304,10 @@ def test_login_usernames(
 @pytest.mark.usefixtures('user_rincewind_phone')
 @pytest.mark.parametrize('login_username', [RINCEWIND_USERNAME, RINCEWIND_PHONE])
 def test_valid_otp_login_sms(
-    client, csrf_token, user_rincewind, login_username
+    client: TestClient,
+    csrf_token: str,
+    user_rincewind: models.User,
+    login_username: str,
 ) -> None:
     """Test OTP login using username or phone number."""
     with client:
@@ -321,7 +347,10 @@ def test_valid_otp_login_sms(
 @pytest.mark.usefixtures('user_rincewind_email')
 @pytest.mark.parametrize('login_username', [RINCEWIND_USERNAME, RINCEWIND_EMAIL])
 def test_valid_otp_login_email(
-    client, csrf_token, user_rincewind, login_username
+    client: TestClient,
+    csrf_token: str,
+    user_rincewind: models.User,
+    login_username: str,
 ) -> None:
     """Test OTP login using username or email address."""
     with client:
@@ -360,7 +389,9 @@ def test_valid_otp_login_email(
 
 @pytest.mark.usefixtures('user_rincewind_phone', 'user_rincewind_email')
 @pytest.mark.parametrize('login_username', LOGIN_USERNAMES)
-def test_invalid_otp_login(client, csrf_token, login_username) -> None:
+def test_invalid_otp_login(
+    client: TestClient, csrf_token: str, login_username: str
+) -> None:
     """Using an incorrect OTP causes a login failure."""
     with client:
         with patch(PATCH_SMS_OTP_LOGIN, return_value=None, autospec=True), patch(
@@ -395,7 +426,9 @@ def test_invalid_otp_login(client, csrf_token, login_username) -> None:
         assert current_auth.user is None
 
 
-def test_user_has_sudo(client, login, user_rincewind) -> None:
+def test_user_has_sudo(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """Test that user has sudo mode enabled immediately after login."""
     login.as_(user_rincewind)
     rv = client.get('/account/sudo')
@@ -403,7 +436,11 @@ def test_user_has_sudo(client, login, user_rincewind) -> None:
 
 
 @pytest.mark.dbcommit()
-def test_user_password_sudo_prompt(client, login, user_rincewind_with_password) -> None:
+def test_user_password_sudo_prompt(
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_rincewind_with_password: models.User,
+) -> None:
     """User with a password gets a sudo password prompt."""
     with client:
         login.as_(user_rincewind_with_password)
@@ -415,7 +452,9 @@ def test_user_password_sudo_prompt(client, login, user_rincewind_with_password)
 
 @pytest.mark.dbcommit()
 @pytest.mark.usefixtures('user_rincewind_phone')
-def test_user_otp_sudo_timedout(client, login, user_rincewind) -> None:
+def test_user_otp_sudo_timedout(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """User without a password gets a sudo OTP prompt."""
     with client:
         login.as_(user_rincewind)
@@ -427,7 +466,7 @@ def test_user_otp_sudo_timedout(client, login, user_rincewind) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_email', 'user_rincewind_with_weak_password')
-def test_weak_password(client, csrf_token) -> None:
+def test_weak_password(client: TestClient, csrf_token: str) -> None:
     """User attempting to login with a weak password is asked to change it."""
     rv = client.post(
         '/login',
@@ -445,7 +484,9 @@ def test_weak_password(client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_email')
-def test_expired_password(client, csrf_token, user_rincewind_with_password) -> None:
+def test_expired_password(
+    client: TestClient, csrf_token: str, user_rincewind_with_password: models.User
+) -> None:
     """User attempting to login with an expired password is asked to change it."""
     user_rincewind_with_password.pw_expires_at = utcnow()
     rv = client.post(
@@ -464,7 +505,7 @@ def test_expired_password(client, csrf_token, user_rincewind_with_password) -> N
 
 
 @pytest.mark.usefixtures('user_rincewind_email')
-def test_login_password_exception(client, csrf_token) -> None:
+def test_login_password_exception(client: TestClient, csrf_token: str) -> None:
     """User logging in to an account without a password is asked to reset it."""
     with client:
         rv = client.post(
@@ -484,7 +525,7 @@ def test_login_password_exception(client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_phone')
-def test_sms_otp_not_sent(client, csrf_token) -> None:
+def test_sms_otp_not_sent(client: TestClient, csrf_token: str) -> None:
     """When an OTP could not be sent, user is prompted to use a password."""
     with patch(
         PATCH_SMS_SEND,
@@ -508,7 +549,7 @@ def test_sms_otp_not_sent(client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_phone')
-def test_otp_timeout_error(client, csrf_token) -> None:
+def test_otp_timeout_error(client: TestClient, csrf_token: str) -> None:
     """When an OTP has expired, the user is prompted to try again."""
     with client:
         with patch(PATCH_SMS_OTP_LOGIN, return_value=None, autospec=True) as mock:
@@ -544,7 +585,7 @@ def test_otp_timeout_error(client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_phone')
-def test_otp_reason_error(client, csrf_token) -> None:
+def test_otp_reason_error(client: TestClient, csrf_token: str) -> None:
     """When an OTP is used for an incorrect reason, it is rejected with a 403."""
     with patch(PATCH_SMS_OTP, return_value=True, autospec=True) as mock:
         client.post(
@@ -573,7 +614,7 @@ def test_otp_reason_error(client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('mock_loginhub_do', 'mock_loginhub_callback')
-def test_login_external(client) -> None:
+def test_login_external(client: TestClient) -> None:
     """External login flow works under mocked conditions."""
     rv = client.get('/login/loginhub')
     assert rv.status_code == 302
@@ -593,13 +634,15 @@ def test_login_external(client) -> None:
         assert current_auth.user.fullname == 'Rincewind'
 
 
-def test_service_not_in_registry(client) -> None:
+def test_service_not_in_registry(client: TestClient) -> None:
     """Attempting to use an unknown external login causes a 404."""
     assert client.get('/login/unknown').status_code == 404
     assert client.get('/login/unknown/callback').status_code == 404
 
 
-def test_already_logged_in(client, login, user_rincewind) -> None:
+def test_already_logged_in(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """Login endpoint sends user away if they are already logged in."""
     login.as_(user_rincewind)
     rv = client.get('/login')
@@ -615,7 +658,7 @@ def test_already_logged_in(client, login, user_rincewind) -> None:
     ],
 )
 def test_phone_otp_not_supported(
-    client, csrf_token, phone_number, message_fragment
+    client: TestClient, csrf_token: str, phone_number: str, message_fragment: str
 ) -> None:
     """If phone number is an unsupported recipient, they are asked to try email."""
     with patch(
@@ -648,7 +691,9 @@ def test_phone_otp_not_supported(
         ('+919845012345', 'Use an email address to register, or try again later'),
     ],
 )
-def test_phone_otp_not_sent(client, csrf_token, phone_number, message_fragment) -> None:
+def test_phone_otp_not_sent(
+    client: TestClient, csrf_token: str, phone_number: str, message_fragment: str
+) -> None:
     """If OTP cannot be sent to phone, they are asked to try password/email."""
     with patch(
         PATCH_SMS_SEND,
@@ -673,7 +718,7 @@ def test_phone_otp_not_sent(client, csrf_token, phone_number, message_fragment)
 
 
 @pytest.mark.usefixtures('user_rincewind_email', 'user_rincewind_with_weak_password')
-def test_weak_password_exception(forms, client, csrf_token) -> None:
+def test_weak_password_exception(client: TestClient, csrf_token: str) -> None:
     """If login form blocks weak password, login view will force user to reset it."""
     with client:
         with patch(
@@ -698,7 +743,7 @@ def test_weak_password_exception(forms, client, csrf_token) -> None:
 
 
 @pytest.mark.usefixtures('user_rincewind_email')
-def test_incomplete_form(client, csrf_token) -> None:
+def test_incomplete_form(client: TestClient, csrf_token: str) -> None:
     """A login form without form.id is rejected."""
     rv = client.post(
         '/login',
@@ -713,7 +758,7 @@ def test_incomplete_form(client, csrf_token) -> None:
     assert rv.status_code == 422
 
 
-def test_render_login_form(client) -> None:
+def test_render_login_form(client: TestClient) -> None:
     """Login in an embedded view renders a HTML fragment."""
     rv = client.get(
         '/login',
@@ -724,14 +769,19 @@ def test_render_login_form(client) -> None:
     assert not rv.data.decode('utf-8').startswith('<!DOCTYPE html>')
 
 
-def test_logout_redirect_index(client) -> None:
+def test_logout_redirect_index(client: TestClient) -> None:
     """GET request to legacy /logout is rejected."""
     rv = client.get('/logout')
     assert rv.status_code == 303
     assert rv.location == '/'
 
 
-def test_account_logout_user_session(client, csrf_token, login, user_rincewind) -> None:
+def test_account_logout_user_session(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
     """POST to logout with a session id removes that session in the background."""
     with client:
         login.as_(user_rincewind)
@@ -744,7 +794,10 @@ def test_account_logout_user_session(client, csrf_token, login, user_rincewind)
 
 
 def test_account_logout_user_session_json(
-    client, csrf_token, login, user_rincewind
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
 ) -> None:
     """POST to logout can return a JSON confirmation."""
     with client:
@@ -754,11 +807,14 @@ def test_account_logout_user_session_json(
             data={'sessionid': current_auth.session.buid, 'csrf_token': csrf_token},
             headers={'Accept': 'application/json'},
         )
+        assert rv.json is not None
         assert rv.json['status'] == 'ok'
         assert rv.status_code == 200
 
 
-def test_account_logout_csrf_validation_json(client, login, user_rincewind) -> None:
+def test_account_logout_csrf_validation_json(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """Logout needs a CSRF token to prevent CSRF logout (JSON response)."""
     login.as_(user_rincewind)
 
@@ -766,11 +822,14 @@ def test_account_logout_csrf_validation_json(client, login, user_rincewind) -> N
         '/account/logout',
         headers={'Accept': 'application/json'},
     )
+    assert rv.json is not None
     assert rv.json['status'] == 'error'
     assert rv.json['errors'] == {'csrf_token': ['The CSRF token is missing.']}
 
 
-def test_account_logout_csrf_validation_html(client, login, user_rincewind) -> None:
+def test_account_logout_csrf_validation_html(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """Logout needs a CSRF token to prevent CSRF logout (HTML response)."""
     with client:
         login.as_(user_rincewind)
@@ -783,7 +842,7 @@ def test_account_logout_csrf_validation_html(client, login, user_rincewind) -> N
         assert 'The CSRF token is missing.' in str(session['_flashes'])
 
 
-def test_login_service_init_error(client) -> None:
+def test_login_service_init_error(client: TestClient) -> None:
     """If a login service raises an init error, the login attempt is aborted."""
     with client:
         with patch(
@@ -796,7 +855,7 @@ def test_login_service_init_error(client) -> None:
         assert rv.location == '/'
 
 
-def test_login_service_callback_error(client) -> None:
+def test_login_service_callback_error(client: TestClient) -> None:
     """If a login service raises a callback error, the login attempt is aborted."""
     with patch(
         PATCH_LOGINHUB_CALLBACK,
@@ -808,7 +867,9 @@ def test_login_service_callback_error(client) -> None:
     assert 'Login Hub login failed' in rv.data.decode()
 
 
-def test_login_service_callback_is_authenticated(client, login, user_rincewind) -> None:
+def test_login_service_callback_is_authenticated(
+    client: TestClient, login: LoginFixtureProtocol, user_rincewind: models.User
+) -> None:
     """A callback error when logged in is handled."""
     login.as_(user_rincewind)
 
@@ -825,7 +886,12 @@ def test_login_service_callback_is_authenticated(client, login, user_rincewind)
 @pytest.mark.usefixtures(
     'user_rincewind', 'user_rincewind_email', 'mock_loginhub_callback'
 )
-def test_account_merge(client, csrf_token, login, user_twoflower) -> None:
+def test_account_merge(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_twoflower: models.User,
+) -> None:
     """An external login service can trigger an account merger."""
     login.as_(user_twoflower)
 
@@ -846,7 +912,9 @@ def test_account_merge(client, csrf_token, login, user_twoflower) -> None:
         assert 'merge_buid' not in session
 
 
-def test_merge_buid_not_in_session(client, login, user_twoflower) -> None:
+def test_merge_buid_not_in_session(
+    client: TestClient, login: LoginFixtureProtocol, user_twoflower: models.User
+) -> None:
     """Account merger endpoint will fail when no merger is in progress."""
     with client:
         login.as_(user_twoflower)
diff --git a/tests/integration/views/membership_views_test.py b/tests/integration/views/membership_views_test.py
index 555643cbe..31e6e79ed 100644
--- a/tests/integration/views/membership_views_test.py
+++ b/tests/integration/views/membership_views_test.py
@@ -2,13 +2,23 @@
 
 import pytest
 
+from funnel import models
+
+from ...conftest import LoginFixtureProtocol, TestClient
+
 
 @pytest.mark.usefixtures('app_context')
-def test_create_new_member(client, login, new_user_owner, new_project) -> None:
+def test_create_new_member(
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    new_user_owner: models.User,
+    new_project: models.Project,
+) -> None:
     login.as_(new_user_owner)
     # GET request should return a form
     resp = client.get(new_project.url_for('new_member'))
     assert resp.status_code == 200
+    assert resp.json is not None
     assert 'form' in resp.json
     assert new_project.url_for('new_member') in resp.json.get('form')
 
diff --git a/tests/integration/views/oauth_test.py b/tests/integration/views/oauth_test.py
index 45f606d4f..37ffacdc7 100644
--- a/tests/integration/views/oauth_test.py
+++ b/tests/integration/views/oauth_test.py
@@ -8,8 +8,10 @@
 
 from funnel import models
 
+from ...conftest import CredProtocol, LoginFixtureProtocol, TestClient
 
-def test_authcode_requires_login(client) -> None:
+
+def test_authcode_requires_login(client: TestClient) -> None:
     """The authcode endpoint requires a login."""
     rv = client.get('/api/1/auth', follow_redirects=True)
     assert rv.status_code == 200
@@ -22,7 +24,10 @@ def test_authcode_requires_login(client) -> None:
 
 
 def test_authcode_wellformed(
-    client, login, user_rincewind, client_hex_credential
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+    client_hex_credential: CredProtocol,
 ) -> None:
     """The authcode endpoint will raise 403 if not well formed."""
     login.as_(user_rincewind)
@@ -31,13 +36,13 @@ def test_authcode_wellformed(
     query_params: dict[str, str] = {}
     rv = client.get('/api/1/auth', query_string=query_params)
     assert rv.status_code == 403
-    assert "Missing client_id" in rv.get_data(as_text=True)
+    assert "Missing client_id" in rv.text
 
     # Unknown client
     query_params['client_id'] = 'unknown'
     rv = client.get('/api/1/auth', query_string=query_params)
     assert rv.status_code == 403
-    assert "Unknown client_id" in rv.get_data(as_text=True)
+    assert "Unknown client_id" in rv.text
 
     # Missing redirect URI (error is sent to client as a query parameter)
     query_params['client_id'] = client_hex_credential.cred.name
@@ -51,7 +56,12 @@ def test_authcode_wellformed(
 @pytest.mark.dbcommit()
 @pytest.mark.filterwarnings("ignore:Object of type <AuthToken> not in session")
 def test_auth_untrusted_confidential(
-    client, login, user_rincewind, client_hex, client_hex_credential, csrf_token
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
+    client_hex_credential: CredProtocol,
+    csrf_token: str,
 ) -> None:
     """Test auth on an untrusted confidential auth client."""
     login.as_(user_rincewind)
diff --git a/tests/integration/views/project_views_test.py b/tests/integration/views/project_views_test.py
index d6b0d4b58..5802250e1 100644
--- a/tests/integration/views/project_views_test.py
+++ b/tests/integration/views/project_views_test.py
@@ -4,9 +4,16 @@
 
 from funnel import forms, models
 
+from ...conftest import LoginFixtureProtocol, TestClient
+
 
 @pytest.mark.usefixtures('app_context')
-def test_new_label_get(client, login, new_user, new_project) -> None:
+def test_new_label_get(
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    new_user: models.User,
+    new_project: models.Project,
+) -> None:
     login.as_(new_user)
     resp = client.get(new_project.url_for('new_label'))
     label_form = forms.LabelForm(parent=new_project, model=models.Label)
diff --git a/tests/integration/views/pwned_password_test.py b/tests/integration/views/pwned_password_test.py
new file mode 100644
index 000000000..bd33fc905
--- /dev/null
+++ b/tests/integration/views/pwned_password_test.py
@@ -0,0 +1,62 @@
+"""Tests for pwned password validator integration (requires external web service)."""
+
+import pytest
+from requests_mock import Mocker
+
+from funnel import models
+
+from ...conftest import LoginFixtureProtocol, TestClient
+
+# Sample password that will pass zxcvbn's complexity validation, but will be flagged
+# by the pwned password validator
+PWNED_PASSWORD = 'thisisone1'  # nosec
+
+
+@pytest.mark.flaky(reruns=2)  # Web service could fail occasionally
+@pytest.mark.enable_socket()
+def test_pwned_password(
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
+    """Pwned password validator will block attempt to use a compromised password."""
+    login.as_(user_rincewind)
+    rv = client.post(
+        'account/password',
+        data={
+            'username': user_rincewind.username,
+            'form.id': 'password-change',
+            'password': PWNED_PASSWORD,
+            'confirm_password': PWNED_PASSWORD,
+            'csrf_token': csrf_token,
+        },
+    )
+    assert rv.status_code == 200
+    assert "This password was found in breached password lists" in rv.data.decode()
+
+
+def test_pwned_password_mock_endpoint_down(
+    requests_mock: Mocker,
+    client: TestClient,
+    csrf_token: str,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+) -> None:
+    """If the pwned password API is not available, the password is allowed."""
+    requests_mock.get('https://api.pwnedpasswords.com/range/1F074', status_code=404)
+    login.as_(user_rincewind)
+
+    rv = client.post(
+        'account/password',
+        data={
+            'username': user_rincewind.username,
+            'form.id': 'password-change',
+            'password': PWNED_PASSWORD,
+            'confirm_password': PWNED_PASSWORD,
+            'csrf_token': csrf_token,
+        },
+    )
+
+    assert rv.status_code == 303
+    assert rv.location == '/account'
diff --git a/tests/unit/forms/account_test.py b/tests/unit/forms/account_test.py
index 99bdabcc8..a5bb348a1 100644
--- a/tests/unit/forms/account_test.py
+++ b/tests/unit/forms/account_test.py
@@ -1,18 +1,24 @@
 """Test account forms."""
 # pylint: disable=redefined-outer-name
 
+from collections.abc import Generator
 from contextlib import nullcontext as does_not_raise
 from types import SimpleNamespace
+from typing import ContextManager, cast
 
 import pytest
+from flask import Flask
+from requests_mock import Mocker
 
-from baseframe.forms.validators import StopValidation
+from baseframe.forms import PasswordField, StopValidation
 
 from funnel import forms
 
 
 @pytest.fixture(autouse=True)
-def _policy_form_app_context(request, app):
+def _policy_form_app_context(
+    request: pytest.FixtureRequest, app: Flask
+) -> Generator[None, None, None]:
     """Create a POST request context with form data."""
     data = {}
     for mark in request.node.iter_markers('formdata'):
@@ -23,7 +29,7 @@ def _policy_form_app_context(request, app):
 
 
 @pytest.fixture()
-def form(request):
+def form(request: pytest.FixtureRequest) -> forms.PasswordPolicyForm:
     """Form fixture."""
     user = None
     for mark in request.node.iter_markers('formuser'):
@@ -35,13 +41,13 @@ def form(request):
 
 
 @pytest.mark.formdata()
-def test_password_policy_form_no_data(form) -> None:
+def test_password_policy_form_no_data(form: forms.PasswordPolicyForm) -> None:
     """Test form validation for missing password."""
     assert form.validate() is False
 
 
 @pytest.mark.formdata({'password': 'weak'})
-def test_weak_password(form) -> None:
+def test_weak_password(form: forms.PasswordPolicyForm) -> None:
     """Test weak password validation."""
     assert form.validate() is True
     assert form.is_weak is True
@@ -52,7 +58,7 @@ def test_weak_password(form) -> None:
 
 @pytest.mark.formdata({'password': 'rincewind123'})
 @pytest.mark.formuser('user_rincewind')
-def test_related_password(form) -> None:
+def test_related_password(form: forms.PasswordPolicyForm) -> None:
     """Password cannot be related to user identifiers (username, email, etc)."""
     assert form.validate() is True
     assert form.edit_user is not None
@@ -64,7 +70,7 @@ def test_related_password(form) -> None:
 
 @pytest.mark.formdata({'password': 'this-is-a-sufficiently-long-password'})
 @pytest.mark.formuser('user_rincewind')
-def test_okay_password(form) -> None:
+def test_okay_password(form: forms.PasswordPolicyForm) -> None:
     """Long passwords are valid."""
     assert form.validate() is True
     assert form.edit_user is not None
@@ -79,15 +85,22 @@ def test_pwned_password_validator() -> None:
     """Test the pwned password validator."""
     # Validation success = no return value, no exception
     forms.pwned_password_validator(
-        None, SimpleNamespace(data='this is unlikely to be in the breach list')
+        None,
+        cast(
+            PasswordField,
+            SimpleNamespace(data='this is unlikely to be in the breach list'),
+        ),
     )
 
     with pytest.raises(StopValidation, match='times and is not safe'):
-        forms.pwned_password_validator(None, SimpleNamespace(data='123456'))
+        forms.pwned_password_validator(
+            None, cast(PasswordField, SimpleNamespace(data='123456'))
+        )
 
     with pytest.raises(StopValidation, match='times and is not safe'):
         forms.pwned_password_validator(
-            None, SimpleNamespace(data='correct horse battery staple')
+            None,
+            cast(PasswordField, SimpleNamespace(data='correct horse battery staple')),
         )
 
 
@@ -144,9 +157,11 @@ def test_pwned_password_validator() -> None:
     ],
 )
 def test_mangled_response_pwned_password_validator(
-    requests_mock, text, expectation
+    requests_mock: Mocker, text: str, expectation: ContextManager
 ) -> None:
     """Test that the validator successfully parses mangled output in the API."""
     requests_mock.get('https://api.pwnedpasswords.com/range/7C4A8', text=text)
     with expectation:
-        forms.pwned_password_validator(None, SimpleNamespace(data='123456'))
+        forms.pwned_password_validator(
+            None, cast(PasswordField, SimpleNamespace(data='123456'))
+        )
diff --git a/tests/unit/forms/login_test.py b/tests/unit/forms/login_test.py
index 36c816df2..e3d9b2ca2 100644
--- a/tests/unit/forms/login_test.py
+++ b/tests/unit/forms/login_test.py
@@ -2,16 +2,19 @@
 # pylint: disable=redefined-outer-name
 
 import pytest
+from flask import Flask
 
 from funnel import forms, models
 
+from ...conftest import scoped_session
+
 pytestmark = pytest.mark.filterwarnings(
     "ignore:Object of type <AccountEmail> not in session"
 )
 
 
 @pytest.fixture()
-def user(db_session):
+def user(db_session: scoped_session) -> models.User:
     """User fixture."""
     new_user = models.User(  # nosec
         username='user', fullname="User", password='test_password'
@@ -22,7 +25,7 @@ def user(db_session):
 
 
 @pytest.fixture()
-def user_nameless(db_session):
+def user_nameless(db_session: scoped_session) -> models.User:
     """User fixture without a username."""
     new_user = models.User(  # nosec
         fullname="Nameless User", password='test_password_nameless'
@@ -34,7 +37,7 @@ def user_nameless(db_session):
 
 
 @pytest.fixture()
-def user_named(db_session):
+def user_named(db_session: scoped_session) -> models.User:
     """User fixture with a username."""
     new_user = models.User(  # nosec
         username='user_named', fullname="Named User", password='test_password_named'
@@ -46,7 +49,7 @@ def user_named(db_session):
 
 
 @pytest.fixture()
-def user_email(db_session, user):
+def user_email(db_session: scoped_session, user: models.User) -> models.AccountEmail:
     """Email address for user fixture."""
     retval = user.add_email('user@example.com')
     db_session.commit()
@@ -54,14 +57,16 @@ def user_email(db_session, user):
 
 
 @pytest.fixture()
-def user_phone(db_session, user):
+def user_phone(db_session: scoped_session, user: models.User) -> models.AccountPhone:
     """Phone number for user fixture."""
     retval = user.add_phone('+912345678901')
     db_session.commit()
     return retval
 
 
-def test_form_has_user(app, user, user_nameless, user_named) -> None:
+def test_form_has_user(
+    app: Flask, user: models.User, user_nameless: models.User, user_named: models.User
+) -> None:
     """Login form identifies user correctly."""
     with app.test_request_context(method='POST', data={'username': 'user'}):
         form = forms.LoginForm(meta={'csrf': False})
@@ -69,7 +74,9 @@ def test_form_has_user(app, user, user_nameless, user_named) -> None:
         assert form.user == user
 
 
-def test_form_has_user_nameless(app, user, user_nameless, user_named) -> None:
+def test_form_has_user_nameless(
+    app: Flask, user: models.User, user_nameless: models.User, user_named: models.User
+) -> None:
     """Login form identifies user correctly."""
     with app.test_request_context(
         method='POST', data={'username': 'nameless@example.com'}
@@ -80,7 +87,9 @@ def test_form_has_user_nameless(app, user, user_nameless, user_named) -> None:
         assert form.user == user_nameless
 
 
-def test_form_has_user_named(app, user, user_nameless, user_named) -> None:
+def test_form_has_user_named(
+    app: Flask, user: models.User, user_nameless: models.User, user_named: models.User
+) -> None:
     """Login form identifies user correctly."""
     with app.test_request_context(method='POST', data={'username': 'user_named'}):
         form = forms.LoginForm(meta={'csrf': False})
@@ -89,7 +98,9 @@ def test_form_has_user_named(app, user, user_nameless, user_named) -> None:
         assert form.user == user_named
 
 
-def test_form_has_user_named_by_email(app, user, user_nameless, user_named) -> None:
+def test_form_has_user_named_by_email(
+    app: Flask, user: models.User, user_nameless: models.User, user_named: models.User
+) -> None:
     """Login form identifies user correctly."""
     with app.test_request_context(
         method='POST', data={'username': 'named@example.com'}
@@ -100,7 +111,7 @@ def test_form_has_user_named_by_email(app, user, user_nameless, user_named) -> N
         assert form.user == user_named
 
 
-def test_login_no_data(app, user) -> None:
+def test_login_no_data(app: Flask, user: models.User) -> None:
     """Login form fails if username and password are not provided."""
     with app.test_request_context(method='POST'):
         form = forms.LoginForm(meta={'csrf': False})
@@ -110,7 +121,7 @@ def test_login_no_data(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_login_no_password(app, user) -> None:
+def test_login_no_password(app: Flask, user: models.User) -> None:
     """Login fails if password is not provided and user has no email/phone."""
     with app.test_request_context(method='POST', data={'username': 'user'}):
         form = forms.LoginForm(meta={'csrf': False})
@@ -120,7 +131,9 @@ def test_login_no_password(app, user) -> None:
         assert form.password.errors == [form.password.validators[0].message]
 
 
-def test_login_no_password_with_email(app, user, user_email) -> None:
+def test_login_no_password_with_email(
+    app: Flask, user: models.User, user_email: models.AccountEmail
+) -> None:
     """Passwordless login if password is not provided but user has email."""
     with app.test_request_context(method='POST', data={'username': 'user'}):
         form = forms.LoginForm(meta={'csrf': False})
@@ -131,7 +144,10 @@ def test_login_no_password_with_email(app, user, user_email) -> None:
 
 
 def test_login_no_password_with_phone_and_email(
-    app, user, user_email, user_phone
+    app: Flask,
+    user: models.User,
+    user_email: models.AccountEmail,
+    user_phone: models.AccountPhone,
 ) -> None:
     """Passwordless login if password is not provided but user has phone or email."""
     with app.test_request_context(method='POST', data={'username': 'user'}):
@@ -143,7 +159,10 @@ def test_login_no_password_with_phone_and_email(
 
 
 def test_login_no_password_with_email_and_phone(
-    app, user, user_email, user_phone
+    app: Flask,
+    user: models.User,
+    user_email: models.AccountEmail,
+    user_phone: models.AccountPhone,
 ) -> None:
     """Passwordless login if password is not provided but user used email."""
     with app.test_request_context(method='POST', data={'username': 'user@example.com'}):
@@ -154,7 +173,7 @@ def test_login_no_password_with_email_and_phone(
         assert form.anchor == user_email  # The anchor used in username takes priority
 
 
-def test_login_no_username(app, user) -> None:
+def test_login_no_username(app: Flask, user: models.User) -> None:
     """Login fails if username is not provided."""
     with app.test_request_context(method='POST', data={'password': 'test_password'}):
         form = forms.LoginForm(meta={'csrf': False})
@@ -164,7 +183,7 @@ def test_login_no_username(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_login_blank_username(app, user) -> None:
+def test_login_blank_username(app: Flask, user: models.User) -> None:
     """Login fails if username is blank."""
     with app.test_request_context(
         method='POST', data={'username': '', 'password': 'test_password'}
@@ -176,7 +195,7 @@ def test_login_blank_username(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_login_blank_password(app, user) -> None:
+def test_login_blank_password(app: Flask, user: models.User) -> None:
     """Login fails if password is blank."""
     with app.test_request_context(
         method='POST', data={'username': 'user', 'password': ''}
@@ -188,7 +207,7 @@ def test_login_blank_password(app, user) -> None:
         assert form.password.errors == [form.password.validators[0].message]
 
 
-def test_login_wrong_username(app, user) -> None:
+def test_login_wrong_username(app: Flask, user: models.User) -> None:
     """Login fails if username cannot identify a user."""
     with app.test_request_context(
         method='POST', data={'username': 'no_user', 'password': 'test_password'}
@@ -200,7 +219,7 @@ def test_login_wrong_username(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_login_wrong_password(app, user) -> None:
+def test_login_wrong_password(app: Flask, user: models.User) -> None:
     """Login fails if password is incorrect."""
     with app.test_request_context(
         method='POST', data={'username': 'user', 'password': 'wrong_password'}
@@ -212,7 +231,7 @@ def test_login_wrong_password(app, user) -> None:
         assert form.password.errors == [forms.login.MSG_INCORRECT_PASSWORD]
 
 
-def test_login_long_password(app, user) -> None:
+def test_login_long_password(app: Flask, user: models.User) -> None:
     """Login fails if password candidate is too long."""
     with app.test_request_context(
         method='POST', data={'username': 'user', 'password': 'a' * 101}
@@ -227,7 +246,7 @@ def test_login_long_password(app, user) -> None:
 
 
 @pytest.mark.parametrize('username', ['unknown@example.com', '+919845012345'])
-def test_login_no_probing(app, username) -> None:
+def test_login_no_probing(app: Flask, username: str) -> None:
     """Login fails if email/phone is not present, but as an incorrect password."""
     with app.test_request_context(
         method='POST', data={'username': username, 'password': 'wrong_password'}
@@ -238,7 +257,7 @@ def test_login_no_probing(app, username) -> None:
         assert form.password.errors == [forms.login.MSG_INCORRECT_PASSWORD]
 
 
-def test_login_pass(app, user) -> None:
+def test_login_pass(app: Flask, user: models.User) -> None:
     """Login succeeds if both username and password match."""
     with app.test_request_context(
         method='POST', data={'username': 'user', 'password': 'test_password'}
@@ -250,7 +269,9 @@ def test_login_pass(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_login_email_pass(app, user, user_email) -> None:
+def test_login_email_pass(
+    app: Flask, user: models.User, user_email: models.AccountEmail
+) -> None:
     """Login succeeds if email and password match."""
     with app.test_request_context(
         method='POST', data={'username': str(user_email), 'password': 'test_password'}
@@ -262,7 +283,9 @@ def test_login_email_pass(app, user, user_email) -> None:
         assert form.password.errors == []
 
 
-def test_login_phone_pass(app, user, user_phone) -> None:
+def test_login_phone_pass(
+    app: Flask, user: models.User, user_phone: models.AccountPhone
+) -> None:
     """Login succeeds if phone number and password match."""
     with app.test_request_context(
         method='POST', data={'username': str(user_phone), 'password': 'test_password'}
@@ -274,7 +297,9 @@ def test_login_phone_pass(app, user, user_phone) -> None:
         assert form.password.errors == []
 
 
-def test_login_partial_phone_pass(app, user, user_phone) -> None:
+def test_login_partial_phone_pass(
+    app: Flask, user: models.User, user_phone: models.AccountPhone
+) -> None:
     """Login succeeds if unprefixed phone number and password match."""
     with app.test_request_context(
         method='POST',
@@ -287,7 +312,7 @@ def test_login_partial_phone_pass(app, user, user_phone) -> None:
         assert form.password.errors == []
 
 
-def test_login_user_suspended(app, user) -> None:
+def test_login_user_suspended(app: Flask, user: models.User) -> None:
     """Login fails if the user account has been suspended."""
     user.mark_suspended()
     with app.test_request_context(
@@ -301,7 +326,7 @@ def test_login_user_suspended(app, user) -> None:
         assert form.password.errors == []
 
 
-def test_register_email_otp(app) -> None:
+def test_register_email_otp(app: Flask) -> None:
     """Login with non-existent account and valid email signals a registration."""
     with app.test_request_context(
         method='POST', data={'username': 'example@example.com', 'password': ''}
@@ -323,7 +348,9 @@ def test_register_email_otp(app) -> None:
         ('+12345678900', '+12345678900'),
     ],
 )
-def test_register_phone_otp(app, phone_number, full_phone_number) -> None:
+def test_register_phone_otp(
+    app: Flask, phone_number: str, full_phone_number: str
+) -> None:
     """Login with non-existent account and valid phone signals a registration."""
     with app.test_request_context(
         method='POST', data={'username': phone_number, 'password': ''}
diff --git a/tests/unit/forms/proposal_forms_test.py b/tests/unit/forms/proposal_forms_test.py
index 1c9294573..6c40fcb79 100644
--- a/tests/unit/forms/proposal_forms_test.py
+++ b/tests/unit/forms/proposal_forms_test.py
@@ -1,15 +1,16 @@
 """Tests for Proposal forms."""
 
-from funnel import models
+from flask import Flask
+
+from funnel import forms, models
 
 
 def test_proposal_label_admin_form(
-    forms,
-    app,
-    new_main_label,
-    new_main_label_unrestricted,
-    new_label,
-    new_proposal,
+    app: Flask,
+    new_main_label: models.Label,
+    new_main_label_unrestricted: models.Label,
+    new_label: models.Label,
+    new_proposal: models.Proposal,
 ) -> None:
     assert new_main_label.restricted
     assert not new_main_label_unrestricted.restricted
@@ -39,12 +40,11 @@ def test_proposal_label_admin_form(
 
 
 def test_proposal_label_form(
-    forms,
-    app,
-    new_main_label,
-    new_main_label_unrestricted,
-    new_label,
-    new_proposal,
+    app: Flask,
+    new_main_label: models.Label,
+    new_main_label_unrestricted: models.Label,
+    new_label: models.Label,
+    new_proposal: models.Proposal,
 ) -> None:
     assert new_main_label.restricted
     assert not new_main_label_unrestricted.restricted
diff --git a/tests/unit/forms/rsvp_json_test.py b/tests/unit/forms/rsvp_json_test.py
index 11a16e03e..5897f2fdc 100644
--- a/tests/unit/forms/rsvp_json_test.py
+++ b/tests/unit/forms/rsvp_json_test.py
@@ -2,6 +2,8 @@
 
 import json
 
+from flask import Flask
+
 from funnel import forms
 
 valid_schema = {
@@ -33,7 +35,7 @@
 }
 
 
-def test_valid_boxoffice_form(app) -> None:
+def test_valid_boxoffice_form(app: Flask) -> None:
     """Valid schema is accepted by the schema form validator."""
     with app.test_request_context(
         method='POST',
@@ -43,7 +45,7 @@ def test_valid_boxoffice_form(app) -> None:
         assert form.validate() is True
 
 
-def test_invalid_boxoffice_form(app) -> None:
+def test_invalid_boxoffice_form(app: Flask) -> None:
     """Invalid schema is rejected by the schema form validator."""
     with app.test_request_context(
         method='POST',
@@ -56,7 +58,7 @@ def test_invalid_boxoffice_form(app) -> None:
         assert form.errors == {'register_form_schema': ['Invalid JSON']}
 
 
-def test_valid_json_register_form(app) -> None:
+def test_valid_json_register_form(app: Flask) -> None:
     with app.test_request_context(
         method='POST',
         data={'form': '{"field_name":"Vetinari","has_checked":"on"}'},
@@ -65,7 +67,7 @@ def test_valid_json_register_form(app) -> None:
         assert form.validate() is True
 
 
-def test_invalid_json_register_form(app) -> None:
+def test_invalid_json_register_form(app: Flask) -> None:
     with app.test_request_context(
         method='POST',
         data={'form': 'This is an invalid json'},
@@ -76,7 +78,7 @@ def test_invalid_json_register_form(app) -> None:
         assert form.form.errors == ['Invalid JSON']
 
 
-def test_excess_json_register_form(app) -> None:
+def test_excess_json_register_form(app: Flask) -> None:
     with app.test_request_context(
         method='POST',
         data={'form': json.dumps(rsvp_excess_json)},
diff --git a/tests/unit/models/account_Organization_test.py b/tests/unit/models/account_Organization_test.py
index b62b7098a..63829f663 100644
--- a/tests/unit/models/account_Organization_test.py
+++ b/tests/unit/models/account_Organization_test.py
@@ -1,6 +1,5 @@
 """Tests for UserExternalId model."""
 
-from typing import cast
 
 import pytest
 
@@ -8,8 +7,10 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_organization_init(user_twoflower) -> None:
+
+def test_organization_init(user_twoflower: models.User) -> None:
     """Test for initializing a Organization instance."""
     name = 'inn_sewer_ants'
     title = 'Inn-sewer-ants-polly-sea'
@@ -19,7 +20,9 @@ def test_organization_init(user_twoflower) -> None:
     assert org.name == name
 
 
-def test_organization_get(db_session, user_twoflower) -> None:
+def test_organization_get(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test for retrieving an organization."""
     name = 'inn_sewer_ants'
     title = 'Inn-sewer-ants-polly-sea'
@@ -30,7 +33,7 @@ def test_organization_get(db_session, user_twoflower) -> None:
     with pytest.raises(TypeError):
         models.Organization.get()  # type: ignore[call-overload]
     # scenario 2: when buid is passed
-    buid = cast(str, org.buid)
+    buid = org.buid
     get_by_buid = models.Organization.get(buid=buid)
     assert get_by_buid == org
     # scenario 3: when username is passed
@@ -41,7 +44,12 @@ def test_organization_get(db_session, user_twoflower) -> None:
     assert get_by_name_with_defercols == org
 
 
-def test_organization_all(db_session, org_ankhmorpork, org_citywatch, org_uu) -> None:
+def test_organization_all(
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    org_citywatch: models.Organization,
+    org_uu: models.Organization,
+) -> None:
     """Test for getting all organizations (takes buid or name optionally)."""
     db_session.commit()
     # scenario 1: when neither buids nor names are given
@@ -49,14 +57,13 @@ def test_organization_all(db_session, org_ankhmorpork, org_citywatch, org_uu) ->
     # scenario 2: when buids are passed
     orglist = {org_ankhmorpork, org_citywatch}
     all_by_buids = models.Organization.all(buids=[_org.buid for _org in orglist])
+    org_names = [_org.name for _org in orglist if _org.name is not None]
     assert set(all_by_buids) == orglist
     # scenario 3: when org names are passed
-    all_by_names = models.Organization.all(names=[_org.name for _org in orglist])
+    all_by_names = models.Organization.all(names=org_names)
     assert set(all_by_names) == orglist
     # scenario 4: when defercols is set to True for names
-    all_by_names_with_defercols = models.Organization.all(
-        names=[_org.name for _org in orglist]
-    )
+    all_by_names_with_defercols = models.Organization.all(names=org_names)
     assert set(all_by_names_with_defercols) == orglist
     # scenario 5: when defercols is set to True for buids
     all_by_buids_with_defercols = models.Organization.all(
@@ -65,13 +72,13 @@ def test_organization_all(db_session, org_ankhmorpork, org_citywatch, org_uu) ->
     assert set(all_by_buids_with_defercols) == orglist
 
 
-def test_organization_pickername(org_uu) -> None:
+def test_organization_pickername(org_uu: models.Organization) -> None:
     """Test for checking Organization's pickername."""
     assert isinstance(org_uu.pickername, str)
     assert org_uu.pickername == f'{org_uu.title} (@{org_uu.name})'
 
 
-def test_organization_name(org_ankhmorpork) -> None:
+def test_organization_name(org_ankhmorpork: models.Organization) -> None:
     """Test for retrieving and setting an Organization's name."""
     with pytest.raises(ValueError, match='Invalid account name'):
         org_ankhmorpork.name = '35453496*%&^$%^'
@@ -83,7 +90,9 @@ def test_organization_name(org_ankhmorpork) -> None:
     assert org_ankhmorpork.name == 'AnkhMorpork'
 
 
-def test_organization_suspend_restore(db_session, org_citywatch) -> None:
+def test_organization_suspend_restore(
+    db_session: scoped_session, org_citywatch: models.Organization
+) -> None:
     """Test for an organization being suspended and restored."""
     db_session.commit()
     assert org_citywatch.state.ACTIVE
diff --git a/tests/unit/models/account_User_test.py b/tests/unit/models/account_User_test.py
index 9a7bf440f..ec0d9ead4 100644
--- a/tests/unit/models/account_User_test.py
+++ b/tests/unit/models/account_User_test.py
@@ -9,13 +9,15 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 pytestmark = pytest.mark.filterwarnings(
     "ignore:Object of type <AccountEmail> not in session",
     "ignore:Object of type <AccountPhone> not in session",
 )
 
 
-def test_user(db_session) -> None:
+def test_user(db_session: scoped_session) -> None:
     """Test for creation of user object from User model."""
     user = models.User(username='hrun', fullname="Hrun the Barbarian")
     db_session.add(user)
@@ -28,13 +30,17 @@ def test_user(db_session) -> None:
     assert hrun == user
 
 
-def test_user_pickername(user_twoflower, user_rincewind) -> None:
-    """Test to verify pickername contains fullname and optional username."""
+def test_user_pickername(
+    user_twoflower: models.User, user_rincewind: models.User
+) -> None:
+    """Test to verify `pickername` contains fullname and optional username."""
     assert user_twoflower.pickername == "Twoflower"
     assert user_rincewind.pickername == "Rincewind (@rincewind)"
 
 
-def test_user_is_profile_complete(db_session, user_twoflower, user_rincewind) -> None:
+def test_user_is_profile_complete(
+    db_session: scoped_session, user_twoflower: models.User, user_rincewind: models.User
+) -> None:
     """
     Test to check if user profile is complete.
 
@@ -64,12 +70,14 @@ def test_user_is_profile_complete(db_session, user_twoflower, user_rincewind) ->
     assert user_twoflower.is_profile_complete() is True
 
 
-def test_user_organization_owned(user_ridcully, org_uu) -> None:
+def test_user_organization_owned(
+    user_ridcully: models.User, org_uu: models.Organization
+) -> None:
     """Test for verifying organizations a user is a owner of."""
     assert list(user_ridcully.organizations_as_owner) == [org_uu]
 
 
-def test_user_email(db_session, user_twoflower) -> None:
+def test_user_email(db_session: scoped_session, user_twoflower: models.User) -> None:
     """Add and retrieve an email address."""
     assert user_twoflower.email == ''
     accountemail = user_twoflower.add_email('twoflower@example.org')
@@ -89,7 +97,9 @@ def test_user_email(db_session, user_twoflower) -> None:
     assert useremail2.primary is True
 
 
-def test_user_del_email(db_session, user_twoflower) -> None:
+def test_user_del_email(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Delete an email address from a user's account."""
     assert user_twoflower.primary_email is None
     assert len(user_twoflower.emails) == 0
@@ -139,7 +149,7 @@ def test_user_del_email(db_session, user_twoflower) -> None:
     assert user_twoflower.email == ''
 
 
-def test_user_phone(db_session, user_twoflower) -> None:
+def test_user_phone(db_session: scoped_session, user_twoflower: models.User) -> None:
     """Test to retrieve AccountPhone property phone."""
     assert user_twoflower.phone == ''
     accountphone = user_twoflower.add_phone('+12345678900')
@@ -159,7 +169,9 @@ def test_user_phone(db_session, user_twoflower) -> None:
     assert userphone2.primary is True
 
 
-def test_user_del_phone(db_session, user_twoflower) -> None:
+def test_user_del_phone(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Delete an phone address from a user's account."""
     assert user_twoflower.primary_phone is None
     assert len(user_twoflower.phones) == 0
@@ -210,7 +222,11 @@ def test_user_del_phone(db_session, user_twoflower) -> None:
 
 
 def test_user_autocomplete(
-    db_session, user_twoflower, user_rincewind, user_dibbler, user_librarian
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    user_dibbler: models.User,
+    user_librarian: models.User,
 ) -> None:
     """
     Test for User autocomplete method.
@@ -250,20 +266,19 @@ def test_user_autocomplete(
 
 @pytest.mark.parametrize('defercols', [False, True])
 def test_user_all(
-    db_session,
-    user_twoflower,
-    user_rincewind,
-    user_ridcully,
-    user_dibbler,
-    user_death,
-    user_mort,
-    defercols,
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    user_ridcully: models.User,
+    user_dibbler: models.User,
+    user_death: models.User,
+    user_mort: models.User,
+    defercols: bool,
 ) -> None:
     """Retrieve all users matching specified criteria."""
     # Some fixtures are not used in the tests because the test determines that they
     # won't show up in the query unless specifically asked for
 
-    db_session.commit()  # Commit required to generate UUID (userid/buid)
     # A parameter is required
     assert models.User.all() == []
     assert models.User.all(defercols=True) == []
@@ -279,6 +294,8 @@ def test_user_all(
     }
 
     # Scenario 2: lookup by buid or username
+    assert user_ridcully.username is not None
+    assert user_dibbler.username is not None
     assert set(
         models.User.all(
             buids=[user_twoflower.buid, user_rincewind.buid],
@@ -309,7 +326,9 @@ def test_user_all(
     }
 
 
-def test_user_add_email(db_session, user_rincewind) -> None:
+def test_user_add_email(
+    db_session: scoped_session, user_rincewind: models.User
+) -> None:
     """Test to add email address for a user."""
     # scenario 1: if primary flag is True and user has no existing email
     email1 = 'rincewind@example.org'
@@ -335,7 +354,7 @@ def test_user_add_email(db_session, user_rincewind) -> None:
     assert useremail2.primary is False
 
 
-def test_make_email_primary(user_rincewind) -> None:
+def test_make_email_primary(user_rincewind: models.User) -> None:
     """Test to make an email primary for a user."""
     email = 'rincewind@example.org'
     accountemail = user_rincewind.add_email(email)
@@ -346,7 +365,7 @@ def test_make_email_primary(user_rincewind) -> None:
     assert accountemail.primary is True
 
 
-def test_user_password(user_twoflower) -> None:
+def test_user_password(user_twoflower: models.User) -> None:
     """Test to set user password."""
     # User account starts out with no password
     assert user_twoflower.pw_hash is None
@@ -356,18 +375,22 @@ def test_user_password(user_twoflower) -> None:
     assert user_twoflower.password_is('wrong-password') is False
 
 
-def test_user_password_has_expired(db_session, user_twoflower) -> None:
+def test_user_password_has_expired(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test to check if password for a user has expired."""
     assert user_twoflower.pw_hash is None
     user_twoflower.password = 'test-password'  # nosec
     db_session.commit()  # Required to set pw_expires_at and pw_set_at
+    assert user_twoflower.pw_expires_at is not None
+    assert user_twoflower.pw_set_at is not None
     assert user_twoflower.pw_expires_at > user_twoflower.pw_set_at
     assert user_twoflower.password_has_expired() is False
     user_twoflower.pw_expires_at = utcnow() - timedelta(seconds=1)
     assert user_twoflower.password_has_expired() is True
 
 
-def test_password_hash_upgrade(user_twoflower) -> None:
+def test_password_hash_upgrade(user_twoflower: models.User) -> None:
     """Test for password hash upgrade."""
     # pw_hash contains bcrypt.hash('password')
     user_twoflower.pw_hash = (
@@ -385,7 +408,7 @@ def test_password_hash_upgrade(user_twoflower) -> None:
     assert user_twoflower.pw_hash.startswith('$argon2id$')
 
 
-def test_password_not_truncated(user_twoflower) -> None:
+def test_password_not_truncated(user_twoflower: models.User) -> None:
     """Argon2 passwords are not truncated at up to 1000 characters."""
     # Bcrypt passwords are truncated at 72 characters, making larger length limits
     # pointless. Argon2 passwords are not truncated for a very large size. Passlib has
@@ -396,7 +419,9 @@ def test_password_not_truncated(user_twoflower) -> None:
     assert not user_twoflower.password_is('1' * 999 + 'b')
 
 
-def test_user_merged_user(db_session, user_death, user_rincewind) -> None:
+def test_user_merged_user(
+    db_session: scoped_session, user_death: models.User, user_rincewind: models.User
+) -> None:
     """Test for checking if user had a old id."""
     db_session.commit()
     assert user_death.state.ACTIVE
@@ -407,7 +432,12 @@ def test_user_merged_user(db_session, user_death, user_rincewind) -> None:
     assert {o.uuid for o in user_death.oldids} == {user_rincewind.uuid}
 
 
-def test_user_get(db_session, user_twoflower, user_rincewind, user_death) -> None:
+def test_user_get(
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    user_death: models.User,
+) -> None:
     """Test for User's get method."""
     # scenario 1: if both username and buid not passed
     db_session.commit()
diff --git a/tests/unit/models/account_name_test.py b/tests/unit/models/account_name_test.py
index 126356e65..bc4baae9d 100644
--- a/tests/unit/models/account_name_test.py
+++ b/tests/unit/models/account_name_test.py
@@ -1,14 +1,17 @@
 """Tests for Account name."""
 
-from typing import Literal
 
 import pytest
 from sqlalchemy.exc import IntegrityError
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_is_available_name(db_session, user_rincewind) -> None:
+
+def test_is_available_name(
+    db_session: scoped_session, user_rincewind: models.User
+) -> None:
     """Names are only available if valid and unused."""
     assert models.Account.is_available_name('invalid-name') is False
     # Rincewind has an account (nee profile) in default 'auto' status (not public, not
@@ -22,9 +25,7 @@ def test_is_available_name(db_session, user_rincewind) -> None:
 
 @pytest.mark.usefixtures('user_rincewind', 'org_uu')
 @pytest.mark.parametrize('model', ['A', 'U', 'O', 'P'])
-def test_validate_name_candidate(
-    db_session, model: Literal['A', 'U', 'O', 'P']
-) -> None:
+def test_validate_name_candidate(db_session: scoped_session, model: str) -> None:
     """The name validator returns error codes as expected."""
     modelref: dict[str, type[models.Account]] = {
         'A': models.Account,
@@ -49,7 +50,7 @@ def test_validate_name_candidate(
     assert cls.validate_name_candidate('UU') == 'org'
 
 
-def test_reserved_name(db_session) -> None:
+def test_reserved_name(db_session: scoped_session) -> None:
     """Names can be reserved, with no user or organization."""
     reserved_name = models.Placeholder(name='reserved_name')
     db_session.add(reserved_name)
@@ -66,7 +67,7 @@ def test_reserved_name(db_session) -> None:
     assert retrieved_name is reserved_name
 
 
-def test_unassigned_name(db_session) -> None:
+def test_unassigned_name(db_session: scoped_session) -> None:
     """Names must be assigned to a user or organization if not reserved."""
     unassigned_name = models.Account(name='unassigned')
     db_session.add(unassigned_name)
@@ -74,7 +75,9 @@ def test_unassigned_name(db_session) -> None:
         db_session.commit()
 
 
-def test_double_assigned_name(db_session, user_rincewind) -> None:
+def test_double_assigned_name(
+    db_session: scoped_session, user_rincewind: models.User
+) -> None:
     """Names cannot be assigned to a user and an organization simultaneously."""
     user = models.User(username="double_assigned", fullname="User")
     org = models.Organization(
@@ -85,7 +88,9 @@ def test_double_assigned_name(db_session, user_rincewind) -> None:
         db_session.commit()
 
 
-def test_cant_remove_username(db_session, user_twoflower) -> None:
+def test_cant_remove_username(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """A user's username can be set or renamed but not removed."""
     assert user_twoflower.username is None
     user_twoflower.username = 'username'
@@ -102,23 +107,27 @@ def test_cant_remove_username(db_session, user_twoflower) -> None:
 
     # Can't be an invalid value
     with pytest.raises(ValueError, match='Account name must be a string'):
-        user_twoflower.username = []
+        user_twoflower.username = []  # type: ignore[assignment]
 
     with pytest.raises(ValueError, match='Account name must be a string'):
-        user_twoflower.username = False
+        user_twoflower.username = False  # type: ignore[assignment]
 
     with pytest.raises(ValueError, match='Account name must be a string'):
-        user_twoflower.username = True
+        user_twoflower.username = True  # type: ignore[assignment]
 
 
-def test_cant_remove_orgname(db_session, org_uu) -> None:
+def test_cant_remove_orgname(
+    db_session: scoped_session, org_uu: models.Organization
+) -> None:
     """An org's name can be renamed but not removed."""
     assert org_uu.name == 'UU'
     org_uu.name = 'unseen'
     assert org_uu.name == 'unseen'
 
 
-def test_name_transfer(db_session, user_mort, user_rincewind) -> None:
+def test_name_transfer(
+    db_session: scoped_session, user_mort: models.User, user_rincewind: models.User
+) -> None:
     """Merging user accounts will transfer the name."""
     assert user_mort.username is None
     assert user_rincewind.username == 'rincewind'
@@ -129,7 +138,7 @@ def test_name_transfer(db_session, user_mort, user_rincewind) -> None:
     assert user_rincewind.username is None
 
 
-def test_urlname(user_twoflower, user_rincewind) -> None:
+def test_urlname(user_twoflower: models.User, user_rincewind: models.User) -> None:
     """An Account has a URL name even if there's no name."""
     assert user_twoflower.name is None
     assert user_rincewind.name == 'rincewind'
diff --git a/tests/unit/models/account_profile_test.py b/tests/unit/models/account_profile_test.py
index 00d2c780b..298e6c9a1 100644
--- a/tests/unit/models/account_profile_test.py
+++ b/tests/unit/models/account_profile_test.py
@@ -8,8 +8,12 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_account_logo_url_valid(db_session, new_organization) -> None:
+
+def test_account_logo_url_valid(
+    db_session: scoped_session, new_organization: models.Organization
+) -> None:
     assert new_organization.name == 'test_org'
     new_organization.logo_url = "https://images.example.com/"
     db_session.commit()  # Required to roundtrip logo_url from db and turn into furl
@@ -17,14 +21,18 @@ def test_account_logo_url_valid(db_session, new_organization) -> None:
     assert new_organization.logo_url.url == "https://images.example.com/"
 
 
-def test_account_logo_url_invalid(db_session, new_organization) -> None:
+def test_account_logo_url_invalid(
+    db_session: scoped_session, new_organization: models.Organization
+) -> None:
     new_organization.logo_url = "noturl"
     with pytest.raises(StatementError):
         db_session.commit()
     db_session.rollback()
 
 
-def test_user_avatar(db_session, user_twoflower, user_rincewind) -> None:
+def test_user_avatar(
+    db_session: scoped_session, user_twoflower: models.User, user_rincewind: models.User
+) -> None:
     """User.logo_url returns a coherent value despite content variations."""
     # Test fixture has what we need
     assert user_twoflower.name is None
@@ -32,7 +40,7 @@ def test_user_avatar(db_session, user_twoflower, user_rincewind) -> None:
     assert user_rincewind.logo_url is None
     db_session.commit()
 
-    # Now test avatar is Optional[ImgeeFurl]
+    # Now test avatar is ImgeeFurl | None
     assert user_twoflower.logo_url is None
     assert user_rincewind.logo_url is None
 
@@ -49,7 +57,9 @@ def test_user_avatar(db_session, user_twoflower, user_rincewind) -> None:
 
 
 @pytest.mark.filterwarnings("ignore:Object of type <AccountPhone> not in session")
-def test_suspended_user_private_profile(db_session, user_wolfgang) -> None:
+def test_suspended_user_private_profile(
+    db_session: scoped_session, user_wolfgang: models.User
+) -> None:
     """Suspending a user will mark their account page as private."""
     # Account cannot be public until the user has a verified phone number.
     # This constraint is enforced in the view and not in the model, as the test on
@@ -76,7 +86,9 @@ def test_suspended_user_private_profile(db_session, user_wolfgang) -> None:
         user_wolfgang.make_profile_public()
 
 
-def test_account_name_is(user_rincewind, org_uu, user_lutze) -> None:
+def test_account_name_is(
+    user_rincewind: models.User, org_uu: models.Organization, user_lutze: models.User
+) -> None:
     """Test Account.name_is to return a query filter."""
     assert (
         models.Account.query.filter(models.Account.name_is('rincewind')).one()
@@ -98,7 +110,9 @@ def test_account_name_is(user_rincewind, org_uu, user_lutze) -> None:
     )
 
 
-def test_account_name_in(user_rincewind, org_uu, user_lutze) -> None:
+def test_account_name_in(
+    user_rincewind: models.User, org_uu: models.Organization, user_lutze: models.User
+) -> None:
     """Test Account.name_in to return a query filter."""
     assert models.Account.query.filter(
         models.Account.name_in(['lu-tze', 'lu_tze'])
@@ -108,7 +122,9 @@ def test_account_name_in(user_rincewind, org_uu, user_lutze) -> None:
     ) == {user_rincewind, org_uu}
 
 
-def test_account_name_like(user_rincewind, user_ridcully, user_lutze) -> None:
+def test_account_name_like(
+    user_rincewind: models.User, user_ridcully: models.User, user_lutze: models.User
+) -> None:
     """Test Account.name_like to return a query filter."""
     assert set(models.Account.query.filter(models.Account.name_like('r%')).all()) == {
         user_rincewind,
diff --git a/tests/unit/models/auth_client_AuthClientPermissions_test.py b/tests/unit/models/auth_client_AuthClientPermissions_test.py
index a63dca1c8..48aea4327 100644
--- a/tests/unit/models/auth_client_AuthClientPermissions_test.py
+++ b/tests/unit/models/auth_client_AuthClientPermissions_test.py
@@ -2,6 +2,7 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 from .db_test import TestDatabaseFixture
 
 
@@ -34,7 +35,10 @@ def test_userclientpermissions_pickername(self) -> None:
 
 
 def test_userclientpermissions_migrate_account_move(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Migrating client permissions from old user to new user."""
     # Scenario 1: Twoflower has a permission and it is transferred to Rincewind
@@ -51,7 +55,10 @@ def test_userclientpermissions_migrate_account_move(
 
 
 def test_userclientpermissions_migrate_account_retain(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Retaining new user's client permissions when migrating assets from old user."""
     # Scenario 2: Rincewind has a permission, and keeps it after merging Twoflower
@@ -68,7 +75,10 @@ def test_userclientpermissions_migrate_account_retain(
 
 
 def test_userclientpermissions_migrate_account_merge(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Merging permissions granted to two users when migrating from one to other."""
     # Scenario 3: Twoflower and Rincewind each have permissions, and they get merged
diff --git a/tests/unit/models/auth_client_AuthToken_test.py b/tests/unit/models/auth_client_AuthToken_test.py
index 83658f899..2034da0f6 100644
--- a/tests/unit/models/auth_client_AuthToken_test.py
+++ b/tests/unit/models/auth_client_AuthToken_test.py
@@ -9,6 +9,7 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 from .db_test import TestDatabaseFixture
 
 
@@ -92,7 +93,7 @@ def test_authtoken_get(self) -> None:
         )
         auth_token = models.AuthToken(auth_client=dachsadv, account=oakley, scope=scope)
         token = auth_token.token
-        self.db_session.add(dachsadv, auth_token)
+        self.db_session.add_all([dachsadv, auth_token])
         result = models.AuthToken.get(token)
         assert isinstance(result, models.AuthToken)
         assert result.auth_client == dachsadv
@@ -210,7 +211,10 @@ def test_authtoken_algorithm(self) -> None:
 
 
 def test_authtoken_migrate_account_move(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Auth token is moved from old user to new user."""
     token = models.AuthToken(auth_client=client_hex, account=user_twoflower, scope='')
@@ -225,7 +229,10 @@ def test_authtoken_migrate_account_move(
 
 
 def test_authtoken_migrate_account_retain(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Auth token is retained on new user when migrating from old user."""
     token = models.AuthToken(auth_client=client_hex, account=user_rincewind, scope='')
@@ -240,7 +247,10 @@ def test_authtoken_migrate_account_retain(
 
 
 def test_authtoken_migrate_account_merge(
-    db_session, user_twoflower, user_rincewind, client_hex
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    client_hex: models.AuthClient,
 ) -> None:
     """Merging two auth token will merge their scope."""
     token1 = models.AuthToken(
diff --git a/tests/unit/models/auth_client_ScopeMixin_test.py b/tests/unit/models/auth_client_ScopeMixin_test.py
index 2b2e15657..173479171 100644
--- a/tests/unit/models/auth_client_ScopeMixin_test.py
+++ b/tests/unit/models/auth_client_ScopeMixin_test.py
@@ -6,8 +6,14 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_scopemixin_scope(db_session, client_hex, user_rincewind) -> None:
+
+def test_scopemixin_scope(
+    db_session: scoped_session,
+    client_hex: models.AuthClient,
+    user_rincewind: models.User,
+) -> None:
     """Retrieve scope on an ScopeMixin inherited class instance via `scope`."""
     scope = 'tricks'
     token = models.AuthToken(
@@ -18,7 +24,11 @@ def test_scopemixin_scope(db_session, client_hex, user_rincewind) -> None:
     assert token.scope == (scope,)
 
 
-def test_scopemixin_add_scope(db_session, client_hex, user_rincewind) -> None:
+def test_scopemixin_add_scope(
+    db_session: scoped_session,
+    client_hex: models.AuthClient,
+    user_rincewind: models.User,
+) -> None:
     """Test for adding scope to a ScopeMixin inherited class instance."""
     scope1 = 'spells'
     scope2 = 'charms'
@@ -30,7 +40,11 @@ def test_scopemixin_add_scope(db_session, client_hex, user_rincewind) -> None:
     assert token.scope == (scope2, scope1)
 
 
-def test_authcode_scope_null(db_session, client_hex, user_rincewind) -> None:
+def test_authcode_scope_null(
+    db_session: scoped_session,
+    client_hex: models.AuthClient,
+    user_rincewind: models.User,
+) -> None:
     """`AuthCode` can't have null scope but can have empty scope."""
     # Scope can't be None or empty
     with pytest.raises(ValueError, match='Scope cannot be None'):
@@ -70,7 +84,11 @@ def test_authcode_scope_null(db_session, client_hex, user_rincewind) -> None:
         db_session.commit()
 
 
-def test_authtoken_scope_null(db_session, client_hex, user_rincewind) -> None:
+def test_authtoken_scope_null(
+    db_session: scoped_session,
+    client_hex: models.AuthClient,
+    user_rincewind: models.User,
+) -> None:
     """`AuthToken` can't have null scope but can have empty scope."""
     # Scope can't be None or empty
     with pytest.raises(ValueError, match='Scope cannot be None'):
@@ -106,7 +124,9 @@ def test_authtoken_scope_null(db_session, client_hex, user_rincewind) -> None:
         db_session.commit()
 
 
-def test_authclient_scope_null(db_session, user_rincewind) -> None:
+def test_authclient_scope_null(
+    db_session: scoped_session, user_rincewind: models.User
+) -> None:
     """`AuthClient` can have empty scope."""
     auth_client = models.AuthClient(
         account=user_rincewind,
diff --git a/tests/unit/models/db_test.py b/tests/unit/models/db_test.py
index f177c950f..201c90a30 100644
--- a/tests/unit/models/db_test.py
+++ b/tests/unit/models/db_test.py
@@ -5,9 +5,13 @@
 
 from funnel import models
 
+from ...conftest import Flask, TestClient, scoped_session
+
 
 class Fixtures:
-    def make_fixtures(self, db_session):  # pylint: disable=too-many-locals
+    def make_fixtures(  # pylint: disable=too-many-locals
+        self, db_session: scoped_session
+    ) -> None:
         """
         Create fixtures.
 
@@ -83,7 +87,9 @@ def make_fixtures(self, db_session):  # pylint: disable=too-many-locals
 
 class TestDatabaseFixture:
     @pytest.fixture(autouse=True)
-    def _pytest_fixtures(self, app, client, db_session):
+    def _pytest_fixtures(
+        self, app: Flask, client: TestClient, db_session: scoped_session
+    ) -> None:
         self.client = client
         self.db_session = db_session
         self.app = app
diff --git a/tests/unit/models/email_address_test.py b/tests/unit/models/email_address_test.py
index 38dab0594..28010f46f 100644
--- a/tests/unit/models/email_address_test.py
+++ b/tests/unit/models/email_address_test.py
@@ -7,11 +7,13 @@
 
 import pytest
 import sqlalchemy as sa
+import sqlalchemy.orm as sa_orm
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Mapped
 
-from funnel import models
-from funnel.models import relationship
+from funnel import models, signals
+
+from ...conftest import Flask, SQLAlchemy, scoped_session
 
 # This hash map should not be edited -- hashes are permanent
 hash_map = {
@@ -28,15 +30,15 @@
 
 
 @pytest.fixture()
-def refcount_data(funnel) -> Generator:
-    refcount_signal_fired = set()
+def refcount_data() -> Generator[set[models.EmailAddress], None, None]:
+    refcount_signal_fired: set[models.EmailAddress] = set()
 
-    def refcount_signal_receiver(sender):
+    def refcount_signal_receiver(sender: models.EmailAddress) -> None:
         refcount_signal_fired.add(sender)
 
-    funnel.signals.emailaddress_refcount_dropping.connect(refcount_signal_receiver)
+    signals.emailaddress_refcount_dropping.connect(refcount_signal_receiver)
     yield refcount_signal_fired
-    funnel.signals.emailaddress_refcount_dropping.disconnect(refcount_signal_receiver)
+    signals.emailaddress_refcount_dropping.disconnect(refcount_signal_receiver)
 
 
 def test_email_normalized() -> None:
@@ -55,7 +57,7 @@ def test_email_normalized() -> None:
 
 
 def test_email_hash_stability() -> None:
-    """Safety test to ensure email_blakeb160_hash doesn't change spec."""
+    """Safety test to ensure email_blake2b160_hash doesn't change spec."""
     ehash = models.email_address.email_blake2b160_hash
     assert ehash('example@example.com') == hash_map['example@example.com']
     # email_hash explicitly uses the normalized form (but not the canonical form)
@@ -233,14 +235,16 @@ def test_email_address_is_blocked_flag() -> None:
         ea.is_blocked = True
 
 
-def test_email_address_can_commit(db_session) -> None:
+def test_email_address_can_commit(db_session: scoped_session) -> None:
     """An `EmailAddress` can be committed to db."""
     ea = models.EmailAddress('example@example.com')
     db_session.add(ea)
     db_session.commit()
 
 
-def test_email_address_conflict_integrity_error(db_session) -> None:
+def test_email_address_conflict_integrity_error(
+    db_session: scoped_session,
+) -> None:
     """A conflicting `EmailAddress` cannot be committed to db."""
     ea1 = models.EmailAddress('example@example.com')
     db_session.add(ea1)
@@ -258,7 +262,7 @@ def test_email_address_conflict_integrity_error(db_session) -> None:
         db_session.commit()
 
 
-def test_email_address_get(db_session) -> None:
+def test_email_address_get(db_session: scoped_session) -> None:
     """Email addresses can be loaded using EmailAddress.get."""
     ea1 = models.EmailAddress('example@example.com')
     ea2 = models.EmailAddress('example+extra@example.com')
@@ -296,7 +300,7 @@ def test_email_address_invalid_hash_raises_error() -> None:
         models.EmailAddress.get(email_hash='invalid')
 
 
-def test_email_address_get_canonical(db_session) -> None:
+def test_email_address_get_canonical(db_session: scoped_session) -> None:
     """EmailAddress.get_canonical returns all matching records."""
     ea1 = models.EmailAddress('example@example.com')
     ea2 = models.EmailAddress('example+extra@example.com')
@@ -409,7 +413,9 @@ def test_email_address_delivery_state() -> None:
 # 2. Remove table from metadata using Model.metadata.remove(cls.__table__)
 # 3. Remove all relationships to other classes (unsolved)
 @pytest.fixture(scope='session')
-def email_models(database, app) -> Generator:
+def email_models(
+    database: SQLAlchemy, app: Flask
+) -> Generator[SimpleNamespace, None, None]:
     class EmailUser(models.BaseMixin, models.Model):
         """Test model representing a user account."""
 
@@ -419,55 +425,59 @@ class EmailLink(models.EmailAddressMixin, models.BaseMixin, models.Model):
         """Test model connecting EmailUser to EmailAddress."""
 
         __tablename__ = 'test_email_link'
-        __email_optional__ = False
         __email_unique__ = True
         __email_for__ = 'emailuser'
         __email_is_exclusive__ = True
 
-        emailuser_id: Mapped[int] = sa.orm.mapped_column(
-            sa.Integer, sa.ForeignKey('test_email_user.id'), nullable=False
+        emailuser_id: Mapped[int] = sa_orm.mapped_column(
+            sa.ForeignKey('test_email_user.id'), default=None, nullable=False
         )
-        emailuser = relationship(EmailUser)
+        emailuser: Mapped[EmailUser] = models.relationship()
 
-    class EmailDocument(models.EmailAddressMixin, models.BaseMixin, models.Model):
+    class EmailDocument(
+        models.OptionalEmailAddressMixin, models.BaseMixin, models.Model
+    ):
         """Test model unaffiliated to a user that has an email address attached."""
 
         __tablename__ = 'test_email_document'
 
-    class EmailLinkedDocument(models.EmailAddressMixin, models.BaseMixin, models.Model):
+    class EmailLinkedDocument(
+        models.OptionalEmailAddressMixin, models.BaseMixin, models.Model
+    ):
         """Test model that accepts an optional user and an optional email."""
 
         __tablename__ = 'test_email_linked_document'
         __email_for__ = 'emailuser'
 
-        emailuser_id: Mapped[int | None] = sa.orm.mapped_column(
-            sa.Integer, sa.ForeignKey('test_email_user.id'), nullable=True
+        emailuser_id: Mapped[int | None] = sa_orm.mapped_column(
+            sa.ForeignKey('test_email_user.id'), default=None, nullable=True
         )
-        emailuser: Mapped[EmailUser | None] = relationship(EmailUser)
+        emailuser: Mapped[EmailUser | None] = models.relationship()
 
-    new_models = [EmailUser, EmailLink, EmailDocument, EmailLinkedDocument]
+    new_models: list[type[models.ModelIdProtocol]] = [
+        EmailUser,
+        EmailLink,
+        EmailDocument,
+        EmailLinkedDocument,
+    ]
 
-    sa.orm.configure_mappers()
+    sa_orm.configure_mappers()
     # These models do not use __bind_key__ so no bind is provided to create_all/drop_all
     with app.app_context():
         database.metadata.create_all(
             bind=database.engine,
-            tables=[
-                model.__table__ for model in new_models  # type: ignore[attr-defined]
-            ],
+            tables=[model.__table__ for model in new_models],
         )
     yield SimpleNamespace(**{model.__name__: model for model in new_models})
     with app.app_context():
         database.metadata.drop_all(
             bind=database.engine,
-            tables=[
-                model.__table__ for model in new_models  # type: ignore[attr-defined]
-            ],
+            tables=[model.__table__ for model in new_models],
         )
 
 
 def test_email_address_mixin(  # pylint: disable=too-many-locals,too-many-statements
-    email_models, db_session
+    email_models: SimpleNamespace, db_session: scoped_session
 ) -> None:
     """The EmailAddressMixin class adds safety checks for using an email address."""
     blocked_email = models.EmailAddress('blocked@example.com')
@@ -487,6 +497,7 @@ def test_email_address_mixin(  # pylint: disable=too-many-locals,too-many-statem
     link1 = email_models.EmailLink(emailuser=user1, email='example@example.com')
     db_session.add(link1)
     ea1 = models.EmailAddress.get('example@example.com')
+    assert ea1 is not None
     assert link1.email == 'example@example.com'
     assert link1.email_address == ea1
     assert link1.transport_hash == ea1.transport_hash
@@ -496,6 +507,7 @@ def test_email_address_mixin(  # pylint: disable=too-many-locals,too-many-statem
     link2 = email_models.EmailLink(emailuser=user2, email='other@example.com')
     db_session.add(link2)
     ea2 = models.EmailAddress.get('other@example.com')
+    assert ea2 is not None
     assert link2.email == 'other@example.com'
     assert link2.email_address == ea2
     assert link2.transport_hash == ea2.transport_hash
@@ -604,7 +616,11 @@ def test_email_address_mixin(  # pylint: disable=too-many-locals,too-many-statem
     assert ea1.email == 'example@example.com'
 
 
-def test_email_address_refcount_drop(email_models, db_session, refcount_data) -> None:
+def test_email_address_refcount_drop(
+    email_models: SimpleNamespace,
+    db_session: scoped_session,
+    refcount_data: set[models.EmailAddress],
+) -> None:
     """Test that EmailAddress.refcount drop events are fired."""
     # The refcount changing signal handler will have received events for every email
     # address in this test. A request teardown processor can use this to determine
@@ -641,7 +657,9 @@ def test_email_address_refcount_drop(email_models, db_session, refcount_data) ->
     assert ea.refcount() == 0
 
 
-def test_email_address_validate_for(email_models, db_session) -> None:
+def test_email_address_validate_for(
+    email_models: SimpleNamespace, db_session: scoped_session
+) -> None:
     """EmailAddress.validate_for can be used to determine availability."""
     user1 = email_models.EmailUser()
     user2 = email_models.EmailUser()
@@ -713,7 +731,7 @@ def test_email_address_validate_for(email_models, db_session) -> None:
 
 
 def test_email_address_existing_but_unused_validate_for(
-    email_models, db_session
+    email_models: SimpleNamespace, db_session: scoped_session
 ) -> None:
     """An unused but existing email address should be available to claim."""
     user = email_models.EmailUser()
@@ -729,7 +747,9 @@ def test_email_address_existing_but_unused_validate_for(
 
 
 @pytest.mark.flaky(reruns=1)  # Re-run in case DNS times out
-def test_email_address_validate_for_check_dns(email_models, db_session) -> None:
+def test_email_address_validate_for_check_dns(
+    email_models: SimpleNamespace, db_session: scoped_session
+) -> None:
     """Validate_for with check_dns=True. Separate test as DNS lookup may fail."""
     user1 = email_models.EmailUser()
     user2 = email_models.EmailUser()
diff --git a/tests/unit/models/helpers_test.py b/tests/unit/models/helpers_test.py
index b0b7dc3b0..315de719d 100644
--- a/tests/unit/models/helpers_test.py
+++ b/tests/unit/models/helpers_test.py
@@ -1,11 +1,14 @@
 """Tests for model helpers."""
 # pylint: disable=possibly-unused-variable,redefined-outer-name
 
+from collections.abc import Callable, Generator
 from types import SimpleNamespace
+from typing import LiteralString, cast
 
 import pytest
 import sqlalchemy as sa
-from flask_babel import lazy_gettext
+import sqlalchemy.orm as sa_orm
+from flask_babel import lazy_gettext as lazy_gettext_base
 from furl import furl
 from sqlalchemy.exc import StatementError
 from sqlalchemy.orm import Mapped
@@ -13,6 +16,10 @@
 import funnel.models.helpers as mhelpers
 from funnel import models
 
+from ...conftest import Flask, SQLAlchemy, scoped_session
+
+lazy_gettext = cast(Callable[[LiteralString], str], lazy_gettext_base)
+
 
 def test_valid_name() -> None:
     """Names are lowercase and contain letters, numbers and non-terminal hyphens."""
@@ -88,14 +95,14 @@ class TestMetaclass(type):  # pylint: disable=unused-variable
         pass
 
     class OriginalClass:
-        def spam(self):
+        def spam(self) -> str:
             return "spam"
 
     saved_reference = OriginalClass
 
     @mhelpers.reopen(OriginalClass)
     class ReopenedClass:
-        def eggs(self):
+        def eggs(self) -> str:
             return "eggs"
 
     # The decorator returns the original class with the decorated class's contents
@@ -120,7 +127,7 @@ class HasMetaclass(metaclass=TestMetaclass):  # pylint: disable=unused-variable
 
     # The decorator will refuse to process classes that affect the original's attributes
     # (__slots__, __getattribute__, __get/set/delattr__)
-    with pytest.raises(TypeError, match='contains unsupported __attributes__'):
+    with pytest.raises(TypeError, match='contains unsupported __dunder__'):
 
         @mhelpers.reopen(OriginalClass)
         class HasSlots:  # pylint: disable=unused-variable
@@ -131,7 +138,7 @@ def test_add_to_class() -> None:
     """Add to class adds new attributes to a class."""
 
     class ReferenceClass:
-        def spam(self):
+        def spam(self) -> str:
             return 'is_spam'
 
     assert ReferenceClass().spam() == 'is_spam'
@@ -139,7 +146,7 @@ def spam(self):
 
     # New methods can be added
     @mhelpers.add_to_class(ReferenceClass)
-    def eggs(self):  # skipcq: PTC-W0065
+    def eggs(self: ReferenceClass) -> str:  # skipcq: PTC-W0065
         return 'is_eggs'
 
     assert hasattr(ReferenceClass, 'eggs')
@@ -150,37 +157,51 @@ def eggs(self):  # skipcq: PTC-W0065
     # New methods can have a custom name and can take any decorator valid in the class
     @mhelpers.add_to_class(ReferenceClass, 'spameggs')  # type: ignore[misc]
     @property
-    def spameggs_property(self) -> str:
+    def spameggs_property(self: ReferenceClass) -> str:
         return 'is_spameggs'
 
     assert hasattr(ReferenceClass, 'spameggs')
     assert not hasattr(ReferenceClass, 'spameggs_property')
-    assert ReferenceClass.spameggs is spameggs_property
+    assert ReferenceClass.spameggs is spameggs_property  # pyright: ignore
     assert ReferenceClass().spameggs == 'is_spameggs'  # type: ignore[attr-defined]
 
     # Existing attributes cannot be replaced
     with pytest.raises(AttributeError):
 
         @mhelpers.add_to_class(ReferenceClass, 'spameggs')
-        def new_foobar(self):  # skipcq: PTC-W0049
+        def new_foobar(self: ReferenceClass) -> None:  # skipcq: PTC-W0049
             """Cause an AttributeError in the decorator."""
 
 
 @pytest.fixture(scope='session')
-def image_models(database, app):
+def image_models(
+    database: SQLAlchemy, app: Flask
+) -> Generator[SimpleNamespace, None, None]:
     class MyImageModel(models.Model):
         __tablename__ = 'test_my_image_model'
-        id: Mapped[int] = sa.orm.mapped_column(  # noqa: A003
+        id: Mapped[int] = sa_orm.mapped_column(  # noqa: A003
             sa.Integer, primary_key=True
         )
-        image_url: Mapped[furl] = sa.orm.mapped_column(models.ImgeeType)
+        image_url: Mapped[furl] = sa_orm.mapped_column(models.ImgeeType)
+
+    new_models = [MyImageModel]
 
+    sa_orm.configure_mappers()
+    # These models do not use __bind_key__ so no bind is provided to create_all/drop_all
     with app.app_context():
-        database.create_all()
-    return SimpleNamespace(**locals())
+        database.metadata.create_all(
+            bind=database.engine,
+            tables=[model.__table__ for model in new_models],
+        )
+    yield SimpleNamespace(**{model.__name__: model for model in new_models})
+    with app.app_context():
+        database.metadata.drop_all(
+            bind=database.engine,
+            tables=[model.__table__ for model in new_models],
+        )
 
 
-def test_imgeetype(db_session, image_models) -> None:
+def test_imgeetype(db_session: scoped_session, image_models: SimpleNamespace) -> None:
     valid_url = "https://images.example.com/embed/file/randomimagehash"
     valid_url_with_resize = (
         "https://images.example.com/embed/file/randomimagehash?size=120x100"
@@ -260,7 +281,7 @@ def test_imgeetype(db_session, image_models) -> None:
         ('\\%', True, r'%\\\%%'),
     ],
 )
-def test_quote_autocomplete_like(prefix, midway, query) -> None:
+def test_quote_autocomplete_like(prefix: str, midway: bool, query: str) -> None:
     """Test that the LIKE-based autocomplete helper function escapes correctly."""
     assert mhelpers.quote_autocomplete_like(prefix, midway) == query
 
@@ -273,7 +294,9 @@ def test_quote_autocomplete_like(prefix, midway, query) -> None:
         ('am', "'am':*"),  # No stemming (would have been invalid ':*' otherwise)
     ],
 )
-def test_quote_autocomplete_tsquery(db_session, prefix, tsquery) -> None:
+def test_quote_autocomplete_tsquery(
+    db_session: scoped_session, prefix: str, tsquery: str
+) -> None:
     assert (
         db_session.query(mhelpers.quote_autocomplete_tsquery(prefix)).scalar()
         == tsquery
@@ -281,7 +304,7 @@ def test_quote_autocomplete_tsquery(db_session, prefix, tsquery) -> None:
 
 
 def test_message_composite() -> None:
-    """Test mhelpers.MessageComposite has similar properties to MarkdownComposite."""
+    """Test MessageComposite has similar properties to MarkdownComposite."""
     text1 = mhelpers.MessageComposite("Text1")
     assert text1.text == "Text1"
     assert text1.html == "<p>Text1</p>"
diff --git a/tests/unit/models/label_test.py b/tests/unit/models/label_test.py
index 93136ef85..42ffa1c90 100644
--- a/tests/unit/models/label_test.py
+++ b/tests/unit/models/label_test.py
@@ -5,7 +5,7 @@
 from funnel import models
 
 
-def test_main_label_from_fixture(new_main_label) -> None:
+def test_main_label_from_fixture(new_main_label: models.Label) -> None:
     assert new_main_label.title == "Parent Label A"
     assert new_main_label.has_options
     assert new_main_label.required
@@ -14,7 +14,7 @@ def test_main_label_from_fixture(new_main_label) -> None:
     assert len(new_main_label.options) > 0
 
 
-def test_child_label_from_fixture(new_main_label) -> None:
+def test_child_label_from_fixture(new_main_label: models.Label) -> None:
     assert len(new_main_label.options) > 0
     label_a1 = new_main_label.options[0]
     assert label_a1.title == "Label A1"
@@ -28,7 +28,7 @@ def test_child_label_from_fixture(new_main_label) -> None:
         label_a1.restricted = True
 
 
-def test_label_from_fixture(new_label) -> None:
+def test_label_from_fixture(new_label: models.Label) -> None:
     assert new_label.title == "Label B"
     assert new_label.icon_emoji == "🔟"
     assert new_label.icon == "🔟"
@@ -39,7 +39,9 @@ def test_label_from_fixture(new_label) -> None:
         new_label.required = True
 
 
-def test_proposal_assignment_radio(new_main_label, new_proposal) -> None:
+def test_proposal_assignment_radio(
+    new_main_label: models.Label, new_proposal: models.Proposal
+) -> None:
     # Parent labels are always in radio mode
     label_a1 = new_main_label.options[0]
     label_a2 = new_main_label.options[1]
@@ -53,7 +55,7 @@ def test_proposal_assignment_radio(new_main_label, new_proposal) -> None:
     assert label_a2 in new_proposal.labels
 
 
-def test_label_flags(new_main_label, new_label) -> None:
+def test_label_flags(new_main_label: models.Label, new_label: models.Label) -> None:
     restricted_labels = models.Label.query.filter(
         models.Label.restricted.is_(True)
     ).all()
@@ -61,7 +63,7 @@ def test_label_flags(new_main_label, new_label) -> None:
     assert new_label not in restricted_labels
 
 
-def test_label_icon(new_label) -> None:
+def test_label_icon(new_label: models.Label) -> None:
     # if the label has icon_emoji, that's get set as icon
     assert new_label.icon == new_label.icon_emoji
     new_label.icon_emoji = ""
@@ -69,7 +71,7 @@ def test_label_icon(new_label) -> None:
     assert new_label.icon == "LB"
 
 
-def test_label_archived(new_label) -> None:
+def test_label_archived(new_label: models.Label) -> None:
     assert new_label.archived is False
     assert new_label._archived is False  # pylint: disable=protected-access
     new_label.archived = True
diff --git a/tests/unit/models/merge_membership_test.py b/tests/unit/models/merge_membership_test.py
index e35390334..ee33287da 100644
--- a/tests/unit/models/merge_membership_test.py
+++ b/tests/unit/models/merge_membership_test.py
@@ -5,9 +5,15 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 @pytest.fixture()
-def death_membership(db_session, org_ankhmorpork, user_death):
+def death_membership(
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+) -> models.AccountMembership:
     membership = models.AccountMembership(account=org_ankhmorpork, member=user_death)
     db_session.add(membership)
     db_session.commit()
@@ -15,7 +21,11 @@ def death_membership(db_session, org_ankhmorpork, user_death):
 
 
 @pytest.fixture()
-def death_owner_membership(db_session, org_ankhmorpork, user_death):
+def death_owner_membership(
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+) -> models.AccountMembership:
     membership = models.AccountMembership(
         account=org_ankhmorpork, member=user_death, is_owner=True
     )
@@ -25,7 +35,11 @@ def death_owner_membership(db_session, org_ankhmorpork, user_death):
 
 
 @pytest.fixture()
-def rincewind_membership(db_session, org_ankhmorpork, user_rincewind):
+def rincewind_membership(
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_rincewind: models.User,
+) -> models.AccountMembership:
     membership = models.AccountMembership(
         account=org_ankhmorpork, member=user_rincewind
     )
@@ -35,7 +49,11 @@ def rincewind_membership(db_session, org_ankhmorpork, user_rincewind):
 
 
 @pytest.fixture()
-def rincewind_owner_membership(db_session, org_ankhmorpork, user_rincewind):
+def rincewind_owner_membership(
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_rincewind: models.User,
+) -> models.AccountMembership:
     membership = models.AccountMembership(
         account=org_ankhmorpork, member=user_rincewind, is_owner=True
     )
@@ -48,7 +66,11 @@ def rincewind_owner_membership(db_session, org_ankhmorpork, user_rincewind):
 
 
 def test_merge_without_membership(
-    db_session, org_ankhmorpork, user_death, user_vetinari, user_rincewind
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
 ) -> None:
     """Merge without any memberships works."""
     assert org_ankhmorpork.active_admin_memberships.count() == 1
@@ -62,12 +84,12 @@ def test_merge_without_membership(
 
 
 def test_merge_with_death_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    death_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    death_membership: models.AccountMembership,
 ) -> None:
     """When only the older account has a membership, it works."""
     assert org_ankhmorpork.active_admin_memberships.count() == 2
@@ -83,12 +105,12 @@ def test_merge_with_death_membership(
 
 
 def test_merge_with_rincewind_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    rincewind_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    rincewind_membership: models.AccountMembership,
 ) -> None:
     """When only the newer account has a membership, it is transferred."""
     assert org_ankhmorpork.active_admin_memberships.count() == 2
@@ -104,13 +126,13 @@ def test_merge_with_rincewind_membership(
 
 
 def test_merge_with_admin_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    death_membership,
-    rincewind_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    death_membership: models.AccountMembership,
+    rincewind_membership: models.AccountMembership,
 ) -> None:
     """When both have equal memberships, older account's is preserved."""
     assert org_ankhmorpork.active_admin_memberships.count() == 3
@@ -132,13 +154,13 @@ def test_merge_with_admin_membership(
 
 
 def test_merge_with_death_owner_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    death_owner_membership,
-    rincewind_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    death_owner_membership: models.AccountMembership,
+    rincewind_membership: models.AccountMembership,
 ) -> None:
     """When older user has more roles, older account's is preserved."""
     assert org_ankhmorpork.active_admin_memberships.count() == 3
@@ -160,13 +182,13 @@ def test_merge_with_death_owner_membership(
 
 
 def test_merge_with_rincewind_owner_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    death_membership,
-    rincewind_owner_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    death_membership: models.AccountMembership,
+    rincewind_owner_membership: models.AccountMembership,
 ) -> None:
     """When newer user has more roles, both are revoked and new record is created."""
     assert org_ankhmorpork.active_admin_memberships.count() == 3
@@ -188,13 +210,13 @@ def test_merge_with_rincewind_owner_membership(
 
 
 def test_merge_with_owner_membership(
-    db_session,
-    org_ankhmorpork,
-    user_death,
-    user_vetinari,
-    user_rincewind,
-    death_owner_membership,
-    rincewind_owner_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    user_death: models.User,
+    user_vetinari: models.User,
+    user_rincewind: models.User,
+    death_owner_membership: models.AccountMembership,
+    rincewind_owner_membership: models.AccountMembership,
 ) -> None:
     """When both have equal superior memberships, older account's is preserved."""
     assert org_ankhmorpork.active_admin_memberships.count() == 3
@@ -220,15 +242,15 @@ def test_merge_with_owner_membership(
 
 
 def test_merge_multiple_memberships(
-    db_session,
-    org_ankhmorpork,
-    org_uu,
-    user_death,
-    user_rincewind,
-    user_vetinari,
-    user_ridcully,
-    death_membership,
-    rincewind_owner_membership,
+    db_session: scoped_session,
+    org_ankhmorpork: models.Organization,
+    org_uu: models.Organization,
+    user_death: models.User,
+    user_rincewind: models.User,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    death_membership: models.AccountMembership,
+    rincewind_owner_membership: models.AccountMembership,
 ) -> None:
     """Merger with memberships across organizations works."""
     uu_death_owner_membership = models.AccountMembership(
diff --git a/tests/unit/models/merge_notification_test.py b/tests/unit/models/merge_notification_test.py
index 4310cda64..0621a05c4 100644
--- a/tests/unit/models/merge_notification_test.py
+++ b/tests/unit/models/merge_notification_test.py
@@ -7,23 +7,26 @@
 
 import pytest
 import sqlalchemy as sa
+import sqlalchemy.orm as sa_orm
 
 from funnel import models
 
+from ...conftest import SQLAlchemy, scoped_session
+
 
 @pytest.fixture(scope='session')
-def fixture_notification_type(database) -> Any:
+def fixture_notification_type(database: SQLAlchemy) -> Any:
     class MergeTestNotification(
         models.Notification[models.User, None], type='merge_test'
     ):
         """Test notification."""
 
-    database.configure_mappers()
+    sa_orm.configure_mappers()
     return MergeTestNotification
 
 
 @pytest.fixture()
-def fixtures(db_session):
+def fixtures(db_session: scoped_session) -> SimpleNamespace:
     # pylint: disable=possibly-unused-variable
     owner = models.User(
         username='owner',
@@ -50,7 +53,9 @@ def fixtures(db_session):
 
 
 @pytest.fixture()
-def notification(db_session, fixtures):
+def notification(
+    db_session: scoped_session, fixtures: SimpleNamespace
+) -> models.OrganizationAdminMembershipNotification:
     new_notification = models.OrganizationAdminMembershipNotification(
         document=fixtures.org, fragment=fixtures.membership
     )
@@ -60,7 +65,11 @@ def notification(db_session, fixtures):
 
 
 @pytest.fixture()
-def notification_recipient1(db_session, fixtures, notification):
+def notification_recipient1(
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    notification: models.OrganizationAdminMembershipNotification,
+) -> models.NotificationRecipient:
     nr = models.NotificationRecipient(
         eventid=notification.eventid,
         recipient_id=fixtures.user1.id,
@@ -73,7 +82,11 @@ def notification_recipient1(db_session, fixtures, notification):
 
 
 @pytest.fixture()
-def notification_recipient2(db_session, fixtures, notification):
+def notification_recipient2(
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    notification: models.OrganizationAdminMembershipNotification,
+) -> models.NotificationRecipient:
     nr = models.NotificationRecipient(
         eventid=notification.eventid,
         recipient_id=fixtures.user2.id,
@@ -86,7 +99,9 @@ def notification_recipient2(db_session, fixtures, notification):
 
 
 @pytest.fixture()
-def user1_main_preferences(db_session, fixtures):
+def user1_main_preferences(
+    db_session: scoped_session, fixtures: SimpleNamespace
+) -> models.NotificationPreferences:
     prefs = models.NotificationPreferences(notification_type='', account=fixtures.user1)
     db_session.add(prefs)
     db_session.commit()
@@ -94,7 +109,11 @@ def user1_main_preferences(db_session, fixtures):
 
 
 @pytest.fixture()
-def user1_test_preferences(db_session, fixtures, fixture_notification_type):
+def user1_test_preferences(
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    fixture_notification_type: Any,
+) -> models.NotificationPreferences:
     prefs = models.NotificationPreferences(
         notification_type='merge_test', account=fixtures.user1
     )
@@ -104,7 +123,9 @@ def user1_test_preferences(db_session, fixtures, fixture_notification_type):
 
 
 @pytest.fixture()
-def user2_main_preferences(db_session, fixtures):
+def user2_main_preferences(
+    db_session: scoped_session, fixtures: SimpleNamespace
+) -> models.NotificationPreferences:
     prefs = models.NotificationPreferences(notification_type='', account=fixtures.user2)
     db_session.add(prefs)
     db_session.commit()
@@ -112,7 +133,11 @@ def user2_main_preferences(db_session, fixtures):
 
 
 @pytest.fixture()
-def user2_test_preferences(db_session, fixtures, fixture_notification_type):
+def user2_test_preferences(
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    fixture_notification_type: Any,
+) -> models.NotificationPreferences:
     prefs = models.NotificationPreferences(
         notification_type='merge_test', account=fixtures.user2
     )
@@ -124,7 +149,9 @@ def user2_test_preferences(db_session, fixtures, fixture_notification_type):
 # --- Tests for UserNotification -------------------------------------------------------
 
 
-def test_merge_without_notifications(db_session, fixtures) -> None:
+def test_merge_without_notifications(
+    db_session: scoped_session, fixtures: SimpleNamespace
+) -> None:
     """Merge without any notifications works."""
     assert models.Notification.query.count() == 0
     assert models.NotificationRecipient.query.count() == 0
@@ -136,7 +163,9 @@ def test_merge_without_notifications(db_session, fixtures) -> None:
 
 
 def test_merge_with_user1_notifications(
-    db_session, fixtures, notification_recipient1
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    notification_recipient1: models.NotificationRecipient,
 ) -> None:
     """Merge without only user1 notifications works."""
     assert models.Notification.query.count() == 1
@@ -150,7 +179,9 @@ def test_merge_with_user1_notifications(
 
 
 def test_merge_with_user2_notifications(
-    db_session, fixtures, notification_recipient2
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    notification_recipient2: models.NotificationRecipient,
 ) -> None:
     """Merge without only user2 notifications gets it transferred to user1."""
     assert models.Notification.query.count() == 1
@@ -170,7 +201,10 @@ def test_merge_with_user2_notifications(
 
 
 def test_merge_with_dupe_notifications(
-    db_session, fixtures, notification_recipient1, notification_recipient2
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    notification_recipient1: models.NotificationRecipient,
+    notification_recipient2: models.NotificationRecipient,
 ) -> None:
     """Merge without dupe notifications gets one deleted."""
     assert models.Notification.query.count() == 1
@@ -188,7 +222,10 @@ def test_merge_with_dupe_notifications(
 
 
 def test_merge_with_user1_preferences(
-    db_session, fixtures, user1_main_preferences, user1_test_preferences
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    user1_main_preferences: models.NotificationPreferences,
+    user1_test_preferences: models.NotificationPreferences,
 ) -> None:
     """When preferences are only on the older user's account, nothing changes."""
     assert models.NotificationPreferences.query.count() == 2
@@ -201,7 +238,10 @@ def test_merge_with_user1_preferences(
 
 
 def test_merge_with_user2_preferences(
-    db_session, fixtures, user2_main_preferences, user2_test_preferences
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    user2_main_preferences: models.NotificationPreferences,
+    user2_test_preferences: models.NotificationPreferences,
 ) -> None:
     """When preferences are only on the newer user's account, they are transferred."""
     assert models.NotificationPreferences.query.count() == 2
@@ -214,12 +254,12 @@ def test_merge_with_user2_preferences(
 
 
 def test_merge_with_both_preferences(
-    db_session,
-    fixtures,
-    user1_main_preferences,
-    user1_test_preferences,
-    user2_main_preferences,
-    user2_test_preferences,
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    user1_main_preferences: models.NotificationPreferences,
+    user1_test_preferences: models.NotificationPreferences,
+    user2_main_preferences: models.NotificationPreferences,
+    user2_test_preferences: models.NotificationPreferences,
 ) -> None:
     """When preferences are for both users, the newer user's are deleted."""
     assert models.NotificationPreferences.query.count() == 4
@@ -234,11 +274,11 @@ def test_merge_with_both_preferences(
 
 
 def test_merge_with_mixed_preferences(
-    db_session,
-    fixtures,
-    user1_main_preferences,
-    user2_main_preferences,
-    user2_test_preferences,
+    db_session: scoped_session,
+    fixtures: SimpleNamespace,
+    user1_main_preferences: models.NotificationPreferences,
+    user2_main_preferences: models.NotificationPreferences,
+    user2_test_preferences: models.NotificationPreferences,
 ) -> None:
     """A mix of transfers and deletions can happen."""
     assert models.NotificationPreferences.query.count() == 3
diff --git a/tests/unit/models/merge_team_test.py b/tests/unit/models/merge_team_test.py
index afc8407c6..64155b8d6 100644
--- a/tests/unit/models/merge_team_test.py
+++ b/tests/unit/models/merge_team_test.py
@@ -9,9 +9,11 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 @pytest.fixture()
-def team_merge_data(db_session):
+def team_merge_data(db_session: scoped_session) -> SimpleNamespace:
     user1 = models.User(
         username='user1',
         fullname="User 1",
@@ -28,7 +30,7 @@ def team_merge_data(db_session):
     return SimpleNamespace(**locals())
 
 
-def test_team_migrate_user1(team_merge_data) -> None:
+def test_team_migrate_user1(team_merge_data: SimpleNamespace) -> None:
     """
     Test to verify teams are transferred when merging users.
 
@@ -41,13 +43,14 @@ def test_team_migrate_user1(team_merge_data) -> None:
     assert team_merge_data.user2.member_teams == []
 
     merged = models.merge_accounts(team_merge_data.user1, team_merge_data.user2)
+    assert merged is not None
     assert merged == team_merge_data.user1
     assert merged.member_teams == [team_merge_data.team]
     assert team_merge_data.user1.member_teams == [team_merge_data.team]
     assert team_merge_data.user2.member_teams == []
 
 
-def test_team_migrate_user2(team_merge_data) -> None:
+def test_team_migrate_user2(team_merge_data: SimpleNamespace) -> None:
     """
     Test to verify teams are transferred when merging users.
 
@@ -60,13 +63,14 @@ def test_team_migrate_user2(team_merge_data) -> None:
     assert team_merge_data.user2.member_teams == [team_merge_data.team]
 
     merged = models.merge_accounts(team_merge_data.user1, team_merge_data.user2)
+    assert merged is not None
     assert merged == team_merge_data.user1
     assert merged.member_teams == [team_merge_data.team]
     assert team_merge_data.user1.member_teams == [team_merge_data.team]
     assert team_merge_data.user2.member_teams == []
 
 
-def test_team_migrate_user3(team_merge_data) -> None:
+def test_team_migrate_user3(team_merge_data: SimpleNamespace) -> None:
     """
     Test to verify teams are transferred when merging users.
 
@@ -83,6 +87,7 @@ def test_team_migrate_user3(team_merge_data) -> None:
     assert team_merge_data.user2.member_teams == [team_merge_data.team]
 
     merged = models.merge_accounts(team_merge_data.user1, team_merge_data.user2)
+    assert merged is not None
     assert merged == team_merge_data.user1
     assert merged.member_teams == [team_merge_data.team]
     assert team_merge_data.user1.member_teams == [team_merge_data.team]
diff --git a/tests/unit/models/models_utils_test.py b/tests/unit/models/models_utils_test.py
index af64194f6..800b333b1 100644
--- a/tests/unit/models/models_utils_test.py
+++ b/tests/unit/models/models_utils_test.py
@@ -4,8 +4,12 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_merge_accounts_older_newer(db_session, user_death, user_rincewind) -> None:
+
+def test_merge_accounts_older_newer(
+    db_session: scoped_session, user_death: models.User, user_rincewind: models.User
+) -> None:
     """Test to verify merger of user accounts and return new user (older first)."""
     # Scenario 1: if first user's created_at date is older than second user's
     # created_at
@@ -18,7 +22,9 @@ def test_merge_accounts_older_newer(db_session, user_death, user_rincewind) -> N
     assert user_rincewind.state.MERGED
 
 
-def test_merge_accounts_newer_older(db_session, user_death, user_rincewind) -> None:
+def test_merge_accounts_newer_older(
+    db_session: scoped_session, user_death: models.User, user_rincewind: models.User
+) -> None:
     """Test to verify merger of user accounts and return new user (newer first)."""
     # Scenario 2: if second user's created_at date is older than first user's
     # created_at
@@ -33,7 +39,11 @@ def test_merge_accounts_newer_older(db_session, user_death, user_rincewind) -> N
 
 @pytest.mark.filterwarnings("ignore:Object of type <AccountEmail> not in session")
 def test_getuser(  # pylint: disable=too-many-statements
-    db_session, user_twoflower, user_rincewind, user_mort, user_wolfgang
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    user_mort: models.User,
+    user_wolfgang: models.User,
 ) -> None:
     """Test for retrieving a user from a username, email address or phone number."""
     # Confirm fixtures are as we need them to be
@@ -130,7 +140,11 @@ def test_getuser(  # pylint: disable=too-many-statements
 
 @pytest.mark.filterwarnings("ignore:Object of type <AccountEmail> not in session")
 def test_getuser_anchor(
-    db_session, user_twoflower, user_rincewind, user_mort, user_wolfgang
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    user_rincewind: models.User,
+    user_mort: models.User,
+    user_wolfgang: models.User,
 ) -> None:
     """Test for retrieving a user from a username, email address or phone number."""
     # Confirm fixtures are as we need them to be
@@ -222,7 +236,7 @@ def test_getuser_anchor(
     assert models.getuser('+912345678901', True) == (None, None)
 
 
-def test_getextid(db_session, user_rincewind) -> None:
+def test_getextid(db_session: scoped_session, user_rincewind: models.User) -> None:
     """Retrieve user given service and userid."""
     service = 'sample-service'
     userid = 'rincewind@sample-service'
diff --git a/tests/unit/models/notification_test.py b/tests/unit/models/notification_test.py
index 87867faf8..6183152a7 100644
--- a/tests/unit/models/notification_test.py
+++ b/tests/unit/models/notification_test.py
@@ -6,23 +6,24 @@
 from types import SimpleNamespace
 
 import pytest
+import sqlalchemy.orm as sa_orm
 from sqlalchemy.exc import IntegrityError
 
 from funnel import models
 
+from ...conftest import SQLAlchemy, scoped_session
+
 pytestmark = pytest.mark.filterwarnings(
     "ignore:Object of type <AccountEmail> not in session"
 )
 
 
 @pytest.fixture(scope='session')
-def notification_types(database) -> SimpleNamespace:
+def notification_types(database: SQLAlchemy) -> SimpleNamespace:
     class ProjectIsParent:
-        document: models.UuidModelUnion
-
         @property
         def preference_context(self) -> models.Account:
-            return self.document.project.account
+            return self.document.project.account  # type: ignore[attr-defined]
 
     class TestNewUpdateNotification(
         ProjectIsParent,
@@ -57,12 +58,14 @@ class TestProposalReceivedNotification(
         description = "When my project receives a new proposal"
         roles = ['project_editor']
 
-    database.configure_mappers()
+    sa_orm.configure_mappers()
     return SimpleNamespace(**locals())
 
 
 @pytest.fixture()
-def project_fixtures(db_session) -> SimpleNamespace:  # pylint: disable=too-many-locals
+def project_fixtures(
+    db_session: scoped_session,
+) -> SimpleNamespace:  # pylint: disable=too-many-locals
     """Provide users, one org and one project, for tests on them."""
     user_owner = models.User(username='user_owner', fullname="User Owner")
     user_owner.add_email('owner@example.com')
@@ -122,14 +125,14 @@ def project_fixtures(db_session) -> SimpleNamespace:  # pylint: disable=too-many
         attr for attr in locals().values() if isinstance(attr, models.Model)
     ]
 
-    def refresh():
+    def refresh() -> None:
         for attr in refresh_attrs:
             db_session.add(attr)
 
     return SimpleNamespace(**locals())
 
 
-def test_project_roles(project_fixtures) -> None:
+def test_project_roles(project_fixtures: SimpleNamespace) -> None:
     """Test that the fixtures have roles set up correctly."""
     owner_roles = project_fixtures.project.roles_for(project_fixtures.user_owner)
     assert 'editor' in owner_roles
@@ -169,7 +172,9 @@ def test_project_roles(project_fixtures) -> None:
 
 
 @pytest.fixture()
-def update(project_fixtures, db_session) -> models.Update:
+def update(
+    project_fixtures: SimpleNamespace, db_session: scoped_session
+) -> models.Update:
     """Publish an update as a fixture."""
     new_update = models.Update(
         project=project_fixtures.project,
@@ -184,7 +189,7 @@ def update(project_fixtures, db_session) -> models.Update:
     return new_update
 
 
-def test_update_roles(project_fixtures, update) -> None:
+def test_update_roles(project_fixtures: SimpleNamespace, update: models.Update) -> None:
     """Test whether Update grants the project_* roles to users."""
     owner_roles = update.roles_for(project_fixtures.user_owner)
     assert 'project_editor' in owner_roles
@@ -215,7 +220,10 @@ def test_update_roles(project_fixtures, update) -> None:
 
 
 def test_update_notification_structure(
-    notification_types, project_fixtures, update, db_session
+    notification_types: SimpleNamespace,
+    project_fixtures: SimpleNamespace,
+    update: models.Update,
+    db_session: scoped_session,
 ) -> None:
     """Test whether a NewUpdateNotification has the appropriate structure."""
     project_fixtures.refresh()
@@ -268,7 +276,9 @@ def test_update_notification_structure(
     assert project_fixtures.user_bystander not in all_recipients
 
 
-def test_account_notification_preferences(notification_types, db_session) -> None:
+def test_account_notification_preferences(
+    notification_types: SimpleNamespace, db_session: scoped_session
+) -> None:
     """Test that users have a notification_preferences dict."""
     nt = notification_types  # Short var for keeping lines within 88 columns below
     user = models.User(fullname="User")
@@ -317,7 +327,7 @@ def test_account_notification_preferences(notification_types, db_session) -> Non
     }
 
 
-def test_notification_metadata(notification_types) -> None:
+def test_notification_metadata(notification_types: SimpleNamespace) -> None:
     """Test that notification classes have appropriate cls_type and pref_type values."""
     assert notification_types.TestNewUpdateNotification.cls_type == 'update_new_test'
     assert notification_types.TestNewUpdateNotification.pref_type == 'update_new_test'
@@ -335,7 +345,10 @@ def test_notification_metadata(notification_types) -> None:
 
 
 def test_notification_preferences(
-    notification_types, project_fixtures, update, db_session
+    notification_types: SimpleNamespace,
+    project_fixtures: SimpleNamespace,
+    update: models.Update,
+    db_session: scoped_session,
 ) -> None:
     """Test whether user preferences are correctly accessed."""
     # Rather than dispatching, we'll hardcode UserNotification for each test user
diff --git a/tests/unit/models/phone_number_test.py b/tests/unit/models/phone_number_test.py
index 1945dc8a1..80737a316 100644
--- a/tests/unit/models/phone_number_test.py
+++ b/tests/unit/models/phone_number_test.py
@@ -4,15 +4,20 @@
 from collections.abc import Generator
 from contextlib import nullcontext as does_not_raise
 from types import SimpleNamespace
+from typing import Any, ContextManager
 
 import phonenumbers
 import pytest
 import sqlalchemy as sa
+import sqlalchemy.orm as sa_orm
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Mapped
 
-from funnel import models
-from funnel.models import relationship
+from funnel import models, signals
+
+from ...conftest import scoped_session
 
 # These numbers were obtained from libphonenumber with region codes 'IN' and 'US':
 # >>> phonenumbers.example_number_for_type(region, phonenumbers.PhoneNumberType.MOBILE)
@@ -46,7 +51,9 @@
 # 2. Remove table from metadata using Model.metadata.remove(cls.__table__)
 # 3. Remove all relationships to other classes (unsolved)
 @pytest.fixture(scope='session')
-def phone_models(database, app) -> Generator:
+def phone_models(
+    database: SQLAlchemy, app: Flask
+) -> Generator[SimpleNamespace, None, None]:
     class PhoneUser(models.BaseMixin, models.Model):
         """Test model representing a user account."""
 
@@ -56,63 +63,67 @@ class PhoneLink(models.PhoneNumberMixin, models.BaseMixin, models.Model):
         """Test model connecting PhoneUser to PhoneNumber."""
 
         __tablename__ = 'test_phone_link'
-        __phone_optional__ = False
         __phone_unique__ = True
         __phone_for__ = 'phoneuser'
         __phone_is_exclusive__ = True
 
-        phoneuser_id: Mapped[int] = sa.orm.mapped_column(
-            sa.Integer, sa.ForeignKey('test_phone_user.id'), nullable=False
+        phoneuser_id: Mapped[int] = sa_orm.mapped_column(
+            sa.ForeignKey('test_phone_user.id'), default=None, nullable=False
         )
-        phoneuser: Mapped[PhoneUser] = relationship(PhoneUser)
+        phoneuser: Mapped[PhoneUser] = models.relationship()
 
-    class PhoneDocument(models.PhoneNumberMixin, models.BaseMixin, models.Model):
+    class PhoneDocument(
+        models.OptionalPhoneNumberMixin, models.BaseMixin, models.Model
+    ):
         """Test model unaffiliated to a user that has a phone number attached."""
 
         __tablename__ = 'test_phone_document'
 
-    class PhoneLinkedDocument(models.PhoneNumberMixin, models.BaseMixin, models.Model):
+    class PhoneLinkedDocument(
+        models.OptionalPhoneNumberMixin, models.BaseMixin, models.Model
+    ):
         """Test model that accepts an optional user and an optional phone."""
 
         __tablename__ = 'test_phone_linked_document'
         __phone_for__ = 'phoneuser'
 
-        phoneuser_id: Mapped[int | None] = sa.orm.mapped_column(
-            sa.Integer, sa.ForeignKey('test_phone_user.id'), nullable=True
+        phoneuser_id: Mapped[int | None] = sa_orm.mapped_column(
+            sa.ForeignKey('test_phone_user.id'), default=None, nullable=True
         )
-        phoneuser: Mapped[PhoneUser | None] = relationship(PhoneUser)
+        phoneuser: Mapped[PhoneUser | None] = models.relationship()
 
-    new_models = [PhoneUser, PhoneLink, PhoneDocument, PhoneLinkedDocument]
+    new_models: list[type[models.ModelIdProtocol]] = [
+        PhoneUser,
+        PhoneLink,
+        PhoneDocument,
+        PhoneLinkedDocument,
+    ]
 
-    sa.orm.configure_mappers()
+    sa_orm.configure_mappers()
     # These models do not use __bind_key__ so no bind is provided to create_all/drop_all
     with app.app_context():
         database.metadata.create_all(
             bind=database.engine,
-            tables=[
-                model.__table__ for model in new_models  # type: ignore[attr-defined]
-            ],
+            tables=[model.__table__ for model in new_models],
         )
     yield SimpleNamespace(**{model.__name__: model for model in new_models})
     with app.app_context():
         database.metadata.drop_all(
             bind=database.engine,
-            tables=[
-                model.__table__ for model in new_models  # type: ignore[attr-defined]
-            ],
+            tables=[model.__table__ for model in new_models],
         )
 
 
 @pytest.fixture()
-def refcount_data(funnel) -> Generator:
-    refcount_signal_fired = set()
+def refcount_data() -> Generator[set[models.PhoneNumber], None, None]:
+    refcount_signal_fired: set[models.PhoneNumber] = set()
 
-    def refcount_signal_receiver(sender):
+    def refcount_signal_receiver(sender: models.PhoneNumber) -> None:
         refcount_signal_fired.add(sender)
 
-    funnel.signals.phonenumber_refcount_dropping.connect(refcount_signal_receiver)
+    signals.phonenumber_refcount_dropping.connect(refcount_signal_receiver)
     yield refcount_signal_fired
-    funnel.signals.phonenumber_refcount_dropping.disconnect(refcount_signal_receiver)
+    signals.phonenumber_refcount_dropping.disconnect(refcount_signal_receiver)
 
 
 @pytest.mark.parametrize(
@@ -150,7 +161,9 @@ def refcount_signal_receiver(sender):
         ),
     ],
 )
-def test_parse_phone_number(candidate, sms, parsed, expected) -> None:
+def test_parse_phone_number(
+    candidate: str, sms: bool, parsed: bool, expected: Any
+) -> None:
     """Test that parse_phone_number is able to parse a number."""
     assert models.parse_phone_number(candidate, sms, parsed) == expected
 
@@ -177,7 +190,11 @@ def test_parse_phone_number(candidate, sms, parsed, expected) -> None:
         ),
     ],
 )
-def test_validate_phone_number(candidate, expected, raises) -> None:
+def test_validate_phone_number(
+    candidate: str | phonenumbers.PhoneNumber,
+    expected: str | None,
+    raises: ContextManager,
+) -> None:
     with raises:
         assert models.validate_phone_number(candidate) == expected
 
@@ -204,13 +221,17 @@ def test_validate_phone_number(candidate, expected, raises) -> None:
         ),
     ],
 )
-def test_canonical_phone_number(candidate, expected, raises) -> None:
+def test_canonical_phone_number(
+    candidate: str | phonenumbers.PhoneNumber,
+    expected: str | None,
+    raises: ContextManager,
+) -> None:
     with raises:
         assert models.canonical_phone_number(candidate) == expected
 
 
 def test_phone_hash_stability() -> None:
-    """Safety test to ensure phone_blakeb160_hash doesn't change spec."""
+    """Safety test to ensure phone_blake2b160_hash doesn't change spec."""
     phash = models.phone_blake2b160_hash
     with pytest.raises(ValueError, match="Not a phone number"):
         phash('not-a-valid-number')
@@ -313,9 +334,9 @@ def test_phone_number_mutability() -> None:
     with pytest.raises(ValueError, match="A phone number is required"):
         pn.number = ''
     with pytest.raises(ValueError, match="A phone number is required"):
-        pn.number = False
+        pn.number = False  # type: ignore[assignment]
     with pytest.raises(ValueError, match="Phone number cannot be changed"):
-        pn.number = [1, 2, 3]
+        pn.number = [1, 2, 3]  # type: ignore[assignment]
 
     # Changing after nulling is not allowed as hash won't match
     pn.number = None
@@ -324,9 +345,9 @@ def test_phone_number_mutability() -> None:
     with pytest.raises(ValueError, match="A phone number is required"):
         pn.number = ''
     with pytest.raises(ValueError, match="A phone number is required"):
-        pn.number = False
+        pn.number = False  # type: ignore[assignment]
     with pytest.raises(ValueError, match="Invalid value for phone number"):
-        pn.number = [1, 2, 3]
+        pn.number = [1, 2, 3]  # type: ignore[assignment]
 
 
 def test_phone_number_md5() -> None:
@@ -346,14 +367,14 @@ def test_phone_number_is_blocked_flag() -> None:
         pn.is_blocked = True
 
 
-def test_phone_number_can_commit(db_session) -> None:
+def test_phone_number_can_commit(db_session: scoped_session) -> None:
     """A `PhoneNumber` can be committed to db."""
     pn = models.PhoneNumber(EXAMPLE_NUMBER_IN)
     db_session.add(pn)
     db_session.commit()
 
 
-def test_phone_number_conflict_integrity_error(db_session) -> None:
+def test_phone_number_conflict_integrity_error(db_session: scoped_session) -> None:
     """A conflicting `PhoneNumber` cannot be committed to db."""
     pn1 = models.PhoneNumber(EXAMPLE_NUMBER_IN)
     db_session.add(pn1)
@@ -376,7 +397,7 @@ def test_phone_number_conflict_integrity_error(db_session) -> None:
         db_session.commit()
 
 
-def test_phone_number_get(db_session) -> None:
+def test_phone_number_get(db_session: scoped_session) -> None:
     """Phone numbers can be loaded using PhoneNumber.get."""
     pn1 = models.PhoneNumber(EXAMPLE_NUMBER_IN)
     pn2 = models.PhoneNumber(EXAMPLE_NUMBER_US)
@@ -455,13 +476,13 @@ def test_phone_number_add() -> None:
         models.PhoneNumber.add('invalid')
 
     with pytest.raises(models.PhoneNumberInvalidError):
-        models.PhoneNumber.add(None)  # type: ignore[arg-type]
+        models.PhoneNumber.add(None)  # pyright: ignore[reportGeneralTypeIssues]
 
 
 @pytest.mark.usefixtures('db_session')
 @pytest.mark.parametrize('sms', [True, False])
 @pytest.mark.parametrize('wa', [True, False])
-def test_phone_number_active(sms, wa) -> None:
+def test_phone_number_active(sms: bool, wa: bool) -> None:
     """A phone number can be marked as currently active, optionally with an app."""
     pn = models.PhoneNumber.add(EXAMPLE_NUMBER_IN)
     assert pn.active_at is None
@@ -534,7 +555,7 @@ def test_phone_number_blocked() -> None:
     assert pn1.formatted == EXAMPLE_NUMBER_IN_FORMATTED
 
 
-def test_get_numbers(db_session) -> None:
+def test_get_numbers(db_session: scoped_session) -> None:
     """Get phone numbers in bulk."""
     for number in (
         EXAMPLE_NUMBER_IN,
@@ -561,7 +582,7 @@ def test_get_numbers(db_session) -> None:
 
 
 def test_phone_number_mixin(  # pylint: disable=too-many-locals,too-many-statements
-    phone_models, db_session
+    phone_models: SimpleNamespace, db_session: scoped_session
 ) -> None:
     """The PhoneNumberMixin class adds safety checks for using a phone number."""
     blocked_phone = models.PhoneNumber(EXAMPLE_NUMBER_CA)
@@ -580,6 +601,7 @@ def test_phone_number_mixin(  # pylint: disable=too-many-locals,too-many-stateme
     link1 = phone_models.PhoneLink(phoneuser=user1, phone=EXAMPLE_NUMBER_IN)
     db_session.add(link1)
     pn1 = models.PhoneNumber.get(EXAMPLE_NUMBER_IN)
+    assert pn1 is not None
     assert link1.phone == EXAMPLE_NUMBER_IN
     assert link1.phone_number == pn1
     assert link1.transport_hash == pn1.transport_hash
@@ -589,6 +611,7 @@ def test_phone_number_mixin(  # pylint: disable=too-many-locals,too-many-stateme
     link2 = phone_models.PhoneLink(phoneuser=user2, phone=EXAMPLE_NUMBER_US)
     db_session.add(link2)
     pn2 = models.PhoneNumber.get(EXAMPLE_NUMBER_US)
+    assert pn2 is not None
     assert link2.phone == EXAMPLE_NUMBER_US
     assert link2.phone_number == pn2
     assert link2.transport_hash == pn2.transport_hash
@@ -693,11 +716,15 @@ def test_phone_number_mixin(  # pylint: disable=too-many-locals,too-many-stateme
     assert pn1.number == EXAMPLE_NUMBER_IN
 
 
-def test_phone_number_refcount_drop(phone_models, db_session, refcount_data) -> None:
+def test_phone_number_refcount_drop(
+    phone_models: SimpleNamespace,
+    db_session: scoped_session,
+    refcount_data: set[models.PhoneNumber],
+) -> None:
     """Test that PhoneNumber.refcount drop events are fired."""
     # The refcount changing signal handler will have received events for every phone
     # number in this test. A request teardown processor can use this to determine
-    # which phone numberes need to be forgotten (preferably in a background job)
+    # which phone numbers need to be forgotten (preferably in a background job)
 
     # We have an empty set at the start of this test
     assert isinstance(refcount_data, set)
@@ -730,7 +757,9 @@ def test_phone_number_refcount_drop(phone_models, db_session, refcount_data) ->
     assert pn.refcount() == 0
 
 
-def test_phone_number_validate_for(phone_models, db_session) -> None:
+def test_phone_number_validate_for(
+    phone_models: SimpleNamespace, db_session: scoped_session
+) -> None:
     """PhoneNumber.validate_for can be used to determine availability."""
     user1 = phone_models.PhoneUser()
     user2 = phone_models.PhoneUser()
@@ -777,7 +806,7 @@ def test_phone_number_validate_for(phone_models, db_session) -> None:
 
 
 def test_phone_number_existing_but_unused_validate_for(
-    phone_models, db_session
+    phone_models: SimpleNamespace, db_session: scoped_session
 ) -> None:
     """An unused but existing phone number should be available to claim."""
     user = phone_models.PhoneUser()
diff --git a/tests/unit/models/project_crew_membership_test.py b/tests/unit/models/project_crew_membership_test.py
index 4548972b4..9ddf8d897 100644
--- a/tests/unit/models/project_crew_membership_test.py
+++ b/tests/unit/models/project_crew_membership_test.py
@@ -5,9 +5,14 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 def test_project_crew_membership(
-    db_session, new_user, new_user_owner, new_project
+    db_session: scoped_session,
+    new_user: models.User,
+    new_user_owner: models.User,
+    new_project: models.Project,
 ) -> None:
     """Test that project crew members get their roles from ProjectCrewMembership."""
     # new_user is account admin
@@ -38,7 +43,7 @@ def test_project_crew_membership(
     assert 'editor' in new_project.roles_for(new_user_owner)
     assert new_membership.is_active
     assert new_membership in new_project.active_crew_memberships
-    assert new_membership.record_type == models.MEMBERSHIP_RECORD_TYPE.DIRECT_ADD
+    assert new_membership.record_type == models.MembershipRecordTypeEnum.DIRECT_ADD
 
     # only one membership can be active for a user at a time.
     # so adding a new membership without revoking the previous one
@@ -57,6 +62,7 @@ def test_project_crew_membership(
         .filter_by(project=new_project, user=new_user)
         .first()
     )
+    assert previous_membership2 is not None
     previous_membership2.revoke(actor=new_user_owner)
     db_session.commit()
 
@@ -85,7 +91,7 @@ def test_project_crew_membership(
     assert 'editor' in new_project.roles_for(new_user)
     assert 'promoter' not in new_project.roles_for(new_user)
     assert 'usher' not in new_project.roles_for(new_user)
-    assert new_membership3.record_type == models.MEMBERSHIP_RECORD_TYPE.AMEND
+    assert new_membership3.record_type == models.MembershipRecordTypeEnum.AMEND
 
     # replace() can replace a single role as well, rest stays as they were
     new_membership4 = new_membership3.replace(actor=new_user_owner, is_usher=True)
@@ -100,7 +106,7 @@ def test_project_crew_membership(
         'editor',
         'usher',
     }
-    assert new_membership4.record_type == models.MEMBERSHIP_RECORD_TYPE.AMEND
+    assert new_membership4.record_type == models.MembershipRecordTypeEnum.AMEND
 
     # can't replace with an unknown role
     with pytest.raises(AttributeError):
@@ -108,7 +114,11 @@ def test_project_crew_membership(
 
 
 def test_project_roles_lazy_eval(
-    db_session, new_user, new_user_owner, new_organization, new_project2
+    db_session: scoped_session,
+    new_user: models.User,
+    new_user_owner: models.User,
+    new_organization: models.Organization,
+    new_project2: models.Project,
 ) -> None:
     """Test that the lazy roles evaluator picks up membership-based roles."""
     assert 'admin' in new_organization.roles_for(new_user_owner)
@@ -119,8 +129,12 @@ def test_project_roles_lazy_eval(
 
 
 def test_membership_amend(
-    db_session, user_vetinari, user_ridcully, project_expo2010, org_ankhmorpork
-):
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
+    org_ankhmorpork: models.Organization,
+) -> None:
     ridcully_admin = models.AccountMembership(
         member=user_ridcully, account=org_ankhmorpork, granted_by=user_vetinari
     )
diff --git a/tests/unit/models/project_test.py b/tests/unit/models/project_test.py
index ae23dfb0e..f193d8884 100644
--- a/tests/unit/models/project_test.py
+++ b/tests/unit/models/project_test.py
@@ -9,8 +9,10 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def invalidate_cache(project):
+
+def invalidate_cache(project: models.Project) -> None:
     for attr in (
         'datelocation',
         'schedule_start_at_localized',
@@ -26,7 +28,11 @@ def invalidate_cache(project):
 
 
 @pytest.mark.flaky(reruns=1)  # Rerun in case assert with timedelta fails
-def test_cfp_state_draft(db_session, new_organization, new_project) -> None:
+def test_cfp_state_draft(
+    db_session: scoped_session,
+    new_organization: models.Organization,
+    new_project: models.Project,
+) -> None:
     assert new_project.cfp_start_at is None
     assert new_project.state.DRAFT
     assert new_project.cfp_state.NONE
@@ -38,6 +44,7 @@ def test_cfp_state_draft(db_session, new_organization, new_project) -> None:
 
     assert new_project.cfp_state.PUBLIC
     # Start date is automatically set by open_cfp to utcnow()
+    assert new_project.cfp_start_at is not None
     assert new_project.cfp_start_at > utcnow() - timedelta(minutes=1)
     assert not new_project.cfp_state.DRAFT
     assert new_project.cfp_state.OPEN
@@ -59,7 +66,7 @@ def test_cfp_state_draft(db_session, new_organization, new_project) -> None:
 
 
 def test_project_dates(  # pylint: disable=too-many-locals,too-many-statements
-    db_session, new_project
+    db_session: scoped_session, new_project: models.Project
 ) -> None:
     # without any session the project will have no start and end dates
     assert new_project.sessions.count() == 0
@@ -108,6 +115,8 @@ def test_project_dates(  # pylint: disable=too-many-locals,too-many-statements
     assert new_project.sessions.count() == 2
     assert new_project.schedule_start_at.date() == new_session_a.start_at.date()
     assert new_project.schedule_end_at.date() == new_session_b.end_at.date()
+    assert new_project.start_at is not None
+    assert new_project.end_at is not None
     assert new_project.start_at.date() == new_session_a.start_at.date()
     assert new_project.end_at.date() == new_session_b.end_at.date()
 
@@ -218,7 +227,9 @@ def test_project_dates(  # pylint: disable=too-many-locals,too-many-statements
 
 
 @pytest.fixture()
-def second_organization(db_session, new_user2):
+def second_organization(
+    db_session: scoped_session, new_user2: models.User
+) -> models.Organization:
     org2 = models.Organization(
         owner=new_user2, title="Second test org", name='test_org_2'
     )
@@ -228,7 +239,11 @@ def second_organization(db_session, new_user2):
 
 
 def test_project_rename(
-    db_session, new_organization, second_organization, new_project, new_project2
+    db_session: scoped_session,
+    new_organization: models.Organization,
+    second_organization: models.Organization,
+    new_project: models.Project,
+    new_project2: models.Project,
 ) -> None:
     # The project has a default name from the fixture, and there is no redirect
     assert new_project.name == 'test-project'
@@ -291,7 +306,9 @@ def test_project_rename(
 
 
 def test_project_featured_proposal(
-    db_session, user_twoflower, project_expo2010
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    project_expo2010: models.Project,
 ) -> None:
     # `has_featured_proposals` returns None if the project has no proposals
     assert project_expo2010.has_featured_proposals is False
diff --git a/tests/unit/models/proposal_test.py b/tests/unit/models/proposal_test.py
index 9cab9872c..36f3148ac 100644
--- a/tests/unit/models/proposal_test.py
+++ b/tests/unit/models/proposal_test.py
@@ -2,8 +2,14 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def test_reorder(db_session, user_twoflower, project_expo2010) -> None:
+
+def test_reorder(
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    project_expo2010: models.Project,
+) -> None:
     proposal1 = models.Proposal(
         created_by=user_twoflower,
         project=project_expo2010,
diff --git a/tests/unit/models/session_test.py b/tests/unit/models/session_test.py
index 0828b98a2..f9cca4338 100644
--- a/tests/unit/models/session_test.py
+++ b/tests/unit/models/session_test.py
@@ -11,11 +11,15 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 # TODO: Create a second parallel project and confirm they don't clash
 
 
 @pytest.fixture()
-def block_of_sessions(db_session, new_project) -> SimpleNamespace:
+def block_of_sessions(
+    db_session: scoped_session, new_project: models.Project
+) -> SimpleNamespace:
     # DocType HTML5's schedule, but using UTC to simplify testing
     # https://hasgeek.com/doctypehtml5/bangalore/schedule
     session1 = models.Session(
@@ -95,14 +99,16 @@ def block_of_sessions(db_session, new_project) -> SimpleNamespace:
     db_session.add_all(refresh_attrs)
     db_session.commit()
 
-    def refresh():
+    def refresh() -> None:
         for attr in refresh_attrs:
             db_session.add(attr)
 
     return SimpleNamespace(**locals())
 
 
-def find_projects(starting_times, within, gap) -> dict[datetime, list[models.Project]]:
+def find_projects(
+    starting_times: list[datetime], within: timedelta, gap: timedelta
+) -> dict[datetime, list[models.Project]]:
     # Keep the timestamps at which projects were found, plus the project. Criteria:
     # starts at `timestamp` + up to `within` period, with `gap` from prior sessions
     return {
@@ -115,7 +121,7 @@ def find_projects(starting_times, within, gap) -> dict[datetime, list[models.Pro
     }
 
 
-def test_project_starting_at(block_of_sessions) -> None:
+def test_project_starting_at(block_of_sessions: SimpleNamespace) -> None:
     """Test Project.starting_at finds projects by starting time accurately."""
     block_of_sessions.refresh()
 
@@ -182,7 +188,9 @@ def test_project_starting_at(block_of_sessions) -> None:
     }
 
 
-def test_long_session_fail(db_session, new_project) -> None:
+def test_long_session_fail(
+    db_session: scoped_session, new_project: models.Project
+) -> None:
     """Confirm sessions cannot exceed 24 hours."""
     # Less than 24 hours is fine:
     db_session.add(
@@ -292,9 +300,9 @@ def test_long_session_fail(db_session, new_project) -> None:
     ('project2_dates', 'session2_dates', 'expected2_session'), project_session_dates
 )
 def test_next_session_at_property(
-    db_session,
-    project_expo2010,
-    project_expo2011,
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    project_expo2011: models.Project,
     project_dates: tuple | None,
     session_dates: list[tuple],
     expected_session: int | None,
diff --git a/tests/unit/models/shortlink_test.py b/tests/unit/models/shortlink_test.py
index bc8999970..df43783d5 100644
--- a/tests/unit/models/shortlink_test.py
+++ b/tests/unit/models/shortlink_test.py
@@ -7,6 +7,7 @@
 # Since a random number generator is not a unique number generator, some tests are
 # marked as flaky and will be re-run in case a dupe value is generated
 
+from collections.abc import Sequence
 from typing import Any
 from unittest.mock import patch
 
@@ -15,11 +16,13 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 class MockRandomBigint:
     """Mock for random_bigint that returns from a pre-determined sequence."""
 
-    def __init__(self, sequence) -> None:
+    def __init__(self, sequence: Sequence[int]) -> None:
         self.sequence = sequence
         self.counter = 0
 
@@ -80,7 +83,7 @@ def test_mock_random_bigint() -> None:
         ('https://example.com/', 'https://example.com'),
     ],
 )
-def test_url_hash_is_normalized(lhs, rhs) -> None:
+def test_url_hash_is_normalized(lhs: str, rhs: str) -> None:
     """URL hash is normalized and handles furl objects."""
     assert models.shortlink.url_blake2b160_hash(
         lhs
@@ -128,7 +131,7 @@ def test_url_hash_is_constant() -> None:
 
 
 @pytest.mark.parametrize(('name', 'bigint'), name_bigint_mappings)
-def test_bigint_to_name(name, bigint) -> None:
+def test_bigint_to_name(name: str, bigint: int) -> None:
     """Bigints can be mapped to names."""
     assert models.shortlink.bigint_to_name(bigint) == name
 
@@ -136,7 +139,7 @@ def test_bigint_to_name(name, bigint) -> None:
 @pytest.mark.parametrize(
     ('name', 'bigint'), name_bigint_mappings + uni_name_bigint_mappings
 )
-def test_name_to_bigint(name, bigint) -> None:
+def test_name_to_bigint(name: str, bigint: int) -> None:
     """Names can be mapped to bigints."""
     # Works with `str`
     assert models.shortlink.name_to_bigint(name) == bigint
@@ -231,7 +234,9 @@ def test_shortlink_constructor_with_reuse() -> None:
 @pytest.mark.parametrize(
     ('longid', 'match'), [(146727516324, False), (-1, False), (4235324, True)]
 )
-def test_shortlink_reuse_with_shorter(db_session, longid, match) -> None:
+def test_shortlink_reuse_with_shorter(
+    db_session: scoped_session, longid: int, match: bool
+) -> None:
     """Shortlink reuse with shorter will avoid longer ids."""
     sl1 = models.shortlink.Shortlink(id=longid, url='https://example.com')
     db_session.add(sl1)
@@ -265,7 +270,9 @@ def test_shortlink_constructor_with_name() -> None:
 
 
 @pytest.mark.filterwarnings('ignore:New instance')
-def test_shortlink_constructor_handle_collisions(db_session) -> None:
+def test_shortlink_constructor_handle_collisions(
+    db_session: scoped_session,
+) -> None:
     """Shortlink constructor will handle random id collisions gracefully."""
     prngids = MockRandomBigint([42, 42, 128, 128, 128, 384])
     with patch(
diff --git a/tests/unit/models/site_membership_test.py b/tests/unit/models/site_membership_test.py
index 6ae58a62f..cc908d231 100644
--- a/tests/unit/models/site_membership_test.py
+++ b/tests/unit/models/site_membership_test.py
@@ -5,8 +5,10 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
 
-def invalidate_cache(user):
+
+def invalidate_cache(user: models.Account) -> None:
     """Remove cached properties."""
     for attr in (
         'is_site_admin',
@@ -21,7 +23,9 @@ def invalidate_cache(user):
             pass
 
 
-def test_siteadmin_roles(db_session, user_mort, user_death) -> None:
+def test_siteadmin_roles(
+    db_session: scoped_session, user_mort: models.User, user_death: models.User
+) -> None:
     """`SiteMembership` grants siteadmin roles."""
     assert user_mort.active_site_membership is None
     assert user_mort.is_site_admin is False
@@ -87,7 +91,7 @@ def test_siteadmin_roles(db_session, user_mort, user_death) -> None:
 
 
 def test_site_membership_migrate_account_transfer(
-    db_session, user_death, user_mort
+    db_session: scoped_session, user_death: models.User, user_mort: models.User
 ) -> None:
     """Test for transfer of a site membership when merging users."""
     assert user_mort.active_site_membership is None
@@ -123,7 +127,7 @@ def test_site_membership_migrate_account_transfer(
 
 
 def test_site_membership_migrate_account_retain(
-    db_session, user_death, user_mort
+    db_session: scoped_session, user_death: models.User, user_mort: models.User
 ) -> None:
     """Test for retaining a site membership when merging users."""
     assert user_mort.active_site_membership is None
@@ -176,7 +180,7 @@ def test_site_membership_migrate_account_retain(
 
 
 def test_site_membership_migrate_account_merge(
-    db_session, user_death, user_mort
+    db_session: scoped_session, user_death: models.User, user_mort: models.User
 ) -> None:
     """Test for merging site memberships when merging users."""
     assert user_mort.active_site_membership is None
@@ -232,7 +236,9 @@ def test_site_membership_migrate_account_merge(
     assert membership.is_site_editor is False  # This was not granted to either user
 
 
-def test_amend_siteadmin(db_session, user_vetinari, user_vimes) -> None:
+def test_amend_siteadmin(
+    db_session: scoped_session, user_vetinari: models.User, user_vimes: models.User
+) -> None:
     """Amend a membership record."""
     membership = models.SiteMembership(
         member=user_vimes,
diff --git a/tests/unit/models/sponsor_membership_test.py b/tests/unit/models/sponsor_membership_test.py
index 59dd7ea8a..f348e2dbf 100644
--- a/tests/unit/models/sponsor_membership_test.py
+++ b/tests/unit/models/sponsor_membership_test.py
@@ -7,9 +7,16 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 @pytest.fixture()
-def citywatch_sponsor(db_session, project_expo2010, org_citywatch, user_vetinari):
+def citywatch_sponsor(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    org_citywatch: models.Organization,
+    user_vetinari: models.User,
+) -> models.ProjectSponsorMembership:
     """Add City Watch as a sponsor of Expo 2010."""
     sponsor = models.ProjectSponsorMembership(
         project=project_expo2010,
@@ -23,7 +30,12 @@ def citywatch_sponsor(db_session, project_expo2010, org_citywatch, user_vetinari
 
 
 @pytest.fixture()
-def uu_sponsor(db_session, project_expo2010, org_uu, user_vetinari):
+def uu_sponsor(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    org_uu: models.Organization,
+    user_vetinari: models.User,
+) -> models.ProjectSponsorMembership:
     """Add Unseen University as a sponsor of Expo 2010."""
     sponsor = models.ProjectSponsorMembership(
         project=project_expo2010,
@@ -37,7 +49,12 @@ def uu_sponsor(db_session, project_expo2010, org_uu, user_vetinari):
 
 
 @pytest.fixture()
-def dibbler_sponsor(db_session, project_expo2010, user_dibbler, user_vetinari):
+def dibbler_sponsor(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    user_dibbler: models.User,
+    user_vetinari: models.User,
+) -> models.ProjectSponsorMembership:
     """Add CMOT Dibbler as a promoted sponsor of Expo 2010."""
     sponsor = models.ProjectSponsorMembership(
         project=project_expo2010,
@@ -52,12 +69,12 @@ def dibbler_sponsor(db_session, project_expo2010, user_dibbler, user_vetinari):
 
 
 def test_auto_seq(
-    db_session,
-    project_expo2010,
-    org_citywatch,
-    org_uu,
-    user_dibbler,
-    user_vetinari,
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    org_citywatch: models.Organization,
+    org_uu: models.Organization,
+    user_dibbler: models.User,
+    user_vetinari: models.User,
 ) -> None:
     """Sequence numbers are auto-issued in commit order."""
     sponsor1 = models.ProjectSponsorMembership(
@@ -95,14 +112,14 @@ def test_auto_seq(
 
 
 def test_expo_has_sponsors(
-    db_session,
-    project_expo2010,
-    dibbler_sponsor,
-    uu_sponsor,
-    citywatch_sponsor,
-    org_citywatch,
-    org_uu,
-    user_dibbler,
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    dibbler_sponsor: models.ProjectSponsorMembership,
+    uu_sponsor: models.ProjectSponsorMembership,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+    org_citywatch: models.Organization,
+    org_uu: models.Organization,
+    user_dibbler: models.User,
 ) -> None:
     """Project Expo 2010 has sponsors in a specific order."""
     db_session.commit()
@@ -114,7 +131,11 @@ def test_expo_has_sponsors(
 
 
 def test_expo_sponsor_reorder(
-    db_session, project_expo2010, citywatch_sponsor, uu_sponsor, dibbler_sponsor
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+    uu_sponsor: models.ProjectSponsorMembership,
+    dibbler_sponsor: models.ProjectSponsorMembership,
 ) -> None:
     """Sponsors can be re-ordered."""
     db_session.commit()
@@ -133,13 +154,13 @@ def test_expo_sponsor_reorder(
 
 
 def test_expo_sponsor_seq_reissue(
-    db_session,
-    project_expo2010,
-    citywatch_sponsor,
-    uu_sponsor,
-    dibbler_sponsor,
-    user_dibbler,
-    user_wolfgang,
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+    uu_sponsor: models.ProjectSponsorMembership,
+    dibbler_sponsor: models.ProjectSponsorMembership,
+    user_dibbler: models.User,
+    user_wolfgang: models.User,
 ) -> None:
     """If the the last sponsor is dropped, the next sponsor gets their spot."""
     db_session.commit()
@@ -177,15 +198,21 @@ def test_expo_sponsor_seq_reissue(
     ]
 
 
-def test_change_promoted_flag(db_session, project_expo2010, citywatch_sponsor) -> None:
+def test_change_promoted_flag(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+) -> None:
     """Change sponsor is_promoted flag."""
     assert citywatch_sponsor.is_promoted is False
+    assert citywatch_sponsor.granted_by is not None
     # Flag can be changed with a revision
     new_record = citywatch_sponsor.replace(
         actor=citywatch_sponsor.granted_by, is_promoted=True
     )
     assert new_record != citywatch_sponsor
     assert new_record.is_promoted is True
+    assert new_record.granted_by is not None
 
     noop_record = new_record.replace(actor=new_record.granted_by, is_promoted=True)
     assert noop_record == new_record
@@ -194,15 +221,21 @@ def test_change_promoted_flag(db_session, project_expo2010, citywatch_sponsor) -
         new_record.is_promoted = False
 
 
-def test_change_label(db_session, project_expo2010, citywatch_sponsor) -> None:
+def test_change_label(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+) -> None:
     """Change sponsor label."""
     assert citywatch_sponsor.label is None
     # Flag can be changed with a revision
+    assert citywatch_sponsor.granted_by is not None
     new_record = citywatch_sponsor.replace(
         actor=citywatch_sponsor.granted_by, label="Guards! Guards!"
     )
     assert new_record != citywatch_sponsor
     assert new_record.label == "Guards! Guards!"
+    assert new_record.granted_by is not None
 
     noop_record = new_record.replace(
         actor=new_record.granted_by, label="Guards! Guards!"
@@ -213,13 +246,20 @@ def test_change_label(db_session, project_expo2010, citywatch_sponsor) -> None:
         new_record.label = None
 
 
-def test_sponsor_offered_roles(db_session, project_expo2010, citywatch_sponsor) -> None:
+def test_sponsor_offered_roles(
+    db_session: scoped_session,
+    project_expo2010: models.Project,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+) -> None:
     """Sponsors don't get a role from the sponsor membership."""
     assert citywatch_sponsor.offered_roles == set()
 
 
 def test_sponsor_member_role(
-    db_session, citywatch_sponsor, user_vimes, user_rincewind
+    db_session: scoped_session,
+    citywatch_sponsor: models.ProjectSponsorMembership,
+    user_vimes: models.User,
+    user_rincewind: models.User,
 ) -> None:
     """Sponsor account admins get member role on the membership record."""
     assert 'member' in citywatch_sponsor.roles_for(user_vimes)
diff --git a/tests/unit/models/sync_ticket_test.py b/tests/unit/models/sync_ticket_test.py
index d9addc1af..8393f2e0d 100644
--- a/tests/unit/models/sync_ticket_test.py
+++ b/tests/unit/models/sync_ticket_test.py
@@ -1,20 +1,31 @@
 """Test for project ticket sync models."""
 # pylint: disable=attribute-defined-outside-init,redefined-outer-name
 
+from typing import TypedDict
+
 import pytest
 
 from coaster.utils import uuid_b58
 
 from funnel import models
+from funnel.extapi.typing import ExtTicketsDict
+
+from ...conftest import Flask, scoped_session
 
 # --- Fixture data
 
-event_ticket_types = [
+
+class TicketEventTypeDict(TypedDict):
+    title: str
+    ticket_types: list[str]
+
+
+event_ticket_types: list[TicketEventTypeDict] = [
     {'title': 'SpaceCon', 'ticket_types': ['Conference', 'Combo']},
     {'title': 'SpaceCon workshop', 'ticket_types': ['Workshop', 'Combo']},
 ]
 
-ticket_list = [
+ticket_list: list[ExtTicketsDict] = [
     {
         'fullname': f'participant{str(1)}',
         'email': f'participant{str(1)}@gmail.com',
@@ -56,7 +67,7 @@
     },
 ]
 
-ticket_list2 = [
+ticket_list2: list[ExtTicketsDict] = [
     {
         'fullname': f'participant{str(1)}',
         'email': f'participant{str(1)}@gmail.com',
@@ -98,7 +109,7 @@
     },
 ]
 
-ticket_list3 = [
+ticket_list3: list[ExtTicketsDict] = [
     {
         'fullname': f'participant{str(1)}',
         'email': f'participant{str(1)}@gmail.com',
@@ -143,15 +154,17 @@
 # --- Tests and helpers
 
 
-def bulk_upsert(project, ticket_event_list):
+def bulk_upsert(
+    project: models.Project, ticket_event_list: list[TicketEventTypeDict]
+) -> None:
     for ticket_event_dict in ticket_event_list:
         ticket_event = models.TicketEvent.upsert(
             project,
-            current_title=ticket_event_dict.get('title'),
-            title=ticket_event_dict.get('title'),
+            current_title=ticket_event_dict['title'],
+            title=ticket_event_dict['title'],
             project=project,
         )
-        for ticket_type_title in ticket_event_dict.get('ticket_types'):
+        for ticket_type_title in ticket_event_dict['ticket_types']:
             ticket_type = models.TicketType.upsert(
                 project,
                 current_name=None,
@@ -165,7 +178,12 @@ def bulk_upsert(project, ticket_event_list):
 @pytest.mark.usefixtures('db_session')
 class TestEventModels:
     @pytest.fixture(autouse=True)
-    def _fixture_setup(self, request, db_session, app):
+    def _fixture_setup(
+        self,
+        request: pytest.FixtureRequest,
+        db_session: scoped_session,
+        app: Flask,
+    ) -> None:
         self.db_session = db_session
         self.ctx = app.test_request_context()
         self.ctx.push()
@@ -212,7 +230,7 @@ def _fixture_setup(self, request, db_session, app):
         self.session = self.db_session
 
         @request.addfinalizer
-        def tearDown():  # skipcq: PTC-W0065
+        def tearDown() -> None:  # skipcq: PTC-W0065
             self.ctx.pop()
 
     def test_import_from_list(self) -> None:
@@ -221,15 +239,15 @@ def test_import_from_list(self) -> None:
         p1 = models.TicketParticipant.query.filter_by(
             email_address=models.EmailAddress.get('participant1@gmail.com'),
             project=self.project,
-        ).one_or_none()
+        ).one()
         p2 = models.TicketParticipant.query.filter_by(
             email_address=models.EmailAddress.get('participant2@gmail.com'),
             project=self.project,
-        ).one_or_none()
+        ).one()
         p3 = models.TicketParticipant.query.filter_by(
             email_address=models.EmailAddress.get('participant3@gmail.com'),
             project=self.project,
-        ).one_or_none()
+        ).one()
         assert models.SyncTicket.query.count() == 3
         assert models.TicketParticipant.query.count() == 3
         assert len(p1.ticket_events) == 2
@@ -247,7 +265,7 @@ def test_import_from_list(self) -> None:
         p4 = models.TicketParticipant.query.filter_by(
             email_address=models.EmailAddress.get('participant4@gmail.com'),
             project=self.project,
-        ).one_or_none()
+        ).one()
         assert len(p1.ticket_events) == 2
         assert len(p2.ticket_events) == 0
         assert len(p3.ticket_events) == 0
diff --git a/tests/unit/models/user_session_test.py b/tests/unit/models/user_session_test.py
index f8f2a3e3a..d60f5e529 100644
--- a/tests/unit/models/user_session_test.py
+++ b/tests/unit/models/user_session_test.py
@@ -8,6 +8,8 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 sample_user_agent = (
     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_3) AppleWebKit/537.36 (KHTML, like'
     ' Gecko) Chrome/49.0.2623.110 Safari/537.36'
@@ -20,7 +22,9 @@ def test_usersession_init() -> None:
     assert isinstance(result, models.LoginSession)
 
 
-def test_usersession_has_sudo(db_session, user_twoflower) -> None:
+def test_usersession_has_sudo(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test to set sudo and test if UserSession instance has_sudo."""
     another_user_session = models.LoginSession(
         account=user_twoflower,
@@ -34,7 +38,9 @@ def test_usersession_has_sudo(db_session, user_twoflower) -> None:
     assert another_user_session.has_sudo is True
 
 
-def test_usersession_revoke(db_session, user_twoflower) -> None:
+def test_usersession_revoke(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test to revoke on UserSession instance."""
     yet_another_usersession = models.LoginSession(
         account=user_twoflower,
@@ -45,10 +51,13 @@ def test_usersession_revoke(db_session, user_twoflower) -> None:
     db_session.add(yet_another_usersession)
     yet_another_usersession.revoke()
     result = models.LoginSession.get(yet_another_usersession.buid)
+    assert result is not None
     assert result.revoked_at is not None
 
 
-def test_usersession_get(db_session, user_twoflower) -> None:
+def test_usersession_get(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test for verifying UserSession's get method."""
     twoflower_buid = buid()
     twoflower_session = models.LoginSession(
@@ -64,7 +73,9 @@ def test_usersession_get(db_session, user_twoflower) -> None:
     assert result.account == user_twoflower
 
 
-def test_usersession_active_sessions(db_session, user_twoflower) -> None:
+def test_usersession_active_sessions(
+    db_session: scoped_session, user_twoflower: models.User
+) -> None:
     """Test for verifying UserSession's active_sessions."""
     twoflower_session = models.LoginSession(
         account=user_twoflower,
@@ -78,7 +89,9 @@ def test_usersession_active_sessions(db_session, user_twoflower) -> None:
     assert user_twoflower.active_login_sessions.all() == [twoflower_session]
 
 
-def test_usersession_authenticate(db_session, user_dibbler) -> None:
+def test_usersession_authenticate(
+    db_session: scoped_session, user_dibbler: models.User
+) -> None:
     """Test to verify authenticate method on UserSession."""
     dibbler_session = models.LoginSession(
         account=user_dibbler,
@@ -112,7 +125,9 @@ def test_usersession_authenticate(db_session, user_dibbler) -> None:
     assert models.LoginSession.authenticate(dibbler_session.buid, silent=True) is None
 
 
-def test_usersession_authenticate_suspended_user(db_session, user_dibbler) -> None:
+def test_usersession_authenticate_suspended_user(
+    db_session: scoped_session, user_dibbler: models.User
+) -> None:
     """Test to verify authenticate method on UserSession with a suspended user."""
     dibbler_session = models.LoginSession(
         account=user_dibbler,
diff --git a/tests/unit/proxies/request_wants_test.py b/tests/unit/proxies/request_wants_test.py
index e0e8505cb..3107894a6 100644
--- a/tests/unit/proxies/request_wants_test.py
+++ b/tests/unit/proxies/request_wants_test.py
@@ -35,7 +35,7 @@ def json_or_html() -> ReturnView:  # skipcq: PTC-W0065
     return tapp
 
 
-def test_request_wants_is_an_instance(request) -> None:
+def test_request_wants_is_an_instance(request: pytest.FixtureRequest) -> None:
     """request_wants proxy is an instance of RequestWants class."""
     # pylint: disable=protected-access
     assert isinstance(request_wants._get_current_object(), RequestWants)
@@ -61,7 +61,7 @@ def test_request_wants_is_an_instance(request) -> None:
         ('*/*', False),
     ],
 )
-def test_request_wants_json(app, accept_header: str, result: bool) -> None:
+def test_request_wants_json(app: Flask, accept_header: str, result: bool) -> None:
     """Request wants a JSON response."""
     with app.test_request_context(headers={'Accept': accept_header}):
         assert request_wants.json is result
@@ -85,7 +85,7 @@ def test_request_wants_json(app, accept_header: str, result: bool) -> None:
     ],
 )
 def test_request_wants_html_fragment_xhr(
-    app, xhr: bool, accept_header: str, result: bool
+    app: Flask, xhr: bool, accept_header: str, result: bool
 ) -> None:
     """Request wants a HTML fragment (XmlHttpRequest version)."""
     headers = {'Accept': accept_header}
@@ -115,7 +115,7 @@ def test_request_wants_html_fragment_xhr(
     ],
 )
 def test_request_wants_html_fragment_htmx(
-    app, hx_request: bool, accept_header: str | None, result: bool
+    app: Flask, hx_request: bool, accept_header: str | None, result: bool
 ) -> None:
     """Request wants a HTML fragment (HTMX version)."""
     # The Accept header is not a factor in HTMX calls.
@@ -138,7 +138,9 @@ def test_request_wants_html_fragment_htmx(
         ('*/*', False),
     ],
 )
-def test_request_wants_html_in_json(app, accept_header: str, result: bool) -> None:
+def test_request_wants_html_in_json(
+    app: Flask, accept_header: str, result: bool
+) -> None:
     """Request wants a HTML fragment embedded in a JSON response."""
     with app.test_request_context(headers={'Accept': accept_header}):
         assert request_wants.html_in_json is result
@@ -146,7 +148,7 @@ def test_request_wants_html_in_json(app, accept_header: str, result: bool) -> No
     assert request_wants.html_in_json is None
 
 
-def test_request_wants_htmx(app) -> None:
+def test_request_wants_htmx(app: Flask) -> None:
     """Request wants a HTMX-compatible response."""
     with app.test_request_context():
         assert request_wants.htmx is False
@@ -154,7 +156,7 @@ def test_request_wants_htmx(app) -> None:
         assert request_wants.htmx is True
 
 
-def test_response_varies(fixture_app) -> None:
+def test_response_varies(fixture_app: Flask) -> None:
     """Response Vary header is based on tests."""
     client = fixture_app.test_client()
 
diff --git a/tests/unit/tests/__init__.py b/tests/unit/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/tests/conftest_test.py b/tests/unit/tests/conftest_test.py
index a3a8bcf10..e28b1bfe5 100644
--- a/tests/unit/tests/conftest_test.py
+++ b/tests/unit/tests/conftest_test.py
@@ -2,8 +2,12 @@
 
 import pytest
 
+from funnel import models
 
-def test_getuser_fixture(models, getuser) -> None:
+from ...conftest import Flask, GetUserProtocol
+
+
+def test_getuser_fixture(getuser: GetUserProtocol) -> None:
     """Test the getuser fixture."""
     for username in getuser.usermap:
         user = getuser(username)
@@ -13,14 +17,14 @@ def test_getuser_fixture(models, getuser) -> None:
 
 @pytest.mark.mock_config('app', {'TESTING': False})
 @pytest.mark.mock_config('shortlinkapp', {'TESTING': lambda: ...})
-def test_mock_config_set_testing_flag(app, shortlinkapp) -> None:
+def test_mock_config_set_testing_flag(app: Flask, shortlinkapp: Flask) -> None:
     """Mock config is correctly applied (set or remove, callable or direct value)."""
     assert 'TESTING' in app.config
     assert not app.config['TESTING']
     assert 'TESTING' not in shortlinkapp.config
 
 
-def test_mock_config_removed(app, shortlinkapp) -> None:
+def test_mock_config_removed(app: Flask, shortlinkapp: Flask) -> None:
     """Original config is restored after a mock config test (must run after above)."""
     assert 'TESTING' in app.config
     assert 'TESTING' in shortlinkapp.config
diff --git a/tests/unit/transports/email_test.py b/tests/unit/transports/email_test.py
index c25a57899..c0f075de3 100644
--- a/tests/unit/transports/email_test.py
+++ b/tests/unit/transports/email_test.py
@@ -57,6 +57,7 @@ def test_process_recipient() -> None:
 def test_send_email_blocked() -> None:
     """Confirm that send_email will raise an exception on a blocked email address."""
     ea = EmailAddress.add('blocked@example.com')
+    assert ea.email is not None
     EmailAddress.mark_blocked(ea.email)
     with pytest.raises(
         TransportRecipientError, match='This email address has been blocked'
diff --git a/tests/unit/transports/sms_send_test.py b/tests/unit/transports/sms_send_test.py
index 27acd6de4..6649793e4 100644
--- a/tests/unit/transports/sms_send_test.py
+++ b/tests/unit/transports/sms_send_test.py
@@ -45,15 +45,6 @@ def test_twilio_success() -> None:
     assert sid
 
 
-@pytest.mark.enable_socket()
-@pytest.mark.requires_config('app', 'twilio')
-@pytest.mark.usefixtures('app_context')
-def test_twilio_callback() -> None:
-    """Test if message sending is a success when a callback is requested."""
-    sid = send_sms(TWILIO_CLEAN_TARGET, MESSAGE, callback=True)
-    assert sid
-
-
 @pytest.mark.enable_socket()
 @pytest.mark.requires_config('app', 'twilio')
 @pytest.mark.usefixtures('app_context')
@@ -122,8 +113,8 @@ def test_okay_to_message_in_india_right_now(now: datetime, okay: bool) -> None:
     """Confirm validator says its okay to message between 9 AM and 7 PM IST."""
     with patch('funnel.transports.sms.send.utcnow', return_value=now):
         assert okay_to_message_in_india_right_now() is okay
-        nowin = now.astimezone(indian_timezone)
+        now_in = now.astimezone(indian_timezone)
         if okay:
-            assert 9 <= nowin.hour < 19
+            assert 9 <= now_in.hour < 19
         else:
-            assert nowin.hour >= 19 or nowin.hour < 9
+            assert now_in.hour >= 19 or now_in.hour < 9
diff --git a/tests/unit/utils/markdown/conftest.py b/tests/unit/utils/markdown/conftest.py
deleted file mode 100644
index feb8569e8..000000000
--- a/tests/unit/utils/markdown/conftest.py
+++ /dev/null
@@ -1,180 +0,0 @@
-"""Test configuration for markdown tests."""
-
-from copy import copy
-from datetime import datetime
-from pathlib import Path
-
-import tomlkit
-from bs4 import BeautifulSoup
-from markupsafe import Markup
-
-from funnel.utils.markdown import MarkdownConfig
-
-
-def pytest_generate_tests(metafunc) -> None:
-    md_tests_data_root: Path = Path('tests/unit/utils/markdown/data')
-
-    class MarkdownCase:
-        """Class for markdown test case for a content-profile combination."""
-
-        def __init__(
-            self,
-            md_testname: str,
-            mdtext: str,
-            md_configname: str,
-            config: dict | None = None,
-            expected_output: str | None = None,
-        ) -> None:
-            self.md_testname = md_testname
-            self.mdtext = mdtext
-            self.md_configname = md_configname
-            self.config = (
-                MarkdownConfig(**config)
-                if config is not None
-                else MarkdownConfig.registry[md_configname]
-            )
-            self.expected_output = expected_output
-
-        def __repr__(self) -> str:
-            return self.caseid
-
-        @property
-        def caseid(self) -> str:
-            return f'{self.md_testname}-{self.md_configname}'
-
-        @property
-        def markdown_config(self) -> str | MarkdownConfig:
-            """
-            Return the markdown config for the test case.
-
-            Output is str if the config is pre-defined,
-            else a custom class inherited from MarkdownConfig.
-            """
-            return self.config if self.config is not None else self.md_configname
-
-        @property
-        def output(self) -> str:
-            return self.config.render(self.mdtext)
-
-        def update_expected_output(self) -> None:
-            self.expected_output = self.output
-
-    class MarkdownTestRegistry:
-        test_map: dict[str, dict[str, MarkdownCase]] | None = None
-        test_files: dict[str, tomlkit.TOMLDocument]
-
-        @classmethod
-        def load(cls) -> None:
-            """Load test cases from .toml files and create a 2D map."""
-            if cls.test_map is None:
-                cls.test_map = {}
-                cls.test_files = {
-                    file.name: tomlkit.loads(file.read_text())
-                    for file in md_tests_data_root.iterdir()
-                    if file.suffix == '.toml'
-                }
-                for md_testname, test_data in cls.test_files.items():
-                    config = test_data['config']
-                    exp = test_data.get('expected_output', {})
-                    # Combine pre-defined profiles with custom profiles
-                    # and store each test case in test_map[md_testname][md_configname]
-                    cls.test_map[md_testname] = {  # pylint: disable=E1137
-                        md_configname: MarkdownCase(
-                            md_testname=md_testname,
-                            mdtext=test_data['markdown'],  # type: ignore[arg-type]
-                            md_configname=md_configname,
-                            config=config,
-                            expected_output=None
-                            if exp.get(md_configname, None) is None
-                            else Markup(exp.get(md_configname, None)),
-                        )
-                        for md_configname, config in {
-                            **{
-                                p: None
-                                for p in config.get(  # type: ignore[union-attr]
-                                    'profiles', []
-                                )
-                            },
-                            **config.get(  # type: ignore[union-attr]
-                                'custom_profiles', {}
-                            ),
-                        }.items()
-                    }
-
-        @classmethod
-        def dump(cls) -> None:
-            # pylint: disable=unsubscriptable-object
-            if cls.test_map is not None:
-                for md_testname, data in cls.test_files.items():
-                    data['expected_output'] = {
-                        md_configname: tomlkit.string(case.output, multiline=True)
-                        for md_configname, case in cls.test_map[md_testname].items()
-                    }
-                    (md_tests_data_root / md_testname).write_text(tomlkit.dumps(data))
-
-        @classmethod
-        def test_cases(cls) -> list[tuple[str, str]]:
-            cls.load()
-            return (
-                [
-                    (md_testname, md_configname)
-                    for md_testname, test in cls.test_map.items()
-                    for md_configname in test.keys()
-                ]
-                if cls.test_map is not None
-                else []
-            )
-
-        @classmethod
-        def test_case(cls, md_testname: str, md_configname: str) -> MarkdownCase:
-            # pylint: disable=unsubscriptable-object
-            return cls.test_map[md_testname][md_configname]  # type: ignore[index]
-
-        @classmethod
-        def update_expected_output(cls) -> None:
-            cls.load()
-            cls.dump()
-
-        @classmethod
-        def update_debug_output(cls) -> None:
-            """Save test output in file output.html for visual debugging."""
-            cls.load()
-            template = BeautifulSoup(
-                (md_tests_data_root / 'template.html').read_text(), 'html.parser'
-            )
-            case_template = template.find(id='output_template')
-            for md_testname, md_configname in cls.test_cases():
-                case: MarkdownCase = cls.test_case(md_testname, md_configname)
-                op = copy(case_template)
-                del op['id']
-                op.select('.filename')[0].string = case.md_testname
-                op.select('.profile')[0].string = str(case.md_configname)
-                op.select('.config')[0].string = ''
-                op.select('.markdown .output')[0].append(case.mdtext)
-                op.select('.expected .output')[0].append(
-                    BeautifulSoup(case.expected_output, 'html.parser')
-                    if case.expected_output is not None
-                    else 'Not generated'
-                )
-                op.select('.final_output .output')[0].append(
-                    BeautifulSoup(case.output, 'html.parser')
-                )
-                op['class'] = op.get('class', []) + [
-                    'success' if case.expected_output == case.output else 'failed'
-                ]
-                template.find('body').append(op)
-            template.find(id='generated').string = datetime.now().strftime(
-                '%d %B, %Y %H:%M:%S'
-            )
-            (md_tests_data_root / 'output.html').write_text(template.prettify())
-
-    if (
-        'md_testname' in metafunc.fixturenames
-        and 'md_configname' in metafunc.fixturenames
-    ):
-        metafunc.parametrize(
-            ('md_testname', 'md_configname'), MarkdownTestRegistry.test_cases()
-        )
-
-    if 'markdown_test_registry' in metafunc.fixturenames:
-        metafunc.parametrize('markdown_test_registry', [MarkdownTestRegistry])
diff --git a/tests/unit/utils/md/__init__.py b/tests/unit/utils/md/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/utils/md/conftest.py b/tests/unit/utils/md/conftest.py
new file mode 100644
index 000000000..5617d5524
--- /dev/null
+++ b/tests/unit/utils/md/conftest.py
@@ -0,0 +1,197 @@
+"""Test configuration for markdown tests."""
+
+from __future__ import annotations
+
+from copy import copy
+from datetime import datetime
+from pathlib import Path
+from typing import TYPE_CHECKING, ClassVar
+
+import pytest
+import tomlkit
+from bs4 import BeautifulSoup
+from bs4.element import Tag
+from markupsafe import Markup
+
+if TYPE_CHECKING:
+    from funnel.utils.markdown import MarkdownConfig
+
+md_tests_data_root = Path(__file__).parent / 'data'
+
+
+class MarkdownCase:
+    """Class for markdown test case for a content-profile combination."""
+
+    def __init__(
+        self,
+        md_testname: str,
+        mdtext: str,
+        md_configname: str,
+        config: dict | None = None,
+        expected_output: str | None = None,
+    ) -> None:
+        from funnel.utils.markdown import MarkdownConfig  # pylint: disable=C0415
+
+        self.md_testname = md_testname
+        self.mdtext = mdtext
+        self.md_configname = md_configname
+        self.config = (
+            MarkdownConfig(**config)
+            if config is not None
+            else MarkdownConfig.registry[md_configname]
+        )
+        self.expected_output = expected_output
+
+    def __repr__(self) -> str:
+        return self.caseid
+
+    @property
+    def caseid(self) -> str:
+        return f'{self.md_testname}-{self.md_configname}'
+
+    @property
+    def markdown_config(self) -> str | MarkdownConfig:
+        """
+        Return the markdown config for the test case.
+
+        Output is str if the config is pre-defined,
+        else a custom class inherited from MarkdownConfig.
+        """
+        return self.config if self.config is not None else self.md_configname
+
+    @property
+    def output(self) -> str:
+        return self.config.render(self.mdtext)
+
+    def update_expected_output(self) -> None:
+        self.expected_output = self.output
+
+
+class MarkdownTestRegistry:
+    test_map: ClassVar[dict[str, dict[str, MarkdownCase]] | None] = None
+    test_files: ClassVar[dict[str, tomlkit.TOMLDocument]]
+
+    @classmethod
+    def load(cls) -> None:
+        """Load test cases from .toml files and create a 2D map."""
+        if cls.test_map is None:
+            test_map = {}
+            cls.test_files = {
+                file.name: tomlkit.loads(file.read_text())
+                for file in md_tests_data_root.iterdir()
+                if file.suffix == '.toml'
+            }
+            for md_testname, test_data in cls.test_files.items():
+                config = test_data['config']
+                exp = test_data.get('expected_output', {})
+                # Combine pre-defined profiles with custom profiles
+                # and store each test case in test_map[md_testname][md_configname]
+                test_map[md_testname] = {
+                    md_configname: MarkdownCase(
+                        md_testname=md_testname,
+                        mdtext=test_data['markdown'],  # type: ignore[arg-type]
+                        md_configname=md_configname,
+                        config=config,
+                        expected_output=None
+                        if exp.get(md_configname, None) is None
+                        else Markup(exp.get(md_configname, None)),
+                    )
+                    for md_configname, config in {
+                        **{
+                            p: None
+                            for p in config.get(  # type: ignore[union-attr]
+                                'profiles', []
+                            )
+                        },
+                        **config.get('custom_profiles', {}),  # type: ignore[union-attr]
+                    }.items()
+                }
+            cls.test_map = test_map
+
+    @classmethod
+    def dump(cls) -> None:
+        # pylint: disable=unsubscriptable-object
+        if cls.test_map is not None:
+            for md_testname, data in cls.test_files.items():
+                data['expected_output'] = {
+                    md_configname: tomlkit.string(case.output, multiline=True)
+                    for md_configname, case in cls.test_map[md_testname].items()
+                }
+                (md_tests_data_root / md_testname).write_text(tomlkit.dumps(data))
+
+    @classmethod
+    def test_cases(cls) -> list[tuple[str, str]]:
+        cls.load()
+        return (
+            [
+                (md_testname, md_configname)
+                for md_testname, test in cls.test_map.items()
+                for md_configname in test.keys()
+            ]
+            if cls.test_map is not None
+            else []
+        )
+
+    @classmethod
+    def test_case(cls, md_testname: str, md_configname: str) -> MarkdownCase:
+        # pylint: disable=unsubscriptable-object
+        return cls.test_map[md_testname][md_configname]  # type: ignore[index]
+
+    @classmethod
+    def update_expected_output(cls) -> None:
+        cls.load()
+        cls.dump()
+
+    @classmethod
+    def update_debug_output(cls) -> None:
+        """Save test output in file output.html for visual debugging."""
+        cls.load()
+        template = BeautifulSoup(
+            (md_tests_data_root / 'template.html').read_text(), 'html.parser'
+        )
+        case_template = template.find(id='output_template')
+        assert isinstance(case_template, Tag)
+        for md_testname, md_configname in cls.test_cases():
+            case: MarkdownCase = cls.test_case(md_testname, md_configname)
+            op = copy(case_template)
+            del op['id']
+            op.select('.filename')[0].string = case.md_testname
+            op.select('.profile')[0].string = str(case.md_configname)
+            op.select('.config')[0].string = ''
+            op.select('.markdown .output')[0].append(case.mdtext)
+            op.select('.expected .output')[0].append(
+                BeautifulSoup(case.expected_output, 'html.parser')
+                if case.expected_output is not None
+                else 'Not generated'
+            )
+            op.select('.final_output .output')[0].append(
+                BeautifulSoup(case.output, 'html.parser')
+            )
+            existing_class = op.get('class')
+            if not existing_class:
+                existing_class = []
+            elif isinstance(existing_class, str):
+                existing_class = [existing_class]
+            op['class'] = existing_class + [
+                'success' if case.expected_output == case.output else 'failed'
+            ]
+            body = template.find('body')
+            assert isinstance(body, Tag)
+            body.append(op)
+        generated = template.find(id='generated')
+        assert isinstance(generated, Tag)
+        generated.string = datetime.now().strftime('%d %B, %Y %H:%M:%S')
+        (md_tests_data_root / 'output.html').write_text(template.prettify())
+
+
+def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
+    if (
+        'md_testname' in metafunc.fixturenames
+        and 'md_configname' in metafunc.fixturenames
+    ):
+        metafunc.parametrize(
+            ('md_testname', 'md_configname'), MarkdownTestRegistry.test_cases()
+        )
+
+    if 'markdown_test_registry' in metafunc.fixturenames:
+        metafunc.parametrize('markdown_test_registry', [MarkdownTestRegistry])
diff --git a/tests/unit/utils/markdown/data/abbr.toml b/tests/unit/utils/md/data/abbr.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/abbr.toml
rename to tests/unit/utils/md/data/abbr.toml
diff --git a/tests/unit/utils/markdown/data/basic.toml b/tests/unit/utils/md/data/basic.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/basic.toml
rename to tests/unit/utils/md/data/basic.toml
diff --git a/tests/unit/utils/markdown/data/basic_plugins.toml b/tests/unit/utils/md/data/basic_plugins.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/basic_plugins.toml
rename to tests/unit/utils/md/data/basic_plugins.toml
diff --git a/tests/unit/utils/markdown/data/code.toml b/tests/unit/utils/md/data/code.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/code.toml
rename to tests/unit/utils/md/data/code.toml
diff --git a/tests/unit/utils/markdown/data/deflists.toml b/tests/unit/utils/md/data/deflists.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/deflists.toml
rename to tests/unit/utils/md/data/deflists.toml
diff --git a/tests/unit/utils/markdown/data/footnotes.toml b/tests/unit/utils/md/data/footnotes.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/footnotes.toml
rename to tests/unit/utils/md/data/footnotes.toml
diff --git a/tests/unit/utils/markdown/data/headings.toml b/tests/unit/utils/md/data/headings.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/headings.toml
rename to tests/unit/utils/md/data/headings.toml
diff --git a/tests/unit/utils/markdown/data/images.toml b/tests/unit/utils/md/data/images.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/images.toml
rename to tests/unit/utils/md/data/images.toml
diff --git a/tests/unit/utils/markdown/data/links.toml b/tests/unit/utils/md/data/links.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/links.toml
rename to tests/unit/utils/md/data/links.toml
diff --git a/tests/unit/utils/markdown/data/lists.toml b/tests/unit/utils/md/data/lists.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/lists.toml
rename to tests/unit/utils/md/data/lists.toml
diff --git a/tests/unit/utils/markdown/data/markmap.toml b/tests/unit/utils/md/data/markmap.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/markmap.toml
rename to tests/unit/utils/md/data/markmap.toml
diff --git a/tests/unit/utils/markdown/data/mermaid.toml b/tests/unit/utils/md/data/mermaid.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/mermaid.toml
rename to tests/unit/utils/md/data/mermaid.toml
diff --git a/tests/unit/utils/markdown/data/readme.md b/tests/unit/utils/md/data/readme.md
similarity index 100%
rename from tests/unit/utils/markdown/data/readme.md
rename to tests/unit/utils/md/data/readme.md
diff --git a/tests/unit/utils/markdown/data/tables.toml b/tests/unit/utils/md/data/tables.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/tables.toml
rename to tests/unit/utils/md/data/tables.toml
diff --git a/tests/unit/utils/markdown/data/tabs.toml b/tests/unit/utils/md/data/tabs.toml
similarity index 100%
rename from tests/unit/utils/markdown/data/tabs.toml
rename to tests/unit/utils/md/data/tabs.toml
diff --git a/tests/unit/utils/markdown/data/template.html b/tests/unit/utils/md/data/template.html
similarity index 100%
rename from tests/unit/utils/markdown/data/template.html
rename to tests/unit/utils/md/data/template.html
diff --git a/tests/unit/utils/markdown/data/test_case_id.toml.sample b/tests/unit/utils/md/data/test_case_id.toml.sample
similarity index 100%
rename from tests/unit/utils/markdown/data/test_case_id.toml.sample
rename to tests/unit/utils/md/data/test_case_id.toml.sample
diff --git a/tests/unit/utils/markdown/data/vega-lite.toml b/tests/unit/utils/md/data/vega-lite.toml
similarity index 99%
rename from tests/unit/utils/markdown/data/vega-lite.toml
rename to tests/unit/utils/md/data/vega-lite.toml
index a2aed9168..7cab069fc 100644
--- a/tests/unit/utils/markdown/data/vega-lite.toml
+++ b/tests/unit/utils/md/data/vega-lite.toml
@@ -352,11 +352,11 @@ markdown = """
 """
 
 [config]
-profiles = [ "basic", "document",]
+profiles = ["basic", "document"]
 
 [config.custom_profiles.vega_lite]
 preset = "default"
-plugins = [ "vega_lite",]
+plugins = ["vega_lite"]
 
 [expected_output]
 basic = """<h1>vega-lite tests</h1>
@@ -1031,7 +1031,7 @@ document = """<h1 id="h:vega-lite-tests"><a href="#h:vega-lite-tests">vega-lite
 
 </pre><div class="embed-container"></div></div>
 """
-vega-lite = """<h1>vega-lite tests</h1>
+vega_lite = """<h1>vega-lite tests</h1>
 <h2>Interactive Scatter Plot Matrix</h2>
 <div class="md-embed md-embed-vega-lite"><div class="embed-loading">Visualization</div><pre class="embed-content">{
 &quot;$schema&quot;: &quot;https://vega.github.io/schema/vega-lite/v5.json&quot;,
diff --git a/tests/unit/utils/markdown/markdown_test.py b/tests/unit/utils/md/markdown_test.py
similarity index 79%
rename from tests/unit/utils/markdown/markdown_test.py
rename to tests/unit/utils/md/markdown_test.py
index 5d2c198dd..0737064ad 100644
--- a/tests/unit/utils/markdown/markdown_test.py
+++ b/tests/unit/utils/md/markdown_test.py
@@ -1,12 +1,12 @@
 """Tests for markdown parser."""
 
-import warnings
-
 import pytest
 from markupsafe import Markup
 
 from funnel.utils.markdown import MarkdownConfig
 
+from .conftest import MarkdownTestRegistry
+
 
 def test_markdown_none() -> None:
     assert MarkdownConfig.registry['basic'].render(None) is None
@@ -24,12 +24,13 @@ def test_markdown_blank() -> None:
 
 
 def test_markdown_cases(
-    md_testname: str, md_configname: str, markdown_test_registry
+    md_testname: str,
+    md_configname: str,
+    markdown_test_registry: type[MarkdownTestRegistry],
 ) -> None:
     case = markdown_test_registry.test_case(md_testname, md_configname)
     if case.expected_output is None:
-        warnings.warn(f'Expected output not generated for {case}', stacklevel=1)
-        pytest.skip(f'Expected output not generated for {case}')
+        pytest.fail(f'Expected output not known for {case}')
 
     assert case.expected_output == case.output
 
@@ -38,7 +39,9 @@ def test_markdown_cases(
 
 
 @pytest.mark.debug_markdown_output()
-def test_markdown_debug_output(pytestconfig, markdown_test_registry) -> None:
+def test_markdown_debug_output(
+    pytestconfig: pytest.Config, markdown_test_registry: type[MarkdownTestRegistry]
+) -> None:
     has_mark = pytestconfig.getoption('-m', default=None) == 'debug_markdown_output'
     if not has_mark:
         pytest.skip('Skipping update of debug output file for markdown test cases')
diff --git a/tests/unit/utils/misc_test.py b/tests/unit/utils/misc_test.py
index e7aec43a0..b03c8f7a7 100644
--- a/tests/unit/utils/misc_test.py
+++ b/tests/unit/utils/misc_test.py
@@ -35,7 +35,7 @@ def test_mask_phone() -> None:
 
 
 def test_extract_twitter_handle() -> None:
-    """Test for extracing a Twitter handle from a URL or username."""
+    """Test for extracting a Twitter handle from a URL or username."""
     expected = 'shreyas_satish'
     assert (
         utils.extract_twitter_handle('https://twitter.com/shreyas_satish') == expected
diff --git a/tests/unit/views/account_menu_test.py b/tests/unit/views/account_menu_test.py
index 82fa3f856..31f3e8f7a 100644
--- a/tests/unit/views/account_menu_test.py
+++ b/tests/unit/views/account_menu_test.py
@@ -6,6 +6,8 @@
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 @pytest.mark.dbcommit()  # Required for granted_at time to be unique per commit
 @pytest.mark.parametrize(
@@ -29,14 +31,14 @@
     ],
 )
 def test_recent_organization_memberships_count(
-    db_session,
-    user_twoflower,
-    number_of_orgs,
-    require_listed,
-    require_overflow,
-    returned_listed,
-    returned_overflow,
-    returned_extra_count,
+    db_session: scoped_session,
+    user_twoflower: models.User,
+    number_of_orgs: int,
+    require_listed: int,
+    require_overflow: int,
+    returned_listed: int,
+    returned_overflow: int,
+    returned_extra_count: int,
 ) -> None:
     """Test if organization list in account menu handles counts correctly."""
     for i in range(number_of_orgs):
diff --git a/tests/unit/views/account_test.py b/tests/unit/views/account_test.py
index bc7068101..97187a5ce 100644
--- a/tests/unit/views/account_test.py
+++ b/tests/unit/views/account_test.py
@@ -1,13 +1,19 @@
 """Test account views."""
 
 from types import SimpleNamespace
+from typing import cast
 
 import pytest
 
+from funnel import models
 from funnel.views.account import user_agent_details
 
+from ...conftest import TestClient
 
-def test_account_always_has_profile_url(user_twoflower, user_rincewind) -> None:
+
+def test_account_always_has_profile_url(
+    user_twoflower: models.User, user_rincewind: models.User
+) -> None:
     """An account without a username will still have an absolute URL for a profile."""
     assert user_twoflower.username is None
     assert user_twoflower.absolute_url is not None
@@ -15,7 +21,11 @@ def test_account_always_has_profile_url(user_twoflower, user_rincewind) -> None:
     assert user_rincewind.absolute_url is not None
 
 
-def test_username_available(db_session, client, user_rincewind, csrf_token) -> None:
+def test_username_available(
+    client: TestClient,
+    user_rincewind: models.User,
+    csrf_token: str,
+) -> None:
     """Test the username availability endpoint."""
     endpoint = '/api/1/account/username_available'
 
@@ -48,7 +58,7 @@ def test_username_available(db_session, client, user_rincewind, csrf_token) -> N
         'error_description': "This username has been taken",
     }
 
-    # Misformatted usernames will render an explanatory error
+    # Mis-formatted usernames will render an explanatory error
     rv = client.post(
         endpoint,
         data={'username': 'this is invalid', 'csrf_token': csrf_token},
@@ -62,51 +72,6 @@ def test_username_available(db_session, client, user_rincewind, csrf_token) -> N
     }
 
 
-# Sample password that will pass zxcvbn's complexity validation, but will be flagged
-# by the pwned password validator
-PWNED_PASSWORD = "thisisone1"  # nosec
-
-
-@pytest.mark.enable_socket()
-def test_pwned_password(client, csrf_token, login, user_rincewind) -> None:
-    """Pwned password validator will block attempt to use a compromised password."""
-    login.as_(user_rincewind)
-    rv = client.post(
-        'account/password',
-        data={
-            'username': user_rincewind.username,
-            'form.id': 'password-change',
-            'password': PWNED_PASSWORD,
-            'confirm_password': PWNED_PASSWORD,
-            'csrf_token': csrf_token,
-        },
-    )
-    assert rv.status_code == 200
-    assert "This password was found in breached password lists" in rv.data.decode()
-
-
-def test_pwned_password_mock_endpoint_down(
-    requests_mock, client, csrf_token, login, user_rincewind
-) -> None:
-    """If the pwned password API is not available, the password is allowed."""
-    requests_mock.get('https://api.pwnedpasswords.com/range/1F074', status_code=404)
-    login.as_(user_rincewind)
-
-    rv = client.post(
-        'account/password',
-        data={
-            'username': user_rincewind.username,
-            'form.id': 'password-change',
-            'password': PWNED_PASSWORD,
-            'confirm_password': PWNED_PASSWORD,
-            'csrf_token': csrf_token,
-        },
-    )
-
-    assert rv.status_code == 303
-    assert rv.location == '/account'
-
-
 @pytest.mark.parametrize(
     ('user_agent', 'output'),
     [
@@ -198,5 +163,10 @@ def test_pwned_password_mock_endpoint_down(
         ),
     ],
 )
-def test_user_agent_details(user_agent, output) -> None:
-    assert user_agent_details(SimpleNamespace(user_agent=user_agent)) == output
+def test_user_agent_details(user_agent: str, output: dict) -> None:
+    assert (
+        user_agent_details(
+            cast(models.LoginSession, SimpleNamespace(user_agent=user_agent))
+        )
+        == output
+    )
diff --git a/tests/unit/views/api_shortlink_test.py b/tests/unit/views/api_shortlink_test.py
index 60176cba8..72c66408d 100644
--- a/tests/unit/views/api_shortlink_test.py
+++ b/tests/unit/views/api_shortlink_test.py
@@ -7,15 +7,25 @@
 
 from funnel import models
 
+from ...conftest import (
+    AppContext,
+    Flask,
+    LoginFixtureProtocol,
+    TestClient,
+    scoped_session,
+)
+
 
 @pytest.fixture()
-def create_shortlink(app_context):
+def create_shortlink(app_context: AppContext) -> str:
     """URL for creating a shortlink."""
     return url_for('create_shortlink')
 
 
 @pytest.fixture()
-def user_rincewind_site_editor(db_session, user_rincewind):
+def user_rincewind_site_editor(
+    db_session: scoped_session, user_rincewind: models.User
+) -> models.SiteMembership:
     sm = models.SiteMembership(
         member=user_rincewind, granted_by=user_rincewind, is_site_editor=True
     )
@@ -25,7 +35,7 @@ def user_rincewind_site_editor(db_session, user_rincewind):
 
 
 def test_create_invalid_shortlink(
-    app, client, user_rincewind, create_shortlink
+    app: Flask, client: TestClient, user_rincewind: models.User, create_shortlink: str
 ) -> None:
     """Creating a shortlink via API with invalid data will fail."""
     # A GET request will fail
@@ -35,6 +45,7 @@ def test_create_invalid_shortlink(
     # An external URL will be rejected
     rv = client.post(create_shortlink, data={'url': 'https://example.com'})
     assert rv.status_code == 422
+    assert rv.json is not None
     assert rv.json['error'] == 'url_invalid'
 
     # A relative URL will be rejected
@@ -42,6 +53,7 @@ def test_create_invalid_shortlink(
         create_shortlink, data={'url': user_rincewind.url_for(_external=False)}
     )
     assert rv.status_code == 422
+    assert rv.json is not None
     assert rv.json['error'] == 'url_invalid'
 
     # A full URL to a 404 path will be rejected
@@ -50,16 +62,20 @@ def test_create_invalid_shortlink(
         data={'url': f'http://{app.config["SERVER_NAME"]}/this/is/not/a/valid/url'},
     )
     assert rv.status_code == 422
+    assert rv.json is not None
     assert rv.json['error'] == 'url_invalid'
 
 
-def test_create_shortlink(app, client, user_rincewind, create_shortlink) -> None:
+def test_create_shortlink(
+    app: Flask, client: TestClient, user_rincewind: models.User, create_shortlink: str
+) -> None:
     """Creating a shortlink via API with valid data will pass."""
     # A valid URL to an app path will be accepted
     rv = client.post(
         create_shortlink, data={'url': user_rincewind.url_for(_external=True)}
     )
     assert rv.status_code == 201
+    assert rv.json is not None
     sl1 = furl(rv.json['shortlink'])
     assert sl1.netloc == app.config['SHORTLINK_DOMAIN']
     assert len(str(sl1.path)) <= 5  # API defaults to the shorter form (max 4 chars)
@@ -69,6 +85,7 @@ def test_create_shortlink(app, client, user_rincewind, create_shortlink) -> None
         create_shortlink, data={'url': user_rincewind.url_for(_external=True)}
     )
     assert rv.status_code == 200
+    assert rv.json is not None
     sl2 = furl(rv.json['shortlink'])
     assert sl1 == sl2
 
@@ -78,6 +95,7 @@ def test_create_shortlink(app, client, user_rincewind, create_shortlink) -> None
         data={'url': user_rincewind.url_for(_external=True, utm_campaign='webshare')},
     )
     assert rv.status_code == 201
+    assert rv.json is not None
     sl3 = furl(rv.json['shortlink'])
     assert sl3.netloc == app.config['SHORTLINK_DOMAIN']
     assert len(str(sl3.path)) <= 5  # API defaults to the shorter form (max 4 chars)
@@ -87,19 +105,22 @@ def test_create_shortlink(app, client, user_rincewind, create_shortlink) -> None
     )
 
 
-def test_create_shortlink_longer(app, client, user_rincewind, create_shortlink) -> None:
+def test_create_shortlink_longer(
+    app: Flask, client: TestClient, user_rincewind: models.User, create_shortlink: str
+) -> None:
     rv = client.post(
         create_shortlink,
         data={'url': user_rincewind.url_for(_external=True), 'shorter': '0'},
     )
     assert rv.status_code == 201
+    assert rv.json is not None
     sl1 = furl(rv.json['shortlink'])
     assert sl1.netloc == app.config['SHORTLINK_DOMAIN']
     assert len(str(sl1.path)) > 5  # The shortlink is no longer limited to 4 chars
 
 
 def test_create_shortlink_name_unauthorized(
-    client, user_rincewind, create_shortlink
+    client: TestClient, user_rincewind: models.User, create_shortlink: str
 ) -> None:
     """Asking for a custom name will fail if the user is not a site editor."""
     rv = client.post(
@@ -110,13 +131,19 @@ def test_create_shortlink_name_unauthorized(
         },
     )
     assert rv.status_code == 403
+    assert rv.json is not None
     assert rv.json['error'] == 'unauthorized'
 
 
 @pytest.mark.filterwarnings("ignore:New instance.*conflicts with persistent instance")
 @pytest.mark.usefixtures('user_rincewind_site_editor')
 def test_create_shortlink_name_authorized(
-    shortlinkapp, client, login, user_rincewind, user_wolfgang, create_shortlink
+    shortlinkapp: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
+    user_wolfgang: models.User,
+    create_shortlink: str,
 ) -> None:
     """Asking for a custom name will work for site editors."""
     login.as_(user_rincewind)
@@ -128,6 +155,7 @@ def test_create_shortlink_name_authorized(
         },
     )
     assert rv.status_code == 201
+    assert rv.json is not None
     assert (
         rv.json['shortlink'] == f'http://{shortlinkapp.config["SERVER_NAME"]}/rincewind'
     )
@@ -141,6 +169,7 @@ def test_create_shortlink_name_authorized(
         },
     )
     assert rv.status_code == 200
+    assert rv.json is not None
     assert (
         rv.json['shortlink'] == f'http://{shortlinkapp.config["SERVER_NAME"]}/rincewind'
     )
@@ -154,4 +183,5 @@ def test_create_shortlink_name_authorized(
         },
     )
     assert rv.status_code == 422
+    assert rv.json is not None
     assert rv.json['error'] == 'unavailable'
diff --git a/tests/unit/views/api_support_test.py b/tests/unit/views/api_support_test.py
index 1ab022b31..17273b69b 100644
--- a/tests/unit/views/api_support_test.py
+++ b/tests/unit/views/api_support_test.py
@@ -7,10 +7,11 @@
 
 import pytest
 from flask import Flask, url_for
-from flask.testing import FlaskClient
 
 from funnel import models
 
+from ...conftest import TestClient
+
 VALID_PHONE = '+918123456789'
 VALID_PHONE_UNPREFIXED = '8123456789'
 VALID_PHONE_ZEROPREFIXED = '08123456789'
@@ -42,7 +43,7 @@ def unaffiliated_phone_number() -> models.PhoneNumber:
 
 
 @pytest.mark.mock_config('app', {'INTERNAL_SUPPORT_API_KEY': ...})
-def test_api_key_not_configured(app: Flask, client: FlaskClient) -> None:
+def test_api_key_not_configured(app: Flask, client: TestClient) -> None:
     """Server must be configured with an API key."""
     app.config.pop('INTERNAL_SUPPORT_API_KEY', None)
     rv = client.post(url_for('support_callerid'), data={'number': VALID_PHONE})
@@ -50,7 +51,7 @@ def test_api_key_not_configured(app: Flask, client: FlaskClient) -> None:
 
 
 @pytest.mark.mock_config('app', {'INTERNAL_SUPPORT_API_KEY': mock_api_key})
-def test_api_key_mismatch(client: FlaskClient) -> None:
+def test_api_key_mismatch(client: TestClient) -> None:
     """Client must supply the correct API key."""
     rv = client.post(
         url_for('support_callerid'),
@@ -63,7 +64,7 @@ def test_api_key_mismatch(client: FlaskClient) -> None:
 @pytest.mark.mock_config('app', {'INTERNAL_SUPPORT_API_KEY': mock_api_key})
 def test_valid_phone_unaffiliated(
     app: Flask,
-    client: FlaskClient,
+    client: TestClient,
     unaffiliated_phone_number: models.PhoneNumber,
 ) -> None:
     """Test phone number not affiliated with a user account."""
@@ -86,7 +87,7 @@ def test_valid_phone_unaffiliated(
 )
 def test_valid_phone_affiliated(
     app: Flask,
-    client: FlaskClient,
+    client: TestClient,
     user_rincewind_phone: models.AccountPhone,
     number: str,
 ) -> None:
@@ -112,7 +113,7 @@ def test_valid_phone_affiliated(
 @pytest.mark.parametrize('number', [VALID_PHONE_INTL, VALID_PHONE_INTL_ZEROPREFIXED])
 def test_valid_phone_intl(
     app: Flask,
-    client: FlaskClient,
+    client: TestClient,
     user_twoflower_phone: models.AccountPhone,
     number: str,
 ) -> None:
diff --git a/tests/unit/views/helpers_test.py b/tests/unit/views/helpers_test.py
index 296b581df..4a7333a67 100644
--- a/tests/unit/views/helpers_test.py
+++ b/tests/unit/views/helpers_test.py
@@ -16,7 +16,7 @@
 
 
 @pytest.fixture()
-def testapp():
+def testapp() -> Flask:
     """Create a test app with an `index` view."""
     new_app = Flask(__name__)
 
@@ -51,7 +51,7 @@ def test_valid_timezones_remap() -> None:
     assert vhelpers.valid_timezones['asia/calcutta'] == 'Asia/Kolkata'
 
 
-def test_app_url_for(app, testapp) -> None:
+def test_app_url_for(app: Flask, testapp: Flask) -> None:
     """Test that app_url_for works cross-app and in-app."""
     # App context is not necessary to use app_url_for
     url = vhelpers.app_url_for(app, 'index')
@@ -86,7 +86,7 @@ def test_app_url_for(app, testapp) -> None:
         assert change_password_url2 == change_password_url
 
 
-def test_validate_is_app_url(app) -> None:
+def test_validate_is_app_url(app: Flask) -> None:
     """Local URL validator compares a URL against the URL map."""
     with app.test_request_context():
         assert vhelpers.validate_is_app_url('/full/url/required') is False
diff --git a/tests/unit/views/login_session_test.py b/tests/unit/views/login_session_test.py
index 26a0bdea9..134130a43 100644
--- a/tests/unit/views/login_session_test.py
+++ b/tests/unit/views/login_session_test.py
@@ -1,7 +1,7 @@
 """Test login session helpers."""
 
 import pytest
-from flask import session
+from flask import Flask, session
 
 from funnel.views.login_session import save_session_next_url
 
@@ -19,7 +19,14 @@
         ('POST', '/existing_next', '/new_next', False, '/existing_next'),  # Use saved
     ],
 )
-def test_save_session_next_url(app, existing, method, nextarg, saved, result) -> None:
+def test_save_session_next_url(
+    app: Flask,
+    existing: str | None,
+    method: str,
+    nextarg: str | None,
+    saved: bool,
+    result: str,
+) -> None:
     """Test if save_session_next_url() behaves appropriately."""
     if nextarg:
         test_url = f'/test_url?next={nextarg}'
diff --git a/tests/unit/views/notification_test.py b/tests/unit/views/notification_test.py
index 175c9cf1e..3894447e2 100644
--- a/tests/unit/views/notification_test.py
+++ b/tests/unit/views/notification_test.py
@@ -12,9 +12,13 @@
 from funnel.transports.sms import SmsTemplate
 from funnel.views.notifications.mixins import TemplateVarMixin
 
+from ...conftest import Flask, TestClient, scoped_session
+
 
 @pytest.fixture()
-def phone_vetinari(db_session, user_vetinari):
+def phone_vetinari(
+    db_session: scoped_session, user_vetinari: models.User
+) -> models.AccountPhone:
     """Add a phone number to user_vetinari."""
     accountphone = user_vetinari.add_phone('+12345678900')
     db_session.add(accountphone)
@@ -23,7 +27,9 @@ def phone_vetinari(db_session, user_vetinari):
 
 
 @pytest.fixture()
-def notification_prefs_vetinari(db_session, user_vetinari):
+def notification_prefs_vetinari(
+    db_session: scoped_session, user_vetinari: models.User
+) -> models.NotificationPreferences:
     """Add main notification preferences for user_vetinari."""
     prefs = models.NotificationPreferences(
         notification_type='',
@@ -40,7 +46,11 @@ def notification_prefs_vetinari(db_session, user_vetinari):
 
 
 @pytest.fixture()
-def project_update(db_session, user_vetinari, project_expo2010):
+def project_update(
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    project_expo2010: models.Project,
+) -> models.Update:
     """Create an update to add a notification for."""
     db_session.commit()
     update = models.Update(
@@ -57,7 +67,11 @@ def project_update(db_session, user_vetinari, project_expo2010):
 
 
 @pytest.fixture()
-def update_notification_recipient(db_session, user_vetinari, project_update):
+def update_notification_recipient(
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    project_update: models.Update,
+) -> models.NotificationRecipient:
     """Get a user notification for the update fixture."""
     notification = models.NewUpdateNotification(project_update)
     db_session.add(notification)
@@ -72,7 +86,8 @@ def update_notification_recipient(db_session, user_vetinari, project_update):
 
 
 def test_notification_recipient_is_user_vetinari(
-    update_notification_recipient, user_vetinari
+    update_notification_recipient: models.NotificationRecipient,
+    user_vetinari: models.User,
 ) -> None:
     """Confirm the test notification is for the test user fixture."""
     assert update_notification_recipient.recipient == user_vetinari
@@ -80,13 +95,15 @@ def test_notification_recipient_is_user_vetinari(
 
 @pytest.fixture()
 def unsubscribe_sms_short_url(
-    update_notification_recipient, phone_vetinari, notification_prefs_vetinari
-):
+    update_notification_recipient: models.NotificationRecipient,
+    phone_vetinari: models.AccountPhone,
+    notification_prefs_vetinari: models.NotificationPreferences,
+) -> str:
     """Get an unsubscribe URL for the SMS notification."""
     return update_notification_recipient.views.render.unsubscribe_short_url('sms')
 
 
-def test_unsubscribe_view_is_well_formatted(unsubscribe_sms_short_url) -> None:
+def test_unsubscribe_view_is_well_formatted(unsubscribe_sms_short_url: str) -> None:
     """Confirm the SMS unsubscribe URL is well formatted."""
     prefix = 'https://bye.test/'
     assert unsubscribe_sms_short_url.startswith(prefix)
@@ -94,7 +111,10 @@ def test_unsubscribe_view_is_well_formatted(unsubscribe_sms_short_url) -> None:
 
 
 def test_unsubscribe_sms_view(
-    app, client, unsubscribe_sms_short_url, user_vetinari
+    app: Flask,
+    client: TestClient,
+    unsubscribe_sms_short_url: str,
+    user_vetinari: models.User,
 ) -> None:
     """Confirm the unsubscribe URL renders a form."""
     unsub_url = url_for(
@@ -128,9 +148,10 @@ def test_unsubscribe_sms_view(
     # Assert the user has SMS notifications enabled, and the form agrees
     assert user_vetinari.main_notification_preferences.by_sms is True
     form = rv.form('form-unsubscribe-preferences')
+    assert form is not None
     assert form.fields['main'] == 'y'
-    form.fields['main'] = False
-    rv = form.submit(client)
+    form.fields['main'] = ''
+    rv = form.submit(client)  # type: ignore[attr-defined]
     # We'll now get an acknowledgement
     assert rv.status_code == 200
     # And the user's preferences will be turned off
diff --git a/tests/unit/views/notifications/__init__.py b/tests/unit/views/notifications/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/views/notifications/conftest.py b/tests/unit/views/notifications/conftest.py
index 8536d0851..90c4c5622 100644
--- a/tests/unit/views/notifications/conftest.py
+++ b/tests/unit/views/notifications/conftest.py
@@ -1,14 +1,24 @@
 """Test configuration and fixtures."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from pytest_bdd import given
 
+if TYPE_CHECKING:
+    from funnel import models
+
 
 @given(
     "Vetinari is an owner of the Ankh-Morpork organization",
     target_fixture='vetinari_admin',
 )
-def given_vetinari_owner_org(user_vetinari, org_ankhmorpork) -> None:
+def given_vetinari_owner_org(
+    user_vetinari: models.User, org_ankhmorpork: models.Organization
+) -> models.AccountMembership:
     assert 'owner' in org_ankhmorpork.roles_for(user_vetinari)
-    vetinari_admin = org_ankhmorpork.active_owner_memberships[0]
+    vetinari_admin = org_ankhmorpork.active_owner_memberships.first()
+    assert vetinari_admin is not None
     assert vetinari_admin.member == user_vetinari
     return vetinari_admin
diff --git a/tests/unit/views/notifications/organization_membership_notification_test.py b/tests/unit/views/notifications/organization_membership_notification_test.py
index b5c8bed55..b90a6bcf8 100644
--- a/tests/unit/views/notifications/organization_membership_notification_test.py
+++ b/tests/unit/views/notifications/organization_membership_notification_test.py
@@ -3,7 +3,9 @@
 from pytest_bdd import given, parsers, scenarios, then, when
 
 from funnel import models
-from funnel.models.membership_mixin import MEMBERSHIP_RECORD_TYPE
+from funnel.models.membership_mixin import MembershipRecordTypeEnum
+
+from ....conftest import GetUserProtocol, scoped_session
 
 scenarios('notifications/organization_membership_notification.feature')
 
@@ -12,7 +14,12 @@
     "Vimes is an admin of the Ankh-Morpork organization",
     target_fixture='vimes_admin',
 )
-def given_vimes_admin(db_session, user_vimes, org_ankhmorpork, user_vetinari):
+def given_vimes_admin(
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_vimes: models.User,
+    org_ankhmorpork: models.Organization,
+) -> models.AccountMembership:
     vimes_admin = models.AccountMembership(
         member=user_vimes,
         account=org_ankhmorpork,
@@ -33,12 +40,12 @@ def given_vimes_admin(db_session, user_vimes, org_ankhmorpork, user_vetinari):
     target_fixture='ridcully_admin',
 )
 def when_vetinari_adds_ridcully(
-    db_session,
-    user_vetinari,
-    user_ridcully,
-    org_ankhmorpork,
-    role,
-):
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    org_ankhmorpork: models.Organization,
+    role: str,
+) -> models.AccountMembership:
     is_owner = role == 'owner'
     ridcully_admin = models.AccountMembership(
         member=user_ridcully,
@@ -72,7 +79,11 @@ def when_vetinari_adds_ridcully(
     )
 )
 def then_user_gets_notification(
-    getuser, recipient, actor, notification_string, ridcully_admin
+    getuser: GetUserProtocol,
+    recipient: str,
+    actor: str,
+    notification_string: str,
+    ridcully_admin: models.AccountMembership,
 ) -> None:
     preview = models.PreviewNotification(
         models.OrganizationAdminMembershipNotification,
@@ -83,6 +94,7 @@ def then_user_gets_notification(
     notification_recipient = models.NotificationFor(preview, getuser(recipient))
     view = notification_recipient.views.render
     assert view.actor.uuid == getuser(actor).uuid
+    assert ridcully_admin.granted_by is not None
     assert (
         view.activity_template().format(
             actor=ridcully_admin.granted_by.fullname,
@@ -102,7 +114,11 @@ def then_user_gets_notification(
     target_fixture='ridcully_admin',
 )
 def when_vetinari_invites_ridcully(
-    db_session, user_vetinari, user_ridcully, org_ankhmorpork, role
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    org_ankhmorpork: models.Organization,
+    role: str,
 ):
     is_owner = role == 'owner'
     ridcully_admin = models.AccountMembership(
@@ -110,7 +126,7 @@ def when_vetinari_invites_ridcully(
         account=org_ankhmorpork,
         granted_by=user_vetinari,
         is_owner=is_owner,
-        record_type=MEMBERSHIP_RECORD_TYPE.INVITE,
+        record_type=MembershipRecordTypeEnum.INVITE,
     )
     db_session.add(ridcully_admin)
     db_session.commit()
@@ -122,11 +138,11 @@ def when_vetinari_invites_ridcully(
     target_fixture='ridcully_admin',
 )
 def when_ridcully_accepts_invite(
-    db_session,
-    ridcully_admin,
-    user_ridcully,
-) -> models.ProjectMembership:
-    assert ridcully_admin.record_type == MEMBERSHIP_RECORD_TYPE.INVITE
+    db_session: scoped_session,
+    user_ridcully: models.User,
+    ridcully_admin: models.AccountMembership,
+) -> models.AccountMembership:
+    assert ridcully_admin.record_type == MembershipRecordTypeEnum.INVITE
     assert ridcully_admin.member == user_ridcully
     ridcully_admin_accept = ridcully_admin.accept(actor=user_ridcully)
     db_session.commit()
@@ -138,8 +154,12 @@ def when_ridcully_accepts_invite(
     target_fixture='ridcully_admin',
 )
 def given_riduclly_admin(
-    db_session, user_ridcully, org_ankhmorpork, user_vetinari, role
-):
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    org_ankhmorpork: models.Organization,
+    role: str,
+) -> models.AccountMembership:
     is_owner = role == 'owner'
     ridcully_admin = models.AccountMembership(
         member=user_ridcully,
@@ -157,8 +177,11 @@ def given_riduclly_admin(
     target_fixture='ridcully_admin',
 )
 def when_vetinari_amends_ridcully_role(
-    db_session, user_vetinari, ridcully_admin, new_role, org_ankhmorpork, user_ridcully
-) -> models.ProjectMembership:
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    ridcully_admin: models.AccountMembership,
+    new_role: str,
+) -> models.AccountMembership:
     is_owner = new_role == 'owner'
     ridcully_admin_amend = ridcully_admin.replace(
         actor=user_vetinari, is_owner=is_owner
@@ -172,10 +195,10 @@ def when_vetinari_amends_ridcully_role(
     target_fixture='ridcully_admin',
 )
 def when_vetinari_removes_ridcully(
-    db_session,
-    user_vetinari,
-    ridcully_admin,
-) -> models.ProjectMembership:
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    ridcully_admin: models.AccountMembership,
+) -> models.AccountMembership:
     ridcully_admin.revoke(actor=user_vetinari)
     db_session.commit()
     return ridcully_admin
@@ -187,11 +210,11 @@ def when_vetinari_removes_ridcully(
     )
 )
 def then_notification_recipient_removal(
-    getuser,
-    recipient,
-    notification_string,
-    actor,
-    ridcully_admin,
+    getuser: GetUserProtocol,
+    recipient: str,
+    notification_string: str,
+    actor: str,
+    ridcully_admin: models.AccountMembership,
 ) -> None:
     preview = models.PreviewNotification(
         models.OrganizationAdminMembershipRevokedNotification,
@@ -202,6 +225,7 @@ def then_notification_recipient_removal(
     notification_recipient = models.NotificationFor(preview, getuser(recipient))
     view = notification_recipient.views.render
     assert view.actor.uuid == getuser(actor).uuid
+    assert ridcully_admin.granted_by is not None
     assert (
         view.activity_template().format(
             actor=ridcully_admin.granted_by.fullname,
diff --git a/tests/unit/views/notifications/project_crew_notification_test.py b/tests/unit/views/notifications/project_crew_notification_test.py
index 299c8a248..4c6bdb368 100644
--- a/tests/unit/views/notifications/project_crew_notification_test.py
+++ b/tests/unit/views/notifications/project_crew_notification_test.py
@@ -3,12 +3,14 @@
 from pytest_bdd import given, parsers, scenarios, then, when
 
 from funnel import models
-from funnel.models.membership_mixin import MEMBERSHIP_RECORD_TYPE
+from funnel.models.membership_mixin import MembershipRecordTypeEnum
+
+from ....conftest import GetUserProtocol, scoped_session
 
 scenarios('notifications/project_crew_notification.feature')
 
 
-def role_columns(role):
+def role_columns(role: str) -> dict[str, bool]:
     roles = [_r.strip() for _r in role.split(',')]
     is_editor = 'editor' in roles
     is_promoter = 'promoter' in roles
@@ -21,12 +23,13 @@ def role_columns(role):
     target_fixture='vetinari_member',
 )
 def given_vetinari_editor_promoter_project(
-    user_vetinari,
-    project_expo2010,
+    user_vetinari: models.User,
+    project_expo2010: models.Project,
 ) -> models.ProjectMembership:
     assert 'promoter' in project_expo2010.roles_for(user_vetinari)
     assert 'editor' in project_expo2010.roles_for(user_vetinari)
-    vetinari_member = project_expo2010.crew_memberships[0]
+    vetinari_member = project_expo2010.crew_memberships.first()
+    assert vetinari_member is not None
     assert vetinari_member.member == user_vetinari
     return vetinari_member
 
@@ -36,10 +39,10 @@ def given_vetinari_editor_promoter_project(
     target_fixture='vimes_member',
 )
 def given_vimes_promoter_project(
-    db_session,
-    user_vetinari,
-    user_vimes,
-    project_expo2010,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_vimes: models.User,
+    project_expo2010: models.Project,
 ) -> models.ProjectMembership:
     vimes_member = models.ProjectMembership(
         parent=project_expo2010,
@@ -60,11 +63,11 @@ def given_vimes_promoter_project(
     target_fixture='ridcully_member',
 )
 def when_vetinari_adds_ridcully(
-    role,
-    db_session,
-    user_ridcully,
-    project_expo2010,
-    user_vetinari,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
+    role: str,
 ) -> models.ProjectMembership:
     ridcully_member = models.ProjectMembership(
         parent=project_expo2010,
@@ -98,7 +101,11 @@ def when_vetinari_adds_ridcully(
     )
 )
 def then_user_gets_notification(
-    getuser, recipient, notification_string, actor, ridcully_member
+    getuser: GetUserProtocol,
+    recipient: str,
+    actor: str,
+    notification_string: str,
+    ridcully_member: models.ProjectMembership,
 ) -> None:
     preview = models.PreviewNotification(
         models.ProjectCrewMembershipNotification,
@@ -109,6 +116,7 @@ def then_user_gets_notification(
     notification_recipient = models.NotificationFor(preview, getuser(recipient))
     view = notification_recipient.views.render
     assert view.actor.uuid == getuser(actor).uuid
+    assert ridcully_member.granted_by is not None
     assert (
         view.activity_template().format(
             actor=ridcully_member.granted_by.fullname,
@@ -132,17 +140,17 @@ def then_user_gets_notification(
     target_fixture='ridcully_member',
 )
 def when_vetinari_invites_ridcully(
-    role,
-    db_session,
-    user_ridcully,
-    project_expo2010,
-    user_vetinari,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
+    role: str,
 ) -> models.ProjectMembership:
     ridcully_member = models.ProjectMembership(
         parent=project_expo2010,
         member=user_ridcully,
         granted_by=user_vetinari,
-        record_type=MEMBERSHIP_RECORD_TYPE.INVITE,
+        record_type=MembershipRecordTypeEnum.INVITE,
         **role_columns(role),
     )
     db_session.add(ridcully_member)
@@ -156,11 +164,11 @@ def when_vetinari_invites_ridcully(
     target_fixture='ridcully_member',
 )
 def when_ridcully_accepts_invite(
-    db_session,
-    ridcully_member,
-    user_ridcully,
+    db_session: scoped_session,
+    user_ridcully: models.User,
+    ridcully_member: models.ProjectMembership,
 ) -> models.ProjectMembership:
-    assert ridcully_member.record_type == MEMBERSHIP_RECORD_TYPE.INVITE
+    assert ridcully_member.record_type == MembershipRecordTypeEnum.INVITE
     assert ridcully_member.member == user_ridcully
     ridcully_member_accept = ridcully_member.accept(actor=user_ridcully)
     db_session.commit()
@@ -173,10 +181,10 @@ def when_ridcully_accepts_invite(
     target_fixture='ridcully_member',
 )
 def given_ridcully_is_existing_crew(
-    db_session,
-    user_vetinari,
-    user_ridcully,
-    project_expo2010,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
 ) -> models.ProjectMembership:
     ridcully_member = models.ProjectMembership(
         parent=project_expo2010,
@@ -198,10 +206,10 @@ def given_ridcully_is_existing_crew(
     target_fixture='ridcully_member',
 )
 def when_vetinari_amends_ridcully_role(
-    role,
-    db_session,
-    user_vetinari,
-    ridcully_member,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    ridcully_member: models.ProjectMembership,
+    role: str,
 ) -> models.ProjectMembership:
     ridcully_member_amend = ridcully_member.replace(
         actor=user_vetinari,
@@ -218,10 +226,10 @@ def when_vetinari_amends_ridcully_role(
     target_fixture='ridcully_member',
 )
 def when_ridcully_changes_role(
-    role,
-    db_session,
-    user_ridcully,
-    ridcully_member,
+    db_session: scoped_session,
+    user_ridcully: models.User,
+    ridcully_member: models.ProjectMembership,
+    role: str,
 ) -> models.ProjectMembership:
     ridcully_member_amend = ridcully_member.replace(
         actor=user_ridcully,
@@ -235,10 +243,10 @@ def when_ridcully_changes_role(
     "Vetinari made Ridcully an admin of Ankh-Morpork", target_fixture='ridcully_admin'
 )
 def given_vetinari_made_ridcully_admin_of_org(
-    db_session,
-    user_ridcully,
-    org_ankhmorpork,
-    user_vetinari,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    org_ankhmorpork: models.Organization,
 ) -> models.AccountMembership:
     ridcully_admin = models.AccountMembership(
         member=user_ridcully, account=org_ankhmorpork, granted_by=user_vetinari
@@ -256,11 +264,11 @@ def given_vetinari_made_ridcully_admin_of_org(
     target_fixture='ridcully_member',
 )
 def given_ridcully_is_existing_member(
-    role,
-    db_session,
-    user_ridcully,
-    project_expo2010,
-    user_vetinari,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
+    role: str,
 ) -> models.ProjectMembership:
     existing_ridcully_member = models.ProjectMembership(
         parent=project_expo2010,
@@ -278,9 +286,9 @@ def given_ridcully_is_existing_member(
     target_fixture='ridcully_member',
 )
 def when_vetinari_removes_ridcully(
-    db_session,
-    user_vetinari,
-    ridcully_member,
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    ridcully_member: models.ProjectMembership,
 ) -> models.ProjectMembership:
     ridcully_member.revoke(actor=user_vetinari)
     db_session.commit()
@@ -292,9 +300,9 @@ def when_vetinari_removes_ridcully(
     target_fixture='ridcully_member',
 )
 def when_ridcully_resigns(
-    db_session,
-    user_ridcully,
-    ridcully_member,
+    db_session: scoped_session,
+    user_ridcully: models.User,
+    ridcully_member: models.ProjectMembership,
 ) -> models.ProjectMembership:
     ridcully_member.revoke(user_ridcully)
     db_session.commit()
@@ -307,11 +315,11 @@ def when_ridcully_resigns(
     )
 )
 def then_notification_recipient_removal(
-    getuser,
-    recipient,
-    notification_string,
-    ridcully_member,
-    actor,
+    getuser: GetUserProtocol,
+    recipient: str,
+    actor: str,
+    notification_string: str,
+    ridcully_member: models.ProjectMembership,
 ) -> None:
     preview = models.PreviewNotification(
         models.ProjectCrewMembershipRevokedNotification,
@@ -322,6 +330,7 @@ def then_notification_recipient_removal(
     notification_recipient = models.NotificationFor(preview, getuser(recipient))
     view = notification_recipient.views.render
     assert view.actor.uuid == getuser(actor).uuid
+    assert ridcully_member.revoked_by is not None
     assert (
         view.activity_template().format(
             project=ridcully_member.project.joined_title,
@@ -339,11 +348,10 @@ def then_notification_recipient_removal(
     target_fixture='ridcully_member',
 )
 def when_ridcully_adds_themself(
-    role,
-    db_session,
-    user_ridcully,
-    project_expo2010,
-    user_vetinari,
+    db_session: scoped_session,
+    user_ridcully: models.User,
+    project_expo2010: models.Project,
+    role: str,
 ) -> models.ProjectMembership:
     ridcully_member = models.ProjectMembership(
         parent=project_expo2010,
diff --git a/tests/unit/views/project_spa_test.py b/tests/unit/views/project_spa_test.py
index 6ebc7dc56..e98c8a7f0 100644
--- a/tests/unit/views/project_spa_test.py
+++ b/tests/unit/views/project_spa_test.py
@@ -5,6 +5,10 @@
 
 import pytest
 
+from funnel import models
+
+from ...conftest import AppContext, LoginFixtureProtocol, TestClient
+
 # Endpoints to test within the project namespace
 subpages = ['', 'updates', 'comments', 'sub', 'schedule', 'videos', 'crew']
 # XHR header (without, with, with+accept)
@@ -18,18 +22,18 @@
 
 
 @pytest.fixture()
-def project_url(app_context, project_expo2010):
+def project_url(app_context: AppContext, project_expo2010: models.Project) -> str:
     """Relative URL for a project."""
     return urlsplit(project_expo2010.url_for()).path
 
 
 @pytest.fixture()
-def _promoter_login(login, user_vetinari):
+def _promoter_login(login: LoginFixtureProtocol, user_vetinari: models.User) -> None:
     """Login as a project promoter."""
     login.as_(user_vetinari)
 
 
-def test_project_url_is_as_expected(project_url) -> None:
+def test_project_url_is_as_expected(project_url: str) -> None:
     """Test the :func:`project_url` fixture before it's used in other tests."""
     # URL ends with '/'
     assert project_url.endswith('/')
@@ -41,8 +45,8 @@ def test_project_url_is_as_expected(project_url) -> None:
 @pytest.mark.parametrize('xhr', xhr_headers)
 @pytest.mark.parametrize('use_login', login_sessions)
 def test_default_is_html(
-    request,
-    client,
+    request: pytest.FixtureRequest,
+    client: TestClient,
     use_login: str | None,
     project_url: str,
     page: str,
@@ -64,8 +68,8 @@ def test_default_is_html(
 @pytest.mark.parametrize('xhr', xhr_headers)
 @pytest.mark.parametrize('use_login', login_sessions)
 def test_html_response(
-    request,
-    client,
+    request: pytest.FixtureRequest,
+    client: TestClient,
     use_login: str | None,
     project_url: str,
     page: str,
@@ -86,7 +90,11 @@ def test_html_response(
 @pytest.mark.parametrize('page', subpages)
 @pytest.mark.parametrize('use_login', login_sessions)
 def test_json_response(
-    request, client, use_login: str | None, project_url: str, page: str
+    request: pytest.FixtureRequest,
+    client: TestClient,
+    use_login: str | None,
+    project_url: str,
+    page: str,
 ) -> None:
     """Asking for JSON returns a JSON response."""
     if use_login:
@@ -95,6 +103,7 @@ def test_json_response(
     rv = client.get(project_url + page, headers=headers)
     assert rv.status_code == 200
     assert rv.content_type == 'application/json'
+    assert rv.json is not None
     assert 'status' in rv.json
     assert rv.json['status'] == 'ok'
 
@@ -103,8 +112,8 @@ def test_json_response(
 @pytest.mark.parametrize('xhr', xhr_headers)
 @pytest.mark.parametrize('use_login', login_sessions)
 def test_htmljson_response(
-    request,
-    client,
+    request: pytest.FixtureRequest,
+    client: TestClient,
     use_login: str | None,
     project_url: str,
     page: str,
@@ -120,6 +129,7 @@ def test_htmljson_response(
     rv = client.get(project_url + page, headers=headers)
     assert rv.status_code == 200
     assert rv.content_type == 'application/x.html+json; charset=utf-8'
+    assert rv.json is not None
     assert 'status' in rv.json
     assert rv.json['status'] == 'ok'
     assert 'html' in rv.json
diff --git a/tests/unit/views/project_sponsorship_test.py b/tests/unit/views/project_sponsorship_test.py
index 442485e36..471a98597 100644
--- a/tests/unit/views/project_sponsorship_test.py
+++ b/tests/unit/views/project_sponsorship_test.py
@@ -1,13 +1,23 @@
 """Test ProjectSponsorship views."""
 # pylint: disable=redefined-outer-name
 
+from typing import cast
+
 import pytest
+from flask import Flask
 
 from funnel import models
 
+from ...conftest import LoginFixtureProtocol, TestClient, scoped_session
+
 
 @pytest.fixture()
-def org_uu_sponsorship(db_session, user_vetinari, org_uu, project_expo2010):
+def org_uu_sponsorship(
+    db_session: scoped_session,
+    user_vetinari: models.User,
+    org_uu: models.Organization,
+    project_expo2010: models.Project,
+) -> models.ProjectSponsorMembership:
     sponsorship = models.ProjectSponsorMembership(
         granted_by=user_vetinari,
         member=org_uu,
@@ -21,7 +31,9 @@ def org_uu_sponsorship(db_session, user_vetinari, org_uu, project_expo2010):
 
 
 @pytest.fixture()
-def user_vetinari_site_editor(db_session, user_vetinari):
+def user_vetinari_site_editor(
+    db_session: scoped_session, user_vetinari: models.User
+) -> models.SiteMembership:
     site_editor = models.SiteMembership(
         member=user_vetinari, granted_by=user_vetinari, is_site_editor=True
     )
@@ -31,7 +43,9 @@ def user_vetinari_site_editor(db_session, user_vetinari):
 
 
 @pytest.fixture()
-def user_twoflower_not_site_editor(db_session, user_twoflower):
+def user_twoflower_not_site_editor(
+    db_session: scoped_session, user_twoflower: models.User
+) -> models.SiteMembership:
     not_site_editor = models.SiteMembership(
         member=user_twoflower, granted_by=user_twoflower, is_comment_moderator=True
     )
@@ -45,7 +59,13 @@ def user_twoflower_not_site_editor(db_session, user_twoflower):
     [('user_vetinari_site_editor', 200), ('user_twoflower_not_site_editor', 403)],
 )
 def test_check_site_editor_edit_sponsorship(
-    request, app, client, login, org_uu_sponsorship, user_site_membership, status_code
+    request: pytest.FixtureRequest,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    org_uu_sponsorship: models.ProjectSponsorMembership,
+    user_site_membership: str,
+    status_code: int,
 ) -> None:
     login.as_(request.getfixturevalue(user_site_membership).member)
     endpoint = org_uu_sponsorship.url_for('edit')
@@ -63,19 +83,19 @@ def test_check_site_editor_edit_sponsorship(
     ],
 )
 def test_sponsorship_add(
-    app,
-    client,
-    login,
-    user_vetinari_site_editor,
-    org_uu,
-    project_expo2010,
-    label,
-    is_promoted,
-    csrf_token,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_vetinari_site_editor: models.SiteMembership,
+    org_uu: models.Organization,
+    project_expo2010: models.Project,
+    label: str | None,
+    is_promoted: bool,
+    csrf_token: str,
 ) -> None:
-    login.as_(user_vetinari_site_editor.member)
+    login.as_(cast(models.User, user_vetinari_site_editor.member))
     endpoint = project_expo2010.url_for('add_sponsor')
-    data = {
+    data: dict = {
         'member': org_uu.name,
         'label': label,
         'csrf_token': csrf_token,
@@ -99,15 +119,15 @@ def test_sponsorship_add(
 
 
 def test_sponsorship_edit(
-    app,
-    client,
-    login,
-    org_uu_sponsorship,
-    user_vetinari_site_editor,
-    csrf_token,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    org_uu_sponsorship: models.ProjectSponsorMembership,
+    user_vetinari_site_editor: models.SiteMembership,
+    csrf_token: str,
 ) -> None:
     assert org_uu_sponsorship.is_promoted is True
-    login.as_(user_vetinari_site_editor.member)
+    login.as_(cast(models.User, user_vetinari_site_editor.member))
     endpoint = org_uu_sponsorship.url_for('edit')
     data = {
         'label': "Edited",
@@ -121,20 +141,20 @@ def test_sponsorship_edit(
         models.ProjectSponsorMembership.is_active,
         models.ProjectSponsorMembership.project == org_uu_sponsorship.project,
         models.ProjectSponsorMembership.member == org_uu_sponsorship.member,
-    ).one_or_none()
+    ).one()
     assert edited_sponsorship.label == "Edited"
     assert edited_sponsorship.is_promoted is False
 
 
 def test_sponsorship_remove(
-    db_session,
-    app,
-    client,
-    login,
-    org_uu_sponsorship,
-    user_vetinari,
-    user_vetinari_site_editor,
-    csrf_token,
+    db_session: scoped_session,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    org_uu_sponsorship: models.ProjectSponsorMembership,
+    user_vetinari: models.User,
+    user_vetinari_site_editor: models.SiteMembership,
+    csrf_token: str,
 ) -> None:
     db_session.add(user_vetinari_site_editor)
     db_session.commit()
diff --git a/tests/unit/views/project_test.py b/tests/unit/views/project_test.py
index 241cf1e45..1929025ec 100644
--- a/tests/unit/views/project_test.py
+++ b/tests/unit/views/project_test.py
@@ -1,9 +1,11 @@
 """Test Project views."""
 
+from flask.ctx import AppContext
+
 from funnel.views.project import get_registration_text
 
 
-def test_registration_text(app_context) -> None:
+def test_registration_text(app_context: AppContext) -> None:
     assert get_registration_text(count=0, registered=False).startswith("Be the first")
     assert get_registration_text(count=1, registered=True).startswith(
         "You have registered"
diff --git a/tests/unit/views/rsvp_test.py b/tests/unit/views/rsvp_test.py
index 3e8a9bfdf..087637d17 100644
--- a/tests/unit/views/rsvp_test.py
+++ b/tests/unit/views/rsvp_test.py
@@ -4,10 +4,13 @@
 import datetime
 
 import pytest
+from flask import Flask
 from werkzeug.datastructures import MultiDict
 
 from funnel import models
 
+from ...conftest import LoginFixtureProtocol, TestClient
+
 valid_schema = {
     'fields': [
         {
@@ -80,9 +83,9 @@ def project_expo2010(project_expo2010: models.Project) -> models.Project:
 
 # Organizer side testing
 def test_valid_registration_form_schema(
-    app,
-    client,
-    login,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
     csrf_token: str,
     user_vetinari: models.User,
     project_expo2010: models.Project,
@@ -96,7 +99,7 @@ def test_valid_registration_form_schema(
             {
                 'org': '',
                 'item_collection_id': '',
-                'rsvp_state': models.PROJECT_RSVP_STATE.ALL,
+                'rsvp_state': int(models.ProjectRsvpStateEnum.ALL),
                 'is_subscription': False,
                 'register_button_txt': 'Follow',
                 'register_form_schema': app.json.dumps(valid_schema),
@@ -108,8 +111,8 @@ def test_valid_registration_form_schema(
 
 
 def test_invalid_registration_form_schema(
-    client,
-    login,
+    client: TestClient,
+    login: LoginFixtureProtocol,
     csrf_token: str,
     user_vetinari: models.User,
     project_expo2010: models.Project,
@@ -130,9 +133,9 @@ def test_invalid_registration_form_schema(
 
 
 def test_valid_json_register(
-    app,
-    client,
-    login,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
     csrf_token: str,
     user_twoflower: models.User,
     project_expo2010: models.Project,
@@ -151,13 +154,15 @@ def test_valid_json_register(
         headers={'Content-Type': 'application/json'},
     )
     assert rv.status_code == 303
-    assert project_expo2010.rsvp_for(user_twoflower).form == valid_json_rsvp
+    rsvp = project_expo2010.rsvp_for(user_twoflower)
+    assert rsvp is not None
+    assert rsvp.form == valid_json_rsvp
 
 
 def test_valid_encoded_json_register(
-    app,
-    client,
-    login,
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
     csrf_token: str,
     user_twoflower: models.User,
     project_expo2010: models.Project,
@@ -173,11 +178,16 @@ def test_valid_encoded_json_register(
         },
     )
     assert rv.status_code == 303
-    assert project_expo2010.rsvp_for(user_twoflower).form == valid_json_rsvp
+    rsvp = project_expo2010.rsvp_for(user_twoflower)
+    assert rsvp is not None
+    assert rsvp.form == valid_json_rsvp
 
 
 def test_invalid_json_register(
-    client, login, user_twoflower: models.User, project_expo2010: models.Project
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_twoflower: models.User,
+    project_expo2010: models.Project,
 ) -> None:
     """If a registration form is not JSON, it is rejected."""
     login.as_(user_twoflower)
diff --git a/tests/unit/views/search_test.py b/tests/unit/views/search_test.py
index 3e012acce..dd77979cd 100644
--- a/tests/unit/views/search_test.py
+++ b/tests/unit/views/search_test.py
@@ -7,12 +7,13 @@
 """
 # pylint: disable=redefined-outer-name
 
+from types import SimpleNamespace
 from typing import cast
 
 import pytest
-from flask import url_for
+from flask import Flask, url_for
 
-from funnel.models import Query
+from funnel import models
 from funnel.views.search import (
     SearchInAccountProvider,
     SearchInProjectProvider,
@@ -21,6 +22,8 @@
     search_providers,
 )
 
+from ...conftest import TestClient, scoped_session
+
 search_all_types = list(search_providers.keys())
 search_profile_types = [
     k for k, v in search_providers.items() if isinstance(v, SearchInAccountProvider)
@@ -31,7 +34,7 @@
 
 
 @pytest.fixture()
-def db_session(db_session_truncate):
+def db_session(db_session_truncate: scoped_session) -> scoped_session:
     """
     Use the database session truncate fixture.
 
@@ -45,13 +48,17 @@ def db_session(db_session_truncate):
 
 
 @pytest.mark.parametrize('stype', search_all_types)
-def test_search_all_count_returns_int(stype, all_fixtures) -> None:
+def test_search_all_count_returns_int(
+    stype: str, all_fixtures: SimpleNamespace
+) -> None:
     """Assert that all_count() returns an int."""
     assert isinstance(search_providers[stype].all_count(get_tsquery("test")), int)
 
 
 @pytest.mark.parametrize('stype', search_profile_types)
-def test_search_profile_count_returns_int(stype, org_ankhmorpork, all_fixtures) -> None:
+def test_search_profile_count_returns_int(
+    stype: str, org_ankhmorpork: models.Organization, all_fixtures: SimpleNamespace
+) -> None:
     """Assert that profile_count() returns an int."""
     assert isinstance(
         cast(SearchInAccountProvider, search_providers[stype]).account_count(
@@ -63,7 +70,7 @@ def test_search_profile_count_returns_int(stype, org_ankhmorpork, all_fixtures)
 
 @pytest.mark.parametrize('stype', search_project_types)
 def test_search_project_count_returns_int(
-    stype, project_expo2010, all_fixtures
+    stype: str, project_expo2010: models.Project, all_fixtures: SimpleNamespace
 ) -> None:
     """Assert that project_count() returns an int."""
     assert isinstance(
@@ -75,30 +82,36 @@ def test_search_project_count_returns_int(
 
 
 @pytest.mark.parametrize('stype', search_all_types)
-def test_search_all_returns_query(stype, all_fixtures) -> None:
+def test_search_all_returns_query(stype: str, all_fixtures: SimpleNamespace) -> None:
     """Assert that all_query() returns a query."""
-    assert isinstance(search_providers[stype].all_query(get_tsquery("test")), Query)
+    assert isinstance(
+        search_providers[stype].all_query(get_tsquery("test")), models.Query
+    )
 
 
 @pytest.mark.parametrize('stype', search_profile_types)
-def test_search_profile_returns_query(stype, org_ankhmorpork, all_fixtures) -> None:
+def test_search_profile_returns_query(
+    stype: str, org_ankhmorpork: models.Organization, all_fixtures: SimpleNamespace
+) -> None:
     """Assert that profile_query() returns a query."""
     assert isinstance(
         cast(SearchInAccountProvider, search_providers[stype]).account_query(
             get_tsquery("test"), org_ankhmorpork
         ),
-        Query,
+        models.Query,
     )
 
 
 @pytest.mark.parametrize('stype', search_project_types)
-def test_search_project_returns_query(stype, project_expo2010, all_fixtures) -> None:
+def test_search_project_returns_query(
+    stype: str, project_expo2010: models.Project, all_fixtures: SimpleNamespace
+) -> None:
     """Assert that project_query() returns an int."""
     assert isinstance(
         cast(SearchInProjectProvider, search_providers[stype]).project_query(
             get_tsquery("test"), project_expo2010
         ),
-        Query,
+        models.Query,
     )
 
 
@@ -106,7 +119,9 @@ def test_search_project_returns_query(stype, project_expo2010, all_fixtures) ->
 
 
 @pytest.mark.usefixtures('request_context', 'all_fixtures')
-def test_search_counts(org_ankhmorpork, project_expo2010) -> None:
+def test_search_counts(
+    org_ankhmorpork: models.Organization, project_expo2010: models.Project
+) -> None:
     """Test that search_counts returns a list of dicts."""
     r1 = search_counts(get_tsquery("test"))
     r2 = search_counts(get_tsquery("test"), account=org_ankhmorpork)
@@ -124,7 +139,12 @@ def test_search_counts(org_ankhmorpork, project_expo2010) -> None:
 
 
 @pytest.mark.usefixtures('app_context', 'all_fixtures')
-def test_view_search_counts(app, client, org_ankhmorpork, project_expo2010) -> None:
+def test_view_search_counts(
+    app: Flask,
+    client: TestClient,
+    org_ankhmorpork: models.Organization,
+    project_expo2010: models.Project,
+) -> None:
     """Search views return counts as a list of dicts."""
     org_ankhmorpork.make_profile_public()
     r1 = client.get(
@@ -154,7 +174,7 @@ def test_view_search_counts(app, client, org_ankhmorpork, project_expo2010) -> N
 
 @pytest.mark.usefixtures('app_context', 'all_fixtures')
 @pytest.mark.parametrize('stype', search_all_types)
-def test_view_search_results_all(client, stype) -> None:
+def test_view_search_results_all(client: TestClient, stype: str) -> None:
     """Global search view returns results for each type."""
     resultset = client.get(
         url_for('search'),
@@ -172,7 +192,9 @@ def test_view_search_results_all(client, stype) -> None:
 
 @pytest.mark.usefixtures('app_context', 'all_fixtures')
 @pytest.mark.parametrize('stype', search_profile_types)
-def test_view_search_results_profile(client, org_ankhmorpork, stype) -> None:
+def test_view_search_results_profile(
+    client: TestClient, org_ankhmorpork: models.Organization, stype: str
+) -> None:
     """Account search view returns results for each type."""
     org_ankhmorpork.make_profile_public()
     resultset = client.get(
@@ -191,7 +213,9 @@ def test_view_search_results_profile(client, org_ankhmorpork, stype) -> None:
 
 @pytest.mark.usefixtures('app_context', 'all_fixtures')
 @pytest.mark.parametrize('stype', search_project_types)
-def test_view_search_results_project(client, project_expo2010, stype) -> None:
+def test_view_search_results_project(
+    client: TestClient, project_expo2010: models.Project, stype: str
+) -> None:
     """Project search view returns results for each type."""
     resultset = client.get(
         project_expo2010.url_for('search'),
diff --git a/tests/unit/views/session_temp_vars_test.py b/tests/unit/views/session_temp_vars_test.py
index 2ceed93ea..28ff3dee3 100644
--- a/tests/unit/views/session_temp_vars_test.py
+++ b/tests/unit/views/session_temp_vars_test.py
@@ -2,6 +2,7 @@
 # pylint: disable=redefined-outer-name
 
 import time
+from collections.abc import Generator
 from datetime import timedelta
 
 import pytest
@@ -10,6 +11,8 @@
 
 from funnel.views.helpers import SessionTimeouts, session_timeouts
 
+from ...conftest import TestClient
+
 test_timeout_seconds = 1
 
 
@@ -47,12 +50,12 @@ def test_session_intersection() -> None:
     fake_session_intersection = {'test': 'value', 'other': 'other_value'}
     fake_session_disjoint = {'other': 'other_value', 'yet_other': 'yet_other_value'}
 
-    assert st.has_intersection(fake_session_intersection)
-    assert not st.has_intersection(fake_session_disjoint)
+    assert st.has_overlap_with(fake_session_intersection)
+    assert not st.has_overlap_with(fake_session_disjoint)
 
 
 @pytest.fixture()
-def _timeout_var():
+def _timeout_var() -> Generator[None, None, None]:
     session_timeouts['test_timeout'] = timedelta(seconds=test_timeout_seconds)
     yield
     session_timeouts.pop('test_timeout')
@@ -60,7 +63,7 @@ def _timeout_var():
 
 @pytest.mark.flaky(reruns=1)  # Rerun in case assert with timedelta fails
 @pytest.mark.usefixtures('_timeout_var')
-def test_session_temp_vars(client) -> None:
+def test_session_temp_vars(client: TestClient) -> None:
     with client.session_transaction() as session:
         assert 'test_timeout' not in session
         assert 'test_timeout_at' not in session
@@ -71,7 +74,7 @@ def test_session_temp_vars(client) -> None:
         session['test_notimeout'] = 'test2'
 
     # Hit a lightweight endpoint to trigger the temp var timeout scanner
-    client.get('/api/baseframe/1/csrf/refresh').get_data(as_text=True)
+    _ = client.get('/api/baseframe/1/csrf/refresh').text
 
     with client.session_transaction() as session:
         assert 'test_timeout' in session
@@ -87,7 +90,7 @@ def test_session_temp_vars(client) -> None:
     time.sleep(test_timeout_seconds)
 
     # Hit a lightweight endpoint to trigger the temp var timeout scanner again
-    client.get('/api/baseframe/1/csrf/refresh').get_data(as_text=True)
+    _ = client.get('/api/baseframe/1/csrf/refresh').text
 
     # The temp var should be removed now, while the other var remains
     with client.session_transaction() as session:
diff --git a/tests/unit/views/shortlink_test.py b/tests/unit/views/shortlink_test.py
index 182ff14ac..77ffb8869 100644
--- a/tests/unit/views/shortlink_test.py
+++ b/tests/unit/views/shortlink_test.py
@@ -1,33 +1,41 @@
 """Test shortlink views."""
 # pylint: disable=redefined-outer-name
 
+from collections.abc import Generator
 from urllib.parse import urlsplit
 
 import pytest
+from flask.testing import FlaskClient
 
 from funnel import models
 
+from ...conftest import Flask, scoped_session
+
 
 @pytest.fixture()
-def shortlink_client(db_session, shortlinkapp):
+def shortlink_client(
+    db_session: scoped_session, shortlinkapp: Flask
+) -> Generator[FlaskClient, None, None]:
     """Provide a test client for shortlinkapp."""
     with shortlinkapp.test_client() as test_client:
         yield test_client
 
 
-def test_shortlink_index(shortlink_client) -> None:
+def test_shortlink_index(shortlink_client: FlaskClient) -> None:
     rv = shortlink_client.get('/')
     assert rv.status_code == 301
     assert urlsplit(rv.location).path == '/'
 
 
-def test_shortlink_404(shortlink_client) -> None:
+def test_shortlink_404(shortlink_client: FlaskClient) -> None:
     rv = shortlink_client.get('/example')
     assert rv.status_code == 404
 
 
 @pytest.mark.dbcommit()
-def test_shortlink_301(db_session, shortlink_client) -> None:
+def test_shortlink_301(
+    db_session: scoped_session, shortlink_client: FlaskClient
+) -> None:
     db_session.add(models.Shortlink.new('https://example.com/', name='example'))
     db_session.commit()
     rv = shortlink_client.get('/example')
@@ -38,7 +46,9 @@ def test_shortlink_301(db_session, shortlink_client) -> None:
 
 
 @pytest.mark.dbcommit()
-def test_shortlink_410(db_session, shortlink_client) -> None:
+def test_shortlink_410(
+    db_session: scoped_session, shortlink_client: FlaskClient
+) -> None:
     sl = models.Shortlink.new('https://example.com/', name='example')
     sl.enabled = False
     db_session.add(sl)
diff --git a/tests/unit/views/siteadmin_test.py b/tests/unit/views/siteadmin_test.py
index 35675f3d0..12bb1a2dd 100644
--- a/tests/unit/views/siteadmin_test.py
+++ b/tests/unit/views/siteadmin_test.py
@@ -3,20 +3,24 @@
 
 from __future__ import annotations
 
+import types
+
 import pytest
 
 from funnel import models
 
+from ...conftest import Flask, LoginFixtureProtocol, TestClient, scoped_session
+
 
 @pytest.fixture()
-def rq_dashboard():
+def rq_dashboard() -> types.ModuleType:
     """Run tests for rq_dashboard only if it is installed."""
     return pytest.importorskip('rq_dashboard')
 
 
 @pytest.fixture()
 def user_vetinari_sysadmin(
-    db_session, user_vetinari: models.User
+    db_session: scoped_session, user_vetinari: models.User
 ) -> models.SiteMembership:
     if user_vetinari.active_site_membership:
         site_membership = user_vetinari.active_site_membership.replace(
@@ -32,7 +36,10 @@ def user_vetinari_sysadmin(
 
 @pytest.mark.usefixtures('rq_dashboard')
 def test_cant_access_rq_dashboard(
-    app, client, login, user_rincewind: models.User
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_rincewind: models.User,
 ) -> None:
     """User who is not a sysadmin cannot access RQ dashboard."""
     login.as_(user_rincewind)
@@ -42,7 +49,10 @@ def test_cant_access_rq_dashboard(
 
 @pytest.mark.usefixtures('rq_dashboard', 'user_vetinari_sysadmin')
 def test_can_access_rq_dashboard(
-    app, client, login, user_vetinari: models.User
+    app: Flask,
+    client: TestClient,
+    login: LoginFixtureProtocol,
+    user_vetinari: models.User,
 ) -> None:
     """User who is a sysadmin can access RQ dashboard."""
     login.as_(user_vetinari)
diff --git a/tests/unit/views/sitemap_test.py b/tests/unit/views/sitemap_test.py
index 8795d671b..61ca2d6cc 100644
--- a/tests/unit/views/sitemap_test.py
+++ b/tests/unit/views/sitemap_test.py
@@ -11,6 +11,8 @@
 
 from funnel.views import sitemap
 
+from ...conftest import TestClient
+
 
 def test_string_changefreq() -> None:
     """The ChangeFreq enum can be cast to and compared with str."""
@@ -209,7 +211,7 @@ def test_changefreq_for_age() -> None:
 
 
 @pytest.mark.dbcommit()
-def test_sitemap(client) -> None:
+def test_sitemap(client: TestClient) -> None:
     """Test sitemap endpoints (caveat: no content checks)."""
     expected_content_type = 'application/xml; charset=utf-8'
 
diff --git a/tests/unit/views/video_test.py b/tests/unit/views/video_test.py
index affe38da0..21f2905f1 100644
--- a/tests/unit/views/video_test.py
+++ b/tests/unit/views/video_test.py
@@ -6,9 +6,12 @@
 import pytest
 import requests
 from pytz import utc
+from requests_mock import Mocker
 
 from funnel import models
 
+from ...conftest import scoped_session
+
 
 def test_parse_video_url() -> None:
     assert models.parse_video_url('https://www.youtube.com/watch?v=dQw4w9WgXcQ') == (
@@ -27,7 +30,9 @@ def test_parse_video_url() -> None:
     ) == ('googledrive', '1rwHdWYnF4asdhsnDwLECoqZQy4o')
 
 
-def test_youtube_video_delete(db_session, new_proposal) -> None:
+def test_youtube_video_delete(
+    db_session: scoped_session, new_proposal: models.Proposal
+) -> None:
     assert new_proposal.title == "Test Proposal"
 
     new_proposal.video_url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'
@@ -46,7 +51,7 @@ def test_youtube_video_delete(db_session, new_proposal) -> None:
 @pytest.mark.enable_socket()
 @pytest.mark.requires_config('app', 'youtube')
 @pytest.mark.usefixtures('app_context')
-def test_youtube(db_session, new_proposal) -> None:
+def test_youtube(db_session: scoped_session, new_proposal: models.Proposal) -> None:
     assert new_proposal.title == "Test Proposal"
 
     new_proposal.video_url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'
@@ -72,7 +77,9 @@ def test_youtube(db_session, new_proposal) -> None:
     )
 
 
-def test_vimeo_video_delete(db_session, new_proposal) -> None:
+def test_vimeo_video_delete(
+    db_session: scoped_session, new_proposal: models.Proposal
+) -> None:
     assert new_proposal.title == "Test Proposal"
 
     new_proposal.video_url = 'https://vimeo.com/336892869'
@@ -91,7 +98,7 @@ def test_vimeo_video_delete(db_session, new_proposal) -> None:
 @pytest.mark.enable_socket()
 @pytest.mark.requires_config('app', 'vimeo')
 @pytest.mark.usefixtures('app_context')
-def test_vimeo(db_session, new_proposal) -> None:
+def test_vimeo(db_session: scoped_session, new_proposal: models.Proposal) -> None:
     assert new_proposal.title == "Test Proposal"
 
     new_proposal.video_url = 'https://vimeo.com/336892869'
@@ -116,7 +123,11 @@ def test_vimeo(db_session, new_proposal) -> None:
 
 @pytest.mark.requires_config('app', 'vimeo')
 @pytest.mark.usefixtures('app_context')
-def test_vimeo_request_exception(caplog, requests_mock, new_proposal) -> None:
+def test_vimeo_request_exception(
+    caplog: pytest.LogCaptureFixture,
+    requests_mock: Mocker,
+    new_proposal: models.Proposal,
+) -> None:
     caplog.set_level(logging.WARNING)
     requests_mock.get(
         'https://api.vimeo.com/videos/336892869',
@@ -129,7 +140,11 @@ def test_vimeo_request_exception(caplog, requests_mock, new_proposal) -> None:
 
 @pytest.mark.usefixtures('app_context')
 @pytest.mark.mock_config('app', {'YOUTUBE_API_KEY': ''})
-def test_youtube_request_exception(caplog, requests_mock, new_proposal) -> None:
+def test_youtube_request_exception(
+    caplog: pytest.LogCaptureFixture,
+    requests_mock: Mocker,
+    new_proposal: models.Proposal,
+) -> None:
     caplog.set_level(logging.WARNING)
     requests_mock.get(
         'https://www.googleapis.com/youtube/v3/videos',

From 9d98ebc8520b540de31b1937ffd04d1e126f3eee Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 05:23:52 +0000
Subject: [PATCH 10/14] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/assets/js/schedule_view.js             |   5 +-
 playwright.config.js                          |   2 -
 tests/cypress/e2e/06_manageVenue.cy.js        |   4 +-
 tests/cypress/e2e/23_addSponsor.cy.js         |   4 +-
 .../e2e/eventsetup-tests/3_checkin.cy.js      |   8 +-
 tests/cypress/fixtures/user.json              |  10 +-
 tests/playwright/fixtures/project.json        |  17 +--
 tests/playwright/globalSetup.js               |   4 +-
 tests/playwright/page/create-project.js       |  49 ++++---
 tests/playwright/page/login.js                |   9 +-
 tests/playwright/page/profile-crew-form.js    |  45 +++---
 tests/playwright/page/project-crew-form.js    |  38 ++++--
 tests/playwright/tests/add-livestream.spec.js |  29 ++--
 .../tests/add-sponsor-project.spec.js         |  45 ++++--
 tests/playwright/tests/add-submission.spec.js |  59 ++++++--
 .../tests/add-venue-project.spec.js           |  39 ++++--
 tests/playwright/tests/create-profile.spec.js |  19 ++-
 tests/playwright/tests/create-project.spec.js |  13 +-
 tests/playwright/tests/open-cfp.spec.js       | 116 ++++++++++++----
 tests/playwright/tests/post-update.spec.js    |  34 ++++-
 tests/playwright/tests/rsvp-checkin.spec.js   |  32 +++--
 tests/test_fixture_initdb.py                  | 128 ++++++++++--------
 22 files changed, 468 insertions(+), 241 deletions(-)

diff --git a/funnel/assets/js/schedule_view.js b/funnel/assets/js/schedule_view.js
index 63875eecd..538b82d94 100644
--- a/funnel/assets/js/schedule_view.js
+++ b/funnel/assets/js/schedule_view.js
@@ -276,9 +276,8 @@ const Schedule = {
         this.config.slotInterval
       );
       if (this.config.schedule[session.eventDay]) {
-        this.config.schedule[session.eventDay].sessions[
-          session.startTime
-        ].showLabel = true;
+        this.config.schedule[session.eventDay].sessions[session.startTime].showLabel =
+          true;
         this.config.schedule[session.eventDay].sessions[session.startTime].rooms[
           session.room_scoped_name
         ].talk = session;
diff --git a/playwright.config.js b/playwright.config.js
index b94595c91..74959df0e 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -40,6 +40,4 @@ module.exports = defineConfig({
       use: { ...devices['Desktop Chrome'] },
     },
   ],
-
 });
-
diff --git a/tests/cypress/e2e/06_manageVenue.cy.js b/tests/cypress/e2e/06_manageVenue.cy.js
index fce2377e8..2b6c71751 100644
--- a/tests/cypress/e2e/06_manageVenue.cy.js
+++ b/tests/cypress/e2e/06_manageVenue.cy.js
@@ -36,7 +36,9 @@ describe('Manage project venue', () => {
 
       cy.get(`[data-testid="${venues[1].venue_title}"]`).click();
       cy.get('[data-testid="set-primary-venue"]').click();
-      cy.get(`[data-testid="${venues[1].venue_title}"]`).find('em').contains('(primary)');
+      cy.get(`[data-testid="${venues[1].venue_title}"]`)
+        .find('em')
+        .contains('(primary)');
 
       venues.forEach((venue) => {
         cy.get(`.card[data-testid="${venue.venue_title}-rooms"]`)
diff --git a/tests/cypress/e2e/23_addSponsor.cy.js b/tests/cypress/e2e/23_addSponsor.cy.js
index 574f468b7..cc59418fb 100644
--- a/tests/cypress/e2e/23_addSponsor.cy.js
+++ b/tests/cypress/e2e/23_addSponsor.cy.js
@@ -38,7 +38,9 @@ describe('Add sponsor to project', () => {
     cy.get('#is_promoted').click();
     cy.get('button[data-testid="form-submit-btn"]').click();
     cy.wait(2000);
-    cy.get('[data-testid="sponsor-card"]').find('[data-testid="promoted"]').should('exist');
+    cy.get('[data-testid="sponsor-card"]')
+      .find('[data-testid="promoted"]')
+      .should('exist');
 
     cy.get('a[data-testid="remove-sponsor"]:visible').click();
     cy.wait('@remove-sponsor-form');
diff --git a/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js b/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
index d2f0dd758..0241be72a 100644
--- a/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
+++ b/tests/cypress/e2e/eventsetup-tests/3_checkin.cy.js
@@ -35,8 +35,12 @@ describe('Checkin of attendees', () => {
     });
 
     cy.get(`a[data-testid="${ticketEvents[0].title}"]`).click();
-    cy.get('td[data-testid="ticket-participant"]').contains(ticketParticipants[0].fullname);
-    cy.get('td[data-testid="ticket-participant"]').contains(ticketParticipants[1].fullname);
+    cy.get('td[data-testid="ticket-participant"]').contains(
+      ticketParticipants[0].fullname
+    );
+    cy.get('td[data-testid="ticket-participant"]').contains(
+      ticketParticipants[1].fullname
+    );
     cy.checkin(user.username);
     cy.get('a[data-testid="back-to-setup"]').click();
 
diff --git a/tests/cypress/fixtures/user.json b/tests/cypress/fixtures/user.json
index 8dd66d909..1e63c3a4c 100644
--- a/tests/cypress/fixtures/user.json
+++ b/tests/cypress/fixtures/user.json
@@ -3,31 +3,31 @@
     "username": "profile_cypress",
     "fullname": "profile-cypress",
     "password": "profile-cypress123_St",
-    "owns_profile": "fifthelephant",
+    "owns_profile": "fifthelephant"
   },
   "admin": {
     "username": "admin_user",
     "fullname": "admin-user",
     "password": "admin-user129_Ftz",
-    "owns_profile": "rootconf",
+    "owns_profile": "rootconf"
   },
   "editor": {
     "username": "editor_cypress",
     "fullname": "editor-cypress",
     "password": "editor-cypress9_GH",
-    "owns_profile": "jsfoo",
+    "owns_profile": "jsfoo"
   },
   "promoter": {
     "username": "promoter_user",
     "fullname": "promoter-user",
     "password": "promoter-user34_qQE",
-    "owns_profile": "metarefresh",
+    "owns_profile": "metarefresh"
   },
   "usher": {
     "username": "usher_cypress",
     "fullname": "usher-cypress",
     "password": "usher-cypress566_YUt",
-    "owns_profile": "kilter",
+    "owns_profile": "kilter"
   },
   "user": {
     "username": "member_user",
diff --git a/tests/playwright/fixtures/project.json b/tests/playwright/fixtures/project.json
index 73d968cea..b0b7dfb7f 100644
--- a/tests/playwright/fixtures/project.json
+++ b/tests/playwright/fixtures/project.json
@@ -22,27 +22,18 @@
       "room": "Zoom"
     },
     {
-    "title": "Hasgeek House",
-    "room": "Second floor room"
+      "title": "Hasgeek House",
+      "room": "Second floor room"
     }
   ],
   "labels": [
     {
       "title": "Tracks",
-      "sublabels": [
-        "AI Engineering",
-        "Data Science",
-        "Devops"
-      ]
+      "sublabels": ["AI Engineering", "Data Science", "Devops"]
     },
     {
       "title": "Type",
-      "sublabels": [
-        "Full talk",
-        "BOF/Panel discussion",
-        "Lighting talk",
-        "Demo"
-      ]
+      "sublabels": ["Full talk", "BOF/Panel discussion", "Lighting talk", "Demo"]
     },
     {
       "title": "Status",
diff --git a/tests/playwright/globalSetup.js b/tests/playwright/globalSetup.js
index 3b7ec124a..c1629c3c2 100644
--- a/tests/playwright/globalSetup.js
+++ b/tests/playwright/globalSetup.js
@@ -1,11 +1,11 @@
 //globalSetup.js
-const { FullConfig } = require("@playwright/test");
+const { FullConfig } = require('@playwright/test');
 const dotenv = require('dotenv');
 
 async function globalSetup(config) {
   dotenv.config({
     path: '.env.testing',
-    override: true
+    override: true,
   });
 }
 
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
index ec187dfdb..9388e9a17 100644
--- a/tests/playwright/page/create-project.js
+++ b/tests/playwright/page/create-project.js
@@ -14,7 +14,9 @@ export class ProjectPage {
     await this.page.locator('input#title').fill(projectName);
     await this.page.locator('input#location').type(project.location);
     await this.page.locator('input#tagline').type(project.tagline);
-    await this.page.locator('#field-description .cm-editor .cm-line').fill(project.description);
+    await this.page
+      .locator('#field-description .cm-editor .cm-line')
+      .fill(project.description);
     await this.page.getByTestId('form-submit-btn').click();
   }
 
@@ -34,9 +36,13 @@ export class ProjectPage {
       await this.page.getByTestId('add-labels').click();
       await this.page.locator('input#title').fill(label.title);
       if (label.sublabels) {
-        for (let i=0; i<label.sublabels.length; i++) {
+        for (let i = 0; i < label.sublabels.length; i++) {
           await this.page.locator('#add-sublabel-form').click();
-          await this.page.locator('#child-form > .ui-draggable-box').locator(`nth=${i}`).locator('input#title').type(label.sublabels[i]);
+          await this.page
+            .locator('#child-form > .ui-draggable-box')
+            .locator(`nth=${i}`)
+            .locator('input#title')
+            .type(label.sublabels[i]);
         }
       }
       if (label.adminLabel) {
@@ -44,49 +50,57 @@ export class ProjectPage {
       }
       await this.page.getByTestId('save-label').click();
     }
-    await this.page.getByTestId("project-page").click();
+    await this.page.getByTestId('project-page').click();
   }
 
   async addVenue() {
-    await this.page.getByTestId('project-menu').locator("visible=true").click();
-    await this.page.getByTestId('settings').locator("visible=true").waitFor();
-    await this.page.getByTestId('settings').locator("visible=true").click();
+    await this.page.getByTestId('project-menu').locator('visible=true').click();
+    await this.page.getByTestId('settings').locator('visible=true').waitFor();
+    await this.page.getByTestId('settings').locator('visible=true').click();
     await this.page.getByTestId('manage-venues').click();
     for (let venue of project.venues) {
       await this.page.getByTestId('new-venue').click();
       await this.page.locator('input#title').fill(venue.title);
       await this.page.locator('#field-description .cm-editor .cm-line').waitFor(2000);
-      await this.page.locator('#field-description .cm-editor .cm-line').fill(venue.title);
+      await this.page
+        .locator('#field-description .cm-editor .cm-line')
+        .fill(venue.title);
       await this.page.getByTestId('form-submit-btn').click();
-      await this.page.locator(`.card[data-testid="${venue.title}-rooms"] a[data-testid="add-room"]`)
-      .click();
+      await this.page
+        .locator(`.card[data-testid="${venue.title}-rooms"] a[data-testid="add-room"]`)
+        .click();
       await this.page.locator('input#title').fill(venue.room);
       await this.page.locator('#field-description .cm-editor .cm-line').waitFor(2000);
-      await this.page.locator('#field-description .cm-editor .cm-line').fill(venue.room);
+      await this.page
+        .locator('#field-description .cm-editor .cm-line')
+        .fill(venue.room);
       await this.page.getByTestId('form-submit-btn').click();
       await this.page.getByTestId(venue.room).isVisible();
     }
-    await this.page.getByTestId("project-page").click();
+    await this.page.getByTestId('project-page').click();
   }
 
   async openCFP() {
     await this.page.getByTestId('submissions').click();
     await this.page.getByTestId('add-cfp').click();
-    await this.page.locator('#field-instructions .cm-editor .cm-line').fill(project.cfp_instructions);
+    await this.page
+      .locator('#field-instructions .cm-editor .cm-line')
+      .fill(project.cfp_instructions);
     await this.page.getByTestId('add-cfp').click();
-    await this.page.locator('label.switch-label').locator("visible=true").click();
+    await this.page.locator('label.switch-label').locator('visible=true').click();
   }
 
-  async addProject(owner, crew=[]) {
+  async addProject(owner, crew = []) {
     let randomProjectName = Math.random().toString(36).substring(2, 7);
-    let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+    let projectNameCapitalize =
+      randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
     let loginPage;
     loginPage = new LoginPage(this.page);
     await loginPage.login(`/${owner.owns_profile}`, owner.username, owner.password);
     await this.createNewProject(projectNameCapitalize);
     let crewForm = new ProjectCrewFormPage(this.page);
     await this.page.getByTestId('crew').click();
-    for(let member of crew) {
+    for (let member of crew) {
       await crewForm.addMember(member.username, member.role);
     }
     await this.publishProject();
@@ -94,5 +108,4 @@ export class ProjectPage {
     await loginPage.logout();
     return randomProjectName;
   }
-
 }
diff --git a/tests/playwright/page/login.js b/tests/playwright/page/login.js
index 7d7ab249a..b111ce0b5 100644
--- a/tests/playwright/page/login.js
+++ b/tests/playwright/page/login.js
@@ -1,5 +1,4 @@
 export class LoginPage {
-
   constructor(page) {
     this.page = page;
     this.loginBtn = this.page.getByTestId('login');
@@ -18,8 +17,11 @@ export class LoginPage {
     await this.passwordBtn.click();
     await this.passwordInputBox.fill(password);
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/login") && response.status() === 200, {timeout: 60000}),
-      this.submitBtn.click()
+      this.page.waitForResponse(
+        (response) => response.url().includes('/login') && response.status() === 200,
+        { timeout: 60000 }
+      ),
+      this.submitBtn.click(),
     ]);
   }
 
@@ -28,5 +30,4 @@ export class LoginPage {
     await this.loginOutBtn.waitFor();
     await this.loginOutBtn.click();
   }
-
 }
diff --git a/tests/playwright/page/profile-crew-form.js b/tests/playwright/page/profile-crew-form.js
index ed164206c..54858c7e0 100644
--- a/tests/playwright/page/profile-crew-form.js
+++ b/tests/playwright/page/profile-crew-form.js
@@ -1,53 +1,64 @@
 import { test, expect } from '@playwright/test';
 
 export class ProfileCrewFormPage {
-
   constructor(page) {
     this.page = page;
   }
 
-  async addMember(username, owner=true, success=true) {
+  async addMember(username, owner = true, success = true) {
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
-      this.page.getByTestId('add-member').click()
+      this.page.waitForResponse(
+        (response) => response.url().includes('/new') && response.status() === 200,
+        { timeout: 60000 }
+      ),
+      this.page.getByTestId('add-member').click(),
     ]);
-    await this.page.locator('.select2-selection__arrow').waitFor()
+    await this.page.locator('.select2-selection__arrow').waitFor();
     await this.page.locator('.select2-selection__arrow').click();
     await this.page.locator('.select2-search__field').waitFor();
     await this.page.locator('.select2-search__field').fill(username);
     await this.page.locator('.select2-results__option').waitFor();
     await this.page.locator('.select2-results__option').click();
-    if(owner) {
+    if (owner) {
       await this.page.locator('div#field-is_owner input[value="True"]').click();
-    }
-    else {
+    } else {
       await this.page.locator('div#field-is_owner input[value="False"]').click();
     }
     await Promise.all([
-      this.page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
-      this.page.getByTestId('form-submit-btn').getByText('Add member').click()
+      this.page.waitForRequest((request) => request.url().includes('/new'), {
+        timeout: 60000,
+      }),
+      this.page.getByTestId('form-submit-btn').getByText('Add member').click(),
     ]);
-    if(success) {
-      await this.page.locator('data-test-id="member":has-text("' + username + '")').isVisible();
-      await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+    if (success) {
+      await this.page
+        .locator('data-test-id="member":has-text("' + username + '")')
+        .isVisible();
+      await expect(this.page.locator('.toast-message')).toHaveCount(0, {
+        timeout: 7000,
+      });
     } else {
       await this.page.locator('p.mui--text-danger').isVisible();
       await this.page.locator('a.modal__close').locator('visible=true').click();
     }
-
   }
 
   async deleteMember(username) {
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
+      this.page.waitForResponse(
+        (response) => response.url().includes('/edit') && response.status() === 200,
+        { timeout: 60000 }
+      ),
       this.page.getByTestId('member').getByText(username).click(),
     ]);
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/delete") && response.status() === 200, {timeout: 60000}),
+      this.page.waitForResponse(
+        (response) => response.url().includes('/delete') && response.status() === 200,
+        { timeout: 60000 }
+      ),
       this.page.getByTestId('revoke-btn').click(),
     ]);
     await this.page.getByTestId('form-submit-btn').waitFor(3000);
     await this.page.getByTestId('form-submit-btn').click();
   }
-
 }
diff --git a/tests/playwright/page/project-crew-form.js b/tests/playwright/page/project-crew-form.js
index 1396ce597..a6b08d9c8 100644
--- a/tests/playwright/page/project-crew-form.js
+++ b/tests/playwright/page/project-crew-form.js
@@ -1,17 +1,18 @@
 import { test, expect } from '@playwright/test';
 
 export class ProjectCrewFormPage {
-
   constructor(page) {
     this.page = page;
   }
 
-
-  async addMember(username, role, success=true) {
+  async addMember(username, role, success = true) {
     let label = `div#field-is_${role} label`;
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
-      this.page.getByTestId('add-member').click()
+      this.page.waitForResponse(
+        (response) => response.url().includes('/new') && response.status() === 200,
+        { timeout: 60000 }
+      ),
+      this.page.getByTestId('add-member').click(),
     ]);
     await this.page.locator('.select2-selection__arrow').waitFor();
     await this.page.locator('.select2-selection__arrow').click();
@@ -21,12 +22,18 @@ export class ProjectCrewFormPage {
     await this.page.locator('.select2-results__option').click();
     await this.page.locator(label).click();
     await Promise.all([
-      this.page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
-      this.page.getByTestId('form-submit-btn').getByText('Add member').click()
+      this.page.waitForRequest((request) => request.url().includes('/new'), {
+        timeout: 60000,
+      }),
+      this.page.getByTestId('form-submit-btn').getByText('Add member').click(),
     ]);
-    if(success) {
-      await this.page.locator('data-test-id="member":has-text("' + username + '")').isVisible();
-      await expect(this.page.locator('.toast-message')).toHaveCount(0, {timeout: 7000});
+    if (success) {
+      await this.page
+        .locator('data-test-id="member":has-text("' + username + '")')
+        .isVisible();
+      await expect(this.page.locator('.toast-message')).toHaveCount(0, {
+        timeout: 7000,
+      });
     } else {
       await this.page.locator('p.mui--text-danger').isVisible();
       await this.page.locator('a.modal__close').locator('visible=true').click();
@@ -35,15 +42,20 @@ export class ProjectCrewFormPage {
 
   async deleteMember(username) {
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
+      this.page.waitForResponse(
+        (response) => response.url().includes('/edit') && response.status() === 200,
+        { timeout: 60000 }
+      ),
       this.page.getByTestId('member').getByText(username).click(),
     ]);
     await Promise.all([
-      this.page.waitForResponse(response => response.url().includes("/delete") && response.status() === 200, {timeout: 60000}),
+      this.page.waitForResponse(
+        (response) => response.url().includes('/delete') && response.status() === 200,
+        { timeout: 60000 }
+      ),
       this.page.getByTestId('revoke-btn').click(),
     ]);
     await this.page.getByTestId('form-submit-btn').waitFor(3000);
     await this.page.getByTestId('form-submit-btn').click();
   }
-
 }
diff --git a/tests/playwright/tests/add-livestream.spec.js b/tests/playwright/tests/add-livestream.spec.js
index 9b51242b2..cb56c2330 100644
--- a/tests/playwright/tests/add-livestream.spec.js
+++ b/tests/playwright/tests/add-livestream.spec.js
@@ -6,23 +6,34 @@ const videos = require('../fixtures/embed_video.json');
 
 test('Add livestream and verify embed youtube and vimeo urls', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, admin.username, admin.password);
+  await loginPage.login(
+    `/${admin.owns_profile}/${admin.project}`,
+    admin.username,
+    admin.password
+  );
 
   await page.getByTestId('add-livestream-btn').click();
-  for(let video of videos) {
+  for (let video of videos) {
     await page.locator('#livestream_urls').type(video.url);
     await page.locator('#livestream_urls').press('Enter');
   }
   await page.getByTestId('form-submit-btn').click();
 
-  for(let index=0; index<videos.length; index++) {
-    await page.locator(`#tab-${index+1}`).click();
-    await await page.locator(`#pane-justified-${index+1}`).waitFor(6000);
-    if(videos[index].valid) {
-      await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator(videos[index].video_classname).isVisible();
+  for (let index = 0; index < videos.length; index++) {
+    await page.locator(`#tab-${index + 1}`).click();
+    await await page.locator(`#pane-justified-${index + 1}`).waitFor(6000);
+    if (videos[index].valid) {
+      await page
+        .locator(`#pane-justified-${index + 1}`)
+        .frameLocator('iframe')
+        .locator(videos[index].video_classname)
+        .isVisible();
     } else {
-      await page.locator(`#pane-justified-${index+1}`).frameLocator('iframe').locator(videos[index].video_classname).isHidden();
+      await page
+        .locator(`#pane-justified-${index + 1}`)
+        .frameLocator('iframe')
+        .locator(videos[index].video_classname)
+        .isHidden();
     }
   }
-
 });
diff --git a/tests/playwright/tests/add-sponsor-project.spec.js b/tests/playwright/tests/add-sponsor-project.spec.js
index 567912d73..5ef9a95a3 100644
--- a/tests/playwright/tests/add-sponsor-project.spec.js
+++ b/tests/playwright/tests/add-sponsor-project.spec.js
@@ -5,13 +5,19 @@ const { owner, editor, admin } = require('../fixtures/user.json');
 
 test('Add sponsor to project', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, owner.username, owner.password);
+  await loginPage.login(
+    `/${editor.owns_profile}/${editor.project}`,
+    owner.username,
+    owner.password
+  );
 
   await page.getByTestId('site-editor-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/sponsor"), {timeout: 60000}),
-    await page.getByTestId('add-sponsor').click()
+    page.waitForRequest((request) => request.url().includes('/sponsor'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('add-sponsor').click(),
   ]);
   await page.locator('.select2-selection__arrow').waitFor();
   await page.locator('.select2-selection__arrow').click();
@@ -21,30 +27,43 @@ test('Add sponsor to project', async ({ page }) => {
   await page.locator('.select2-results__option').click();
 
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/sponsor") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('form-submit-btn').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/sponsor') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId('form-submit-btn').click(),
   ]);
   await page.getByTestId('sponsor-link":has-text(`${admin.owns_profile}`)').isVisible();
 
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/edit"), {timeout: 60000}),
-    await page.getByTestId('edit-sponsor').locator('nth=1').click()
+    page.waitForRequest((request) => request.url().includes('/edit'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('edit-sponsor').locator('nth=1').click(),
   ]);
   await page.locator('#is_promoted').click();
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/edit") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('form-submit-btn').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/edit') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId('form-submit-btn').click(),
   ]);
   await page.reload();
   await page.getByTestId('promoted').locator('nth=1').isVisible();
 
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/remove"), {timeout: 60000}),
-    await page.getByTestId('remove-sponsor').locator('nth=1').click()
+    page.waitForRequest((request) => request.url().includes('/remove'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('remove-sponsor').locator('nth=1').click(),
   ]);
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/remove") && response.status() === 200, {timeout: 60000}),
-    page.locator('input[value="Remove"]').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/remove') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.locator('input[value="Remove"]').click(),
   ]);
   await page.reload();
   await expect.soft(page.getByTestId('sponsor-card')).toBeHidden();
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index e68019519..b2f2db563 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -7,14 +7,24 @@ const { usher, owner, admin } = require('../fixtures/user.json');
 const proposal = require('../fixtures/proposal.json');
 let randomProjectName;
 
-test('Submitting a proposal to a project and commenting on proposal', async ({ page }) => {
+test('Submitting a proposal to a project and commenting on proposal', async ({
+  page,
+}) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, usher.username, usher.password);
+  await loginPage.login(
+    `/${usher.owns_profile}/${usher.project}`,
+    usher.username,
+    usher.password
+  );
   let projectPage = new ProjectPage(page);
   await projectPage.addLabels();
   await loginPage.logout();
 
-  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, owner.username, owner.password);
+  await loginPage.login(
+    `/${usher.owns_profile}/${usher.project}`,
+    owner.username,
+    owner.password
+  );
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
   await page.locator('#title').fill(proposal.title);
@@ -39,8 +49,11 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
 
   await page.getByTestId('add-collaborator-modal').click();
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('add-collaborator').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/new') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId('add-collaborator').click(),
   ]);
   await page.locator('.select2-selection__arrow').waitFor();
   await page.locator('.select2-selection__arrow').click();
@@ -50,16 +63,26 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
   await page.locator('.select2-results__option').click();
   await page.locator('#label').fill('Editor');
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
-    page.locator('.modal').locator('button[data-testid="form-submit-btn"]').locator('visible=true').click()
+    page.waitForRequest((request) => request.url().includes('/new'), {
+      timeout: 60000,
+    }),
+    page
+      .locator('.modal')
+      .locator('button[data-testid="form-submit-btn"]')
+      .locator('visible=true')
+      .click(),
   ]);
-  await expect(page.locator('.toast-message')).toHaveCount(0, {timeout: 120000});
+  await expect(page.locator('.toast-message')).toHaveCount(0, { timeout: 120000 });
   await page.locator('a.modal__close').locator('visible=true').waitFor(60000);
   await page.locator('a.modal__close').locator('visible=true').click();
   await page.getByTestId('form-submit-btn').waitFor(120000);
   await page.getByTestId('form-submit-btn').click();
-  await page.locator('.user__box__userid user__box__fullname', { hasText: admin.username }).isVisible();
-  await page.locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' }).isVisible();
+  await page
+    .locator('.user__box__userid user__box__fullname', { hasText: admin.username })
+    .isVisible();
+  await page
+    .locator('.user__box__userid user__box__userid badge', { hasText: 'Editor' })
+    .isVisible();
 
   await page.getByTestId('proposal-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(3000);
@@ -67,12 +90,18 @@ test('Submitting a proposal to a project and commenting on proposal', async ({ p
   await page.getByTestId('edit-proposal-video').isVisible();
 
   await page.getByTestId('post-comment').click();
-  await page.getByTestId('new-form').locator('.cm-editor .cm-line').fill(proposal.proposer_note);
+  await page
+    .getByTestId('new-form')
+    .locator('.cm-editor .cm-line')
+    .fill(proposal.proposer_note);
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
-    page.getByTestId('new-form').getByTestId('submit-comment').click()
+    page.waitForRequest((request) => request.url().includes('/new'), {
+      timeout: 60000,
+    }),
+    page.getByTestId('new-form').getByTestId('submit-comment').click(),
   ]);
-  await expect(page.getByTestId('comment-content')).toContainText(proposal.proposer_note);
+  await expect(page.getByTestId('comment-content')).toContainText(
+    proposal.proposer_note
+  );
   await expect(page.getByTestId('commenter')).toContainText(owner.fullname);
-
 });
diff --git a/tests/playwright/tests/add-venue-project.spec.js b/tests/playwright/tests/add-venue-project.spec.js
index 30af88730..91490ce05 100644
--- a/tests/playwright/tests/add-venue-project.spec.js
+++ b/tests/playwright/tests/add-venue-project.spec.js
@@ -7,18 +7,24 @@ const { editor } = require('../fixtures/user.json');
 test('Add venue to project', async ({ page }) => {
   let loginPage;
   loginPage = new LoginPage(page);
-  await loginPage.login(`/${editor.owns_profile}/${editor.project}`, editor.username, editor.password);
-
-  await page.getByTestId('project-menu').locator("visible=true").click();
-  await page.getByTestId('settings').locator("visible=true").waitFor();
-  await page.getByTestId('settings').locator("visible=true").click();
+  await loginPage.login(
+    `/${editor.owns_profile}/${editor.project}`,
+    editor.username,
+    editor.password
+  );
+
+  await page.getByTestId('project-menu').locator('visible=true').click();
+  await page.getByTestId('settings').locator('visible=true').waitFor();
+  await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('manage-venues').click();
 
   for (let venue of venues) {
     await page.getByTestId('new-venue').click();
     await page.locator('input#title').fill(venue.venue_title);
-    await page.locator('#field-description .cm-editor .cm-line').fill(venue.venue_description);
-    if(venue.venue_address1) {
+    await page
+      .locator('#field-description .cm-editor .cm-line')
+      .fill(venue.venue_description);
+    if (venue.venue_address1) {
       await page.locator('input#address1').fill(venue.venue_address1);
       await page.locator('input#address2').fill(venue.venue_address2);
       await page.locator('input#city').fill(venue.venue_city);
@@ -26,21 +32,26 @@ test('Add venue to project', async ({ page }) => {
       await page.locator('input#postcode').fill(venue.venue_postcode);
     }
     await page.getByTestId('form-submit-btn').click();
-  };
+  }
 
   await page.getByTestId(`${venues[1].venue_title}`).click();
   await page.getByTestId('set-primary-venue').click();
-  await page.locator(`data-testid=${venues[1].venue_title}-rooms em`, { hasText: 'Details' }).isVisible();
+  await page
+    .locator(`data-testid=${venues[1].venue_title}-rooms em`, { hasText: 'Details' })
+    .isVisible();
 
   for (let venue of venues) {
-    await page.locator(`.card[data-testid="${venue.venue_title}-rooms"] a[data-testid="add-room"]`)
+    await page
+      .locator(
+        `.card[data-testid="${venue.venue_title}-rooms"] a[data-testid="add-room"]`
+      )
       .click();
     await page.locator('input#title').fill(venue.room.title);
-    await page.locator('#field-description .cm-editor .cm-line').fill(venue.room.description);
+    await page
+      .locator('#field-description .cm-editor .cm-line')
+      .fill(venue.room.description);
     await page.locator('input#bgcolor').fill(venue.room.bgcolor);
     await page.getByTestId('form-submit-btn').click();
     await page.getByTestId(`${venue.room.title}`).isVisible();
-  };
-
-
+  }
 });
diff --git a/tests/playwright/tests/create-profile.spec.js b/tests/playwright/tests/create-profile.spec.js
index a70eecc10..943120ce5 100644
--- a/tests/playwright/tests/create-profile.spec.js
+++ b/tests/playwright/tests/create-profile.spec.js
@@ -5,8 +5,9 @@ const { ProfileCrewFormPage } = require('../page/profile-crew-form');
 const { owner, admin, promoter, hguser } = require('../fixtures/user.json');
 
 test('To create profile, edit, add crew and update banner', async ({ page }) => {
-  let randomOrgName = Math.random().toString(36).substring(2,7);
-  let orgNameCapitalize = randomOrgName.charAt(0).toUpperCase() + randomOrgName.slice(1);
+  let randomOrgName = Math.random().toString(36).substring(2, 7);
+  let orgNameCapitalize =
+    randomOrgName.charAt(0).toUpperCase() + randomOrgName.slice(1);
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login('/', owner.username, owner.password);
@@ -16,7 +17,9 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await page.locator('input#title').fill(orgNameCapitalize);
   await page.locator('input#name').fill(randomOrgName);
   await page.getByTestId('form-submit-btn').click();
-  await page.locator('#field-description .cm-editor .cm-line').fill('Lorem Ipsum is simply dummy text of the printing and typesetting industry');
+  await page
+    .locator('#field-description .cm-editor .cm-line')
+    .fill('Lorem Ipsum is simply dummy text of the printing and typesetting industry');
   await page.getByTestId('form-submit-btn').click();
   let titleRegex = new RegExp(orgNameCapitalize);
   await expect(page).toHaveTitle(titleRegex);
@@ -27,7 +30,7 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await crewForm.addMember(admin.username, false);
   await crewForm.addMember(promoter.username, true);
   await crewForm.deleteMember(promoter.username);
-  await crewForm.addMember(hguser.username,false, false);
+  await crewForm.addMember(hguser.username, false, false);
 
   // Profile  transition from public to private
   await page.getByTestId('admin-dropdown').click();
@@ -41,7 +44,9 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   // Permissions for profile owner
   await loginPage.login(`/${randomOrgName}`, admin.username, admin.password);
   await page.getByTestId('admin-dropdown').locator('visible=true').click();
-  await expect.soft(page.getByTestId('edit-details').locator('visible=true')).toBeVisible();
+  await expect
+    .soft(page.getByTestId('edit-details').locator('visible=true'))
+    .toBeVisible();
   await page.getByTestId('admins').click();
   await expect.soft(page.getByTestId('add-member')).toBeHidden();
 
@@ -49,7 +54,9 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await page.getByTestId('admin-dropdown').locator('visible=true').click();
   await page.getByTestId('edit-details').locator('visible=true').waitFor(5000);
   await page.getByTestId('edit-details').locator('visible=true').click();
-  await page.locator('#field-description .cm-editor .cm-line').fill('Lorem Ipsum is simply dummy');
+  await page
+    .locator('#field-description .cm-editor .cm-line')
+    .fill('Lorem Ipsum is simply dummy');
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('add-banner').isVisible();
 
diff --git a/tests/playwright/tests/create-project.spec.js b/tests/playwright/tests/create-project.spec.js
index 3e33ac898..40b1368ec 100644
--- a/tests/playwright/tests/create-project.spec.js
+++ b/tests/playwright/tests/create-project.spec.js
@@ -4,11 +4,19 @@ const { LoginPage } = require('../page/login');
 const { ProjectPage } = require('../page/create-project');
 const { ProjectCrewFormPage } = require('../page/project-crew-form');
 const project = require('../fixtures/project.json');
-const { owner, admin, promoter, usher, editor, hguser } = require('../fixtures/user.json');
+const {
+  owner,
+  admin,
+  promoter,
+  usher,
+  editor,
+  hguser,
+} = require('../fixtures/user.json');
 
 test('To create project, edit, publish and add crew', async ({ page }) => {
   let randomProjectName = Math.random().toString(36).substring(2, 7);
-  let projectNameCapitalize = randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
+  let projectNameCapitalize =
+    randomProjectName.charAt(0).toUpperCase() + randomProjectName.slice(1);
   let loginPage;
   loginPage = new LoginPage(page);
   await loginPage.login(`/${admin.owns_profile}`, admin.username, admin.password);
@@ -37,5 +45,4 @@ test('To create project, edit, publish and add crew', async ({ page }) => {
   await crewForm.addMember(editor.username, 'editor');
   await crewForm.addMember(hguser.username, 'usher', false);
   await crewForm.deleteMember(promoter.username);
-
 });
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
index 89cad7a2c..eaf741259 100644
--- a/tests/playwright/tests/open-cfp.spec.js
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -8,10 +8,16 @@ const cfp = require('../fixtures/cfp.json');
 const labels = require('../fixtures/labels.json');
 const dayjs = require('dayjs');
 
-test('Add schedule to a  project (open cfp, add labels, sort labels, add session, publish schedule)', async ({ page }) => {
+test('Add schedule to a  project (open cfp, add labels, sort labels, add session, publish schedule)', async ({
+  page,
+}) => {
   let loginPage = new LoginPage(page);
   let projectPage = new ProjectPage(page);
-  await loginPage.login(`/${promoter.owns_profile}/${promoter.project}`, promoter.username, promoter.password);
+  await loginPage.login(
+    `/${promoter.owns_profile}/${promoter.project}`,
+    promoter.username,
+    promoter.password
+  );
   await page.getByTestId('submissions').click();
   await page.getByTestId('add-cfp').click();
   await page.locator('#field-instructions .cm-editor .cm-line').fill(cfp.instructions);
@@ -23,13 +29,26 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('manage-labels').click();
-  await page.locator('.ui-draggable-box').locator('nth=0').locator('.drag-handle').hover();
+  await page
+    .locator('.ui-draggable-box')
+    .locator('nth=0')
+    .locator('.drag-handle')
+    .hover();
   await page.mouse.down();
-  await page.locator('.ui-draggable-box').locator('nth=1').locator('.drag-box__action').hover();
+  await page
+    .locator('.ui-draggable-box')
+    .locator('nth=1')
+    .locator('.drag-box__action')
+    .hover();
   await page.mouse.up();
   await page.getByTestId('save-label-seq').click();
-  await expect(page.locator('.ui-draggable-box').locator('nth=0').locator('.label-box__inner__heading')).toContainText(project.labels[1].title);
-  await page.getByTestId("project-page").click();
+  await expect(
+    page
+      .locator('.ui-draggable-box')
+      .locator('nth=0')
+      .locator('.label-box__inner__heading')
+  ).toContainText(project.labels[1].title);
+  await page.getByTestId('project-page').click();
 
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
@@ -45,24 +64,36 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   await page.getByTestId('proposal-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
-    await page.getByTestId('editor-panel').locator('visible=true').click()
+    page.waitForRequest((request) => request.url().includes('/admin'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('editor-panel').locator('visible=true').click(),
   ]);
-  await page.getByTestId('proposal-status').locator('button[value="awaiting_details"]').click();
+  await page
+    .getByTestId('proposal-status')
+    .locator('button[value="awaiting_details"]')
+    .click();
 
   await page.getByTestId('proposal-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
-    await page.getByTestId('editor-panel').locator('visible=true').click()
+    page.waitForRequest((request) => request.url().includes('/admin'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('editor-panel').locator('visible=true').click(),
   ]);
-  await page.getByTestId('proposal-status').locator('button[value="under_evaluation"]').click();
+  await page
+    .getByTestId('proposal-status')
+    .locator('button[value="under_evaluation"]')
+    .click();
 
   await page.getByTestId('proposal-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu.mui--is-open').waitFor(6000);
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/admin"), {timeout: 60000}),
-    await page.getByTestId('editor-panel').locator('visible=true').click()
+    page.waitForRequest((request) => request.url().includes('/admin'), {
+      timeout: 60000,
+    }),
+    await page.getByTestId('editor-panel').locator('visible=true').click(),
   ]);
   await page.getByTestId('proposal-status').locator('button[value="confirm"]').click();
 
@@ -72,32 +103,46 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   let tomorrow = dayjs().add(1, 'days').format('YYYY-MM-DD');
   await page.locator('#select-date').fill(tomorrow);
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/new") && response.status() === 200, {timeout: 60000}),
-    page.locator('.fc-slot108 .fc-widget-content').click(5, 5)
+    page.waitForResponse(
+      (response) => response.url().includes('/new') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.locator('.fc-slot108 .fc-widget-content').click(5, 5),
   ]);
   await page.locator('#title').fill(project.session_title);
   await page.locator('select#venue_room_id').click();
-  await page.getByText(`${project.venues[0].title} – ${project.venues[0].room}`).locator('visible=true').click();
+  await page
+    .getByText(`${project.venues[0].title} – ${project.venues[0].room}`)
+    .locator('visible=true')
+    .click();
   await page.locator('#speaker').fill(promoter.username);
   await page.locator('#is_break').click();
   await Promise.all([
-    page.waitForRequest(request => request.url().includes("/new"), {timeout: 60000}),
-    page.locator('#session-save').click()
+    page.waitForRequest((request) => request.url().includes('/new'), {
+      timeout: 60000,
+    }),
+    page.locator('#session-save').click(),
   ]);
 
   const destinationElement = await page.locator('.fc-slot112 .fc-widget-content');
   await page.locator('.js-unscheduled').hover();
   await page.mouse.down();
-  const box = (await destinationElement.boundingBox());
+  const box = await destinationElement.boundingBox();
   await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
   await destinationElement.hover();
   await destinationElement.hover();
   await page.mouse.up();
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000})
+    page.waitForResponse(
+      (response) => response.url().includes('/schedule') && response.status() === 200,
+      { timeout: 60000 }
+    ),
   ]);
   await page.locator('select#venue_room_id').click();
-  await page.getByText(`${project.venues[1].title} – ${project.venues[1].room}`).locator('visible=true').click();
+  await page
+    .getByText(`${project.venues[1].title} – ${project.venues[1].room}`)
+    .locator('visible=true')
+    .click();
   await page.locator('#session-save').click();
 
   await page.getByTestId('settings').click();
@@ -108,8 +153,11 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   await page.getByTestId('project-page').click();
   await page.getByTestId('schedule').click();
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('session-title').locator('nth=1').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/schedule') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId('session-title').locator('nth=1').click(),
   ]);
   await page.getByTestId('edit-session').click();
   await page.locator('input#video_url').fill(project.session_video);
@@ -127,19 +175,27 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   let tomorrowDate = dayjs().add(2, 'days').format('dddd, D MMMM YYYY');
   await expect(page.locator('.schedule__date')).toContainText(tomorrowDate);
   for (let venue of project.venues) {
-    await page.locator('.schedule__row__column--header', { hasText: `${venue.title} – ${venue.room}` }).isVisible();
-  };
+    await page
+      .locator('.schedule__row__column--header', {
+        hasText: `${venue.title} – ${venue.room}`,
+      })
+      .isVisible();
+  }
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/schedule") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId('session-title').locator('nth=1').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/schedule') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId('session-title').locator('nth=1').click(),
   ]);
   await page.locator('#session-modal').isVisible();
   await expect(page.getByTestId('title')).toContainText(project.proposal_title);
   await expect(page.getByTestId('speaker')).toContainText(promoter.fullname);
   await page.getByTestId('time').isVisible();
-  await expect(page.getByTestId('room')).toContainText(`${project.venues[1].room}, ${project.venues[1].title}`);
+  await expect(page.getByTestId('room')).toContainText(
+    `${project.venues[1].room}, ${project.venues[1].title}`
+  );
   await page.getByTestId('session-video').locator('iframe').isVisible();
   await page.getByTestId('view-proposal"]').isVisible();
   await page.locator('#session-modal a.modal__close').click();
-
 });
diff --git a/tests/playwright/tests/post-update.spec.js b/tests/playwright/tests/post-update.spec.js
index 710114865..38481748d 100644
--- a/tests/playwright/tests/post-update.spec.js
+++ b/tests/playwright/tests/post-update.spec.js
@@ -6,7 +6,11 @@ const project = require('../fixtures/project.json');
 
 test('Add update to project', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, usher.username, usher.password);
+  await loginPage.login(
+    `/${usher.owns_profile}/${usher.project}`,
+    usher.username,
+    usher.password
+  );
 
   await page.getByTestId('updates').click();
   await page.getByTestId('add-update').click();
@@ -17,21 +21,37 @@ test('Add update to project', async ({ page }) => {
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('add-update').click();
   await page.locator('#title').fill(project.restricted_update_title);
-  await page.locator('#field-body .cm-editor .cm-line').fill(project.restricted_update_body);
+  await page
+    .locator('#field-body .cm-editor .cm-line')
+    .fill(project.restricted_update_body);
   await page.locator('#is_restricted').click();
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('form-submit-btn').click();
   await loginPage.logout();
 
-  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, user.username, user.password);
-  await expect(page.locator('.pinned__update__heading').locator('visible=true')).toContainText(project.update_title);
+  await loginPage.login(
+    `/${usher.owns_profile}/${usher.project}`,
+    user.username,
+    user.password
+  );
+  await expect(
+    page.locator('.pinned__update__heading').locator('visible=true')
+  ).toContainText(project.update_title);
   await page.getByTestId('updates').click();
-  await expect(page.locator('.update').locator('nth=1').getByTestId('update-heading')).toContainText(project.restricted_update_title);
+  await expect(
+    page.locator('.update').locator('nth=1').getByTestId('update-heading')
+  ).toContainText(project.restricted_update_title);
   await loginPage.logout();
 
-  await loginPage.login(`/${usher.owns_profile}/${usher.project}`, newuser.username, newuser.password);
+  await loginPage.login(
+    `/${usher.owns_profile}/${usher.project}`,
+    newuser.username,
+    newuser.password
+  );
   await page.getByTestId('updates').click();
-  await expect(page.locator('.pinned__update__heading').locator('visible=true')).toContainText(project.update_title);
+  await expect(
+    page.locator('.pinned__update__heading').locator('visible=true')
+  ).toContainText(project.update_title);
   await page.getByTestId('updates').click();
   await expect(page.locator('.update').locator('nth=1')).toBeHidden();
   await loginPage.logout();
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
index 5817bb75f..13756c8d2 100644
--- a/tests/playwright/tests/rsvp-checkin.spec.js
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -8,7 +8,11 @@ const dayjs = require('dayjs');
 
 test('Open rsvp, for all and members only', async ({ page }) => {
   let loginPage = new LoginPage(page);
-  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, admin.username, admin.password);
+  await loginPage.login(
+    `/${admin.owns_profile}/${admin.project}`,
+    admin.username,
+    admin.password
+  );
 
   await page.getByTestId('project-menu').locator('visible=true').click();
   await page.getByTestId('settings').locator('visible=true').click();
@@ -34,7 +38,9 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('sync-tickets').click();
 
   for (let event of events) {
-    await page.locator(`li[data-testid="${event.title}"] a[data-testid="ticket-edit"]`).click();
+    await page
+      .locator(`li[data-testid="${event.title}"] a[data-testid="ticket-edit"]`)
+      .click();
     await page.getByLabel(event.title).click();
     await page.getByTestId('form-submit-btn').click();
   }
@@ -53,11 +59,18 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   }
 
   await page.getByTestId(`event-${events[0].title}`).click();
-  await page.getByTestId('ticket-participant', { hasText: ticket_participants[0].fullname }).isVisible();
-  await page.getByTestId('ticket-participant', { hasText: ticket_participants[1].fullname }).isVisible();
+  await page
+    .getByTestId('ticket-participant', { hasText: ticket_participants[0].fullname })
+    .isVisible();
+  await page
+    .getByTestId('ticket-participant', { hasText: ticket_participants[1].fullname })
+    .isVisible();
   await Promise.all([
-    page.waitForResponse(response => response.url().includes("/json") && response.status() === 200, {timeout: 60000}),
-    page.getByTestId(user.fullname).getByTestId('checkin').click()
+    page.waitForResponse(
+      (response) => response.url().includes('/json') && response.status() === 200,
+      { timeout: 60000 }
+    ),
+    page.getByTestId(user.fullname).getByTestId('checkin').click(),
   ]);
   await page.getByTestId('cancel-checkin').isVisible();
   await page.getByTestId('back-to-setup').click();
@@ -72,11 +85,14 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('rsvp-only-for-members').isVisible();
   await loginPage.logout();
 
-  await loginPage.login(`/${admin.owns_profile}/${admin.project}`, user.username, user.password);
+  await loginPage.login(
+    `/${admin.owns_profile}/${admin.project}`,
+    user.username,
+    user.password
+  );
   await page.getByTestId('project-member').isVisible();
   await page.getByTestId('member-rsvp').click();
   await page.locator('#rsvp-form').waitFor(60000);
   await page.getByTestId('confirm').click();
   await page.getByTestId('registered').isVisible();
-
 });
diff --git a/tests/test_fixture_initdb.py b/tests/test_fixture_initdb.py
index 542234d4f..0cb24bdc1 100644
--- a/tests/test_fixture_initdb.py
+++ b/tests/test_fixture_initdb.py
@@ -15,10 +15,10 @@
     db,
     Project,
     Venue,
-    VenueRoom
+    VenueRoom,
 )
-from coaster.utils import utcnow
 from datetime import datetime, timedelta
+
 from pytz import utc
 
 
@@ -32,9 +32,7 @@ def init_models():
             fullname='profile-cypress',
         )
         owner.password = 'profile-cypress123_St'  # nosec
-        owner_email = AccountEmail(
-            email='profileowner@example.com', account=owner
-        )
+        owner_email = AccountEmail(email='profileowner@example.com', account=owner)
         db.session.add(owner.add_phone('+15062345678', primary=True))
 
         org = Organization(
@@ -42,34 +40,36 @@ def init_models():
         )
         org.is_verified = True
         org.make_profile_public()
-        org1 = Organization(
-            name='fifthelephant', title='Fifth elephant', owner=owner
-        )
+        org1 = Organization(name='fifthelephant', title='Fifth elephant', owner=owner)
         org1.is_verified = True
         org1.make_profile_public()
 
         project1 = Project(
-            name='summer-edition', title='Summer Edition', created_by=owner,
-            account=org1, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+            name='summer-edition',
+            title='Summer Edition',
+            created_by=owner,
+            account=org1,
+            location='Online',
+            tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book',
         )
 
         admin = User(username='admin_user', fullname='admin-user')
         admin.password = 'admin-user129_Ftz'  # nosec
-        admin_email = AccountEmail(
-            email='adminuser@example.com', account=admin
-        )
+        admin_email = AccountEmail(email='adminuser@example.com', account=admin)
         db.session.add(admin.add_phone('+918123456789', primary=True))
-        org2 = Organization(
-            name='rootconf', title='Rootconf', owner=admin
-        )
+        org2 = Organization(name='rootconf', title='Rootconf', owner=admin)
         org2.is_verified = True
         org2.make_profile_public()
 
         project2 = Project(
-            name='autumn-edition', title='Autumn Edition', created_by=admin,
-            account=org2, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+            name='autumn-edition',
+            title='Autumn Edition',
+            created_by=admin,
+            account=org2,
+            location='Online',
+            tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book',
         )
 
         editor = User(username='editor_cypress', fullname='editor-cypress')
@@ -77,16 +77,18 @@ def init_models():
         editor_email = AccountEmail(email='editor@example.com', account=editor)
         db.session.add(editor.add_phone('+447400123456', primary=True))
 
-        org3 = Organization(
-            name='jsfoo', title='JSFoo', owner=editor
-        )
+        org3 = Organization(name='jsfoo', title='JSFoo', owner=editor)
         org3.is_verified = True
         org3.make_profile_public()
 
         project3 = Project(
-            name='monsoon-edition', title='Monsoon Edition', created_by=editor,
-            account=org3, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+            name='monsoon-edition',
+            title='Monsoon Edition',
+            created_by=editor,
+            account=org3,
+            location='Online',
+            tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book',
         )
 
         promoter = User(username='promoter_user', fullname='promoter-user')
@@ -94,16 +96,18 @@ def init_models():
         promoter_email = AccountEmail(email='promoter@example.com', account=promoter)
         db.session.add(promoter.add_phone('+919845012345', primary=True))
 
-        org4 = Organization(
-            name='metarefresh', title='Metarefresh', owner=promoter
-        )
+        org4 = Organization(name='metarefresh', title='Metarefresh', owner=promoter)
         org4.is_verified = True
         org4.make_profile_public()
 
         project4 = Project(
-            name='winter-edition', title='Winter Edition', created_by=promoter,
-            account=org4, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+            name='winter-edition',
+            title='Winter Edition',
+            created_by=promoter,
+            account=org4,
+            location='Online',
+            tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book',
         )
 
         usher = User(username='usher_cypress', fullname='usher-cypress')
@@ -111,16 +115,18 @@ def init_models():
         usher_email = AccountEmail(email='usher@example.com', account=usher)
         db.session.add(usher.add_phone('+918123456788', primary=True))
 
-        org5 = Organization(
-            name='kilter', title='Kilter', owner=usher
-        )
+        org5 = Organization(name='kilter', title='Kilter', owner=usher)
         org5.is_verified = True
         org5.make_profile_public()
 
         project5 = Project(
-            name='spring-edition', title='Spring Edition', created_by=usher,
-            account=org5, location='Online', tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book'
+            name='spring-edition',
+            title='Spring Edition',
+            created_by=usher,
+            account=org5,
+            location='Online',
+            tagline='Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+            description='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book',
         )
 
         user = User(username='member_user', fullname='member-user')
@@ -134,9 +140,7 @@ def init_models():
         newuser = User(username='new_user', fullname='new-user')
         newuser.password = 'new-user11_EveryOne'  # nosec
 
-        sm = SiteMembership(
-            member=owner, is_site_editor=True, granted_by=owner
-        )
+        sm = SiteMembership(member=owner, is_site_editor=True, granted_by=owner)
 
         db.session.add_all(
             [
@@ -165,7 +169,7 @@ def init_models():
                 project2,
                 project3,
                 project4,
-                project5
+                project5,
             ]
         )
         db.session.commit()
@@ -173,26 +177,40 @@ def init_models():
         project2.publish()
         project3.publish()
         project4.publish()
-        venue1 = Venue(name='hasgeek', title='Hasgeek House', description='Hasgeek House second floor', project=project4, seq=1)
-        venue2 = Venue(name='online', title='Online', description='Zoom', project=project4, seq=2)
-        room1 = VenueRoom(name='second-floor-room', title='Second floor room', description='Hasgeek House second floor', bgcolor='F7B89E', venue=venue1, seq=1)
-        room2 = VenueRoom(name='zoom', title='Zoom', description='Zoom', bgcolor='6075B1', venue=venue2, seq=2)
+        venue1 = Venue(
+            name='hasgeek',
+            title='Hasgeek House',
+            description='Hasgeek House second floor',
+            project=project4,
+            seq=1,
+        )
+        venue2 = Venue(
+            name='online', title='Online', description='Zoom', project=project4, seq=2
+        )
+        room1 = VenueRoom(
+            name='second-floor-room',
+            title='Second floor room',
+            description='Hasgeek House second floor',
+            bgcolor='F7B89E',
+            venue=venue1,
+            seq=1,
+        )
+        room2 = VenueRoom(
+            name='zoom',
+            title='Zoom',
+            description='Zoom',
+            bgcolor='6075B1',
+            venue=venue2,
+            seq=2,
+        )
         project5.publish()
         project5.cfp_start_at = datetime.now(utc)
         project5.cfp_end_at = datetime.now(utc) + timedelta(days=10)
         project5.instructions = 'If you are interested in speaking at The Fifth Elephant.Submit a description of your talk, explaining the problem that your talk covers, and one concrete takeaway for audience. Talks have to give at least one practical insight to the audience'
         project5.open_cfp()
-        db.session.add_all(
-            [
-                venue1,
-                venue2,
-                room1,
-                room2
-            ]
-        )
+        db.session.add_all([venue1, venue2, room1, room2])
         db.session.commit()
 
 
-
 if __name__ == '__main__':
     init_models()

From 6b779bb7f85fceb4c3e1ac0955f3b3c8234479b7 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 13 Jun 2024 13:26:48 +0530
Subject: [PATCH 11/14] Fix playwright tests

---
 funnel/assets/js/schedule_view.js                      |  5 +++--
 funnel/templates/account_menu.html.jinja2              |  4 ++--
 funnel/templates/macros.html.jinja2                    |  2 +-
 funnel/templates/profile_layout.html.jinja2            | 10 +++++-----
 funnel/templates/project_settings.html.jinja2          |  2 +-
 funnel/templates/session_view_popup.html.jinja2        |  4 ++--
 .../siteadmin_generate_shortlinks.html.jinja2          |  2 +-
 funnel/templates/submission.html.jinja2                |  4 ++--
 tests/playwright/page/create-project.js                |  2 +-
 tests/playwright/page/login.js                         |  8 +-------
 tests/playwright/tests/add-submission.spec.js          |  3 ++-
 tests/playwright/tests/create-profile.spec.js          |  6 +++---
 tests/test_fixture_initdb.py                           |  2 +-
 13 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/funnel/assets/js/schedule_view.js b/funnel/assets/js/schedule_view.js
index 538b82d94..63875eecd 100644
--- a/funnel/assets/js/schedule_view.js
+++ b/funnel/assets/js/schedule_view.js
@@ -276,8 +276,9 @@ const Schedule = {
         this.config.slotInterval
       );
       if (this.config.schedule[session.eventDay]) {
-        this.config.schedule[session.eventDay].sessions[session.startTime].showLabel =
-          true;
+        this.config.schedule[session.eventDay].sessions[
+          session.startTime
+        ].showLabel = true;
         this.config.schedule[session.eventDay].sessions[session.startTime].rooms[
           session.room_scoped_name
         ].talk = session;
diff --git a/funnel/templates/account_menu.html.jinja2 b/funnel/templates/account_menu.html.jinja2
index e864fde64..ed570934e 100644
--- a/funnel/templates/account_menu.html.jinja2
+++ b/funnel/templates/account_menu.html.jinja2
@@ -30,13 +30,13 @@
   <li>
     <a href="{{ url_for('organizations') }}"
        class="header__dropdown__item header__dropdown__item--flex mui--text-dark nounderline mui--text-subhead mui--text-light"
-       data-cy="org"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
+       data-testid="org-page"><span class="profile-avatar profile-avatar--bigger margin-right">{{ faicon(icon='sitemap', icon_size='title', baseline=false, css_class="mui--text-light") }}</span>{% trans %}Organizations{% endtrans %}</a>
   </li>
   {%- with orglist = current_auth.user.views.organizations_as_member %}
     {%- for org in orglist %}
       <li>
         <a href="{{ org.url_for() }}"
-           class="header__dropdown__item header__dropdown__item--flex header__dropdown__item--morepadding mui--text-dark nounderline" data-testid="org">
+           class="header__dropdown__item header__dropdown__item--flex header__dropdown__item--morepadding mui--text-dark nounderline">
           <span class="profile-avatar margin-right">
             {%- if org.logo_url.url %}
               <img src="{{ org.logo_url.resize(img_size.profile_logo_small) }}"
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 367f2fdb2..146d0e2f0 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -303,7 +303,7 @@
        {% if add_profile_link %}</a>{% endif %}
     </div>
   </div>
-  {% if add_profile_link %}<a href="{{ account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{%- else %}<span class="mui--text-dark mui--text-subhead text-bold nounderline">{% endif %}{{ account.title }}{% if add_profile_link %}</a>{%- else %}</span>{% endif %}
+  {% if add_profile_link %}<a href="{{ account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-testid="profile-link">{%- else %}<span class="mui--text-dark mui--text-subhead text-bold nounderline">{% endif %}{{ account.title }}{% if add_profile_link %}</a>{%- else %}</span>{% endif %}
   {{ add_follow_button(account, css_class=css_class) }}
 {%- endmacro %}
 
diff --git a/funnel/templates/profile_layout.html.jinja2 b/funnel/templates/profile_layout.html.jinja2
index 67aa5c1e7..77008147b 100644
--- a/funnel/templates/profile_layout.html.jinja2
+++ b/funnel/templates/profile_layout.html.jinja2
@@ -248,7 +248,7 @@
               {% elif membership_project.features.show_tickets %}
                 <div class="membership-container__btn-wrapper">
                   <button class="js-open-ticket-widget mui-btn mui-btn--primary price-btn zero-bottom-margin zero-top-margin display-block">
-                    <span class="price-btn__txt" data-cy="unregistered">{% trans %}Become a member{% endtrans %}</span>
+                    <span class="price-btn__txt" data-testid="unregistered">{% trans %}Become a member{% endtrans %}</span>
                     <span class="price-btn__txt price-btn__txt--smaller primary-color-lighter-txt js-tickets-available"><span class="js-ticket-price"></span></span>
                     <span class="price-btn__txt price-btn__txt--smaller mui--text-light js-tickets-not-available mui--hide">{% trans %}Sales closed{% endtrans %}</span>
                   </button>
@@ -350,9 +350,9 @@
 {% macro profile_header_buttons(profile) %}
   <div class="profile__btns flex-wrapper--center">
     {% if profile.features.new_project() %}
-      <a class="mui-btn mui-btn--primary mui-btn--raised" href="{{ profile.url_for('new_project') }} ">{{ faicon(icon='plus', icon_size='caption') }} {% trans %}New project{% endtrans %}</a>
+      <a class="mui-btn mui-btn--primary mui-btn--raised" href="{{ profile.url_for('new_project') }}" data-testid="new-project">{{ faicon(icon='plus', icon_size='caption') }} {% trans %}New project{% endtrans %}</a>
     {% elif profile.features.make_public() %}
-      <a class="mui-btn mui-btn--raised mui-btn--primary" href="#make-public-modal" rel="modal:open" role="button" aria-haspopup="true" data-cy="profile-public">{% trans %}Make account public{% endtrans %}</a>
+      <a class="mui-btn mui-btn--raised mui-btn--primary" href="#make-public-modal" rel="modal:open" role="button" aria-haspopup="true" data-testid="profile-public">{% trans %}Make account public{% endtrans %}</a>
       <div class="modal" id="make-public-modal" role="dialog" aria-labelledby="profile-public-modal-title" aria-modal="true" tabindex="-1">
         <div class="modal__header">
           <a class="modal__close mui--text-dark" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close" href="#" onclick="return false;" role="button" tabindex="0">{{ faicon(icon='times', baseline=false, icon_size='title') }}</a>
@@ -366,7 +366,7 @@
           </ul>
           <form action="{{ profile.url_for('transition') }}" method="post">
             {{ profile.forms.transition().hidden_tag() }}
-            <button name="transition" value="make_profile_public" class="mui-btn mui-btn--accent mui-btn--flat mui--pull-right" data-cy="make-public-btn">{% trans %}Make public{% endtrans %}</button>
+            <button name="transition" value="make_profile_public" class="mui-btn mui-btn--accent mui-btn--flat mui--pull-right" data-testid="make-public-btn">{% trans %}Make public{% endtrans %}</button>
           </form>
         </div>
       </div>
@@ -476,7 +476,7 @@
           {% elif not profile.features.is_private() %}
             <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for() }}">{% trans %}Sessions{% endtrans %}</a>
             <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'projects' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_participated_projects') }}">{% trans %}Projects{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-cy="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-testid="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
             {%- if profile.current_roles.admin %}{# TODO: Remove after consent flow #}
               <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'following' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'following' -%}{{ profile.url_for('following') }}{%- endif %}" data-testid="following">{% trans %}Following{% endtrans %} {% if profile.features.following_count() %}<span class="mui--text-caption badge badge--primary badge--tab">{{ profile.features.following_count() }}</span>{% endif %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
               <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'followers' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'followers' -%}{{ profile.url_for('followers') }}{%- endif %}" data-testid="followers">{% trans %}Followers{% endtrans %} {% if profile.features.followers_count() %}<span class="mui--text-caption badge badge--primary badge--tab">{{ profile.features.followers_count() }}</span>{% endif %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
diff --git a/funnel/templates/project_settings.html.jinja2 b/funnel/templates/project_settings.html.jinja2
index e2f2cdfb9..d56e87779 100644
--- a/funnel/templates/project_settings.html.jinja2
+++ b/funnel/templates/project_settings.html.jinja2
@@ -95,7 +95,7 @@
         {% endif %}
         {% if project.view_for('assign_parent_project').is_available() %}
           <li class="margin-bottom">
-            <a href="{{ project.url_for('assign_parent_project') }}" class="nounderline flex-wrapper mui--text-dark" data-cy="assign-parent"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='list-tree', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Group projects{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Assign a parent project{% endtrans %}</span></span></a>
+            <a href="{{ project.url_for('assign_parent_project') }}" class="nounderline flex-wrapper mui--text-dark" data-testid="assign-parent"><span class="profile-avatar profile-avatar--bigger profile-avatar--rectangle flex-item-noshrink margin-right">{{ faicon(icon='list-tree', icon_size='title', baseline=false, css_class="mui--text-light") }}</span><span class="setting"><span class="setting__name mui--text-subhead">{% trans %}Group projects{% endtrans %}</span><span class="setting__sub mui--text-light">{% trans %}Assign a parent project{% endtrans %}</span></span></a>
           </li>
         {% endif %}
         </ul>
diff --git a/funnel/templates/session_view_popup.html.jinja2 b/funnel/templates/session_view_popup.html.jinja2
index ab4a647d0..6a5dfe0af 100644
--- a/funnel/templates/session_view_popup.html.jinja2
+++ b/funnel/templates/session_view_popup.html.jinja2
@@ -62,7 +62,7 @@
             <p class="mui--text-light">{% trans %}The session has no attached video{% endtrans %}</p>
             {% if not project_session.views.video and project_session.project.current_roles.editor %}
               <div>
-                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ project_session.url_for('edit') }}" data-cy-admin="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
+                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ project_session.url_for('edit') }}" data-testid-admin="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
               </div>
             {%- endif %}
           </div>
@@ -71,7 +71,7 @@
     </div>
   {%- endif %}
   {% if project_session.proposal %}
-    <p class="separator zero-bottom-margin"><a class="mui--text-subhead" href="{{ project_session.proposal.url_for('view') }}" target="_blank" rel="noopener" data-cy="view-proposal">{{ faicon(icon='presentation') }} {% trans %}View submission for this session{% endtrans %}</a></p>
+    <p class="separator zero-bottom-margin"><a class="mui--text-subhead" href="{{ project_session.proposal.url_for('view') }}" target="_blank" rel="noopener" data-testid="view-proposal">{{ faicon(icon='presentation') }} {% trans %}View submission for this session{% endtrans %}</a></p>
   {% endif %}
   {% if project_session.views.video or project_session.proposal %}
   <hr class="modal__body__separator" />
diff --git a/funnel/templates/siteadmin_generate_shortlinks.html.jinja2 b/funnel/templates/siteadmin_generate_shortlinks.html.jinja2
index 75de48c6d..19eea8c7a 100644
--- a/funnel/templates/siteadmin_generate_shortlinks.html.jinja2
+++ b/funnel/templates/siteadmin_generate_shortlinks.html.jinja2
@@ -70,7 +70,7 @@
         <p class="mui-form__helptext">{% trans %}Use to differentiate ads{% endtrans %}</p>
       </div>
     </div>
-    <button type="submit" class="mui-btn mui-btn--raised  mui-btn--primary" data-cy="form-submit-btn">{% trans %}Generate shortlink{% endtrans %}</button><span class="loading mui--hide"></span>
+    <button type="submit" class="mui-btn mui-btn--raised  mui-btn--primary" data-testid="form-submit-btn">{% trans %}Generate shortlink{% endtrans %}</button><span class="loading mui--hide"></span>
   </form>
 
   <div class="flex-wrapper flex-wrapper--center margin-bottom">
diff --git a/funnel/templates/submission.html.jinja2 b/funnel/templates/submission.html.jinja2
index 31732f508..93715cf95 100644
--- a/funnel/templates/submission.html.jinja2
+++ b/funnel/templates/submission.html.jinja2
@@ -242,7 +242,7 @@
               <div class="mui-tabs__pane {% if seq==1 %}mui--is-active{%- endif -%}"
                   id="pane-justified-{{ seq }}">
                 <div class="details__box__video bg-primary-dark embed-video-wrapper"
-                    data-cy="session-video">
+                    data-testid="session-video">
                   {{ embed_video_player(proposal.session.views.video) }}
                 </div>
                 <div class="details__box__control mui--clearfix">
@@ -253,7 +253,7 @@
               <div class="mui-tabs__pane {% if seq==1 %}mui--is-active{%- endif -%}"
                   id="pane-justified-{{ seq }}">
                 <div class="details__box__video bg-primary-dark embed-video-wrapper"
-                    data-cy="session-video">
+                    data-testid="session-video">
                     <div class="video_txt">
                       <p>{{ faicon(icon='video-slash', icon_size='display1') }}</p>
                       <p class="mui--text-light">{% trans %}This video is for members only{% endtrans %}</p>
diff --git a/tests/playwright/page/create-project.js b/tests/playwright/page/create-project.js
index 9388e9a17..29d205443 100644
--- a/tests/playwright/page/create-project.js
+++ b/tests/playwright/page/create-project.js
@@ -10,7 +10,7 @@ export class ProjectPage {
   }
 
   async createNewProject(projectName) {
-    await this.page.getByTestId('new-project').click();
+    await this.page.getByTestId('new-project').locator('nth=0').click();
     await this.page.locator('input#title').fill(projectName);
     await this.page.locator('input#location').type(project.location);
     await this.page.locator('input#tagline').type(project.tagline);
diff --git a/tests/playwright/page/login.js b/tests/playwright/page/login.js
index b111ce0b5..59b49f1b1 100644
--- a/tests/playwright/page/login.js
+++ b/tests/playwright/page/login.js
@@ -16,13 +16,7 @@ export class LoginPage {
     await this.usernameInputBox.fill(username);
     await this.passwordBtn.click();
     await this.passwordInputBox.fill(password);
-    await Promise.all([
-      this.page.waitForResponse(
-        (response) => response.url().includes('/login') && response.status() === 200,
-        { timeout: 60000 }
-      ),
-      this.submitBtn.click(),
-    ]);
+    await this.submitBtn.click();
   }
 
   async logout() {
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index b2f2db563..b881a282c 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -17,7 +17,7 @@ test('Submitting a proposal to a project and commenting on proposal', async ({
     usher.password
   );
   let projectPage = new ProjectPage(page);
-  await projectPage.addLabels();
+  // await projectPage.addLabels();
   await loginPage.logout();
 
   await loginPage.login(
@@ -25,6 +25,7 @@ test('Submitting a proposal to a project and commenting on proposal', async ({
     owner.username,
     owner.password
   );
+  await page.getByTestId('submissions').locator('visible=true').click();
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
   await page.locator('#title').fill(proposal.title);
diff --git a/tests/playwright/tests/create-profile.spec.js b/tests/playwright/tests/create-profile.spec.js
index 943120ce5..5bc14126c 100644
--- a/tests/playwright/tests/create-profile.spec.js
+++ b/tests/playwright/tests/create-profile.spec.js
@@ -12,13 +12,13 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   loginPage = new LoginPage(page);
   await loginPage.login('/', owner.username, owner.password);
   await page.getByTestId('my-account').click();
-  await page.getByTestId('org').click();
+  await page.getByTestId('org-page').click();
   await page.getByTestId('new').click();
   await page.locator('input#title').fill(orgNameCapitalize);
   await page.locator('input#name').fill(randomOrgName);
   await page.getByTestId('form-submit-btn').click();
   await page
-    .locator('#field-description .cm-editor .cm-line')
+    .locator('input#tagline')
     .fill('Lorem Ipsum is simply dummy text of the printing and typesetting industry');
   await page.getByTestId('form-submit-btn').click();
   let titleRegex = new RegExp(orgNameCapitalize);
@@ -55,7 +55,7 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await page.getByTestId('edit-details').locator('visible=true').waitFor(5000);
   await page.getByTestId('edit-details').locator('visible=true').click();
   await page
-    .locator('#field-description .cm-editor .cm-line')
+    .locator('input#tagline')
     .fill('Lorem Ipsum is simply dummy');
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('add-banner').isVisible();
diff --git a/tests/test_fixture_initdb.py b/tests/test_fixture_initdb.py
index 0cb24bdc1..cded60b30 100644
--- a/tests/test_fixture_initdb.py
+++ b/tests/test_fixture_initdb.py
@@ -208,7 +208,7 @@ def init_models():
         project5.cfp_end_at = datetime.now(utc) + timedelta(days=10)
         project5.instructions = 'If you are interested in speaking at The Fifth Elephant.Submit a description of your talk, explaining the problem that your talk covers, and one concrete takeaway for audience. Talks have to give at least one practical insight to the audience'
         project5.open_cfp()
-        db.session.add_all([venue1, venue2, room1, room2])
+        db.session.add_all([project5, venue1, venue2, room1, room2])
         db.session.commit()
 
 

From 69b6806c8bb55e2ec74e2b19ead6c1be37ac5c81 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 08:00:04 +0000
Subject: [PATCH 12/14] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/assets/js/schedule_view.js             | 5 ++---
 tests/playwright/tests/create-profile.spec.js | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/funnel/assets/js/schedule_view.js b/funnel/assets/js/schedule_view.js
index 63875eecd..538b82d94 100644
--- a/funnel/assets/js/schedule_view.js
+++ b/funnel/assets/js/schedule_view.js
@@ -276,9 +276,8 @@ const Schedule = {
         this.config.slotInterval
       );
       if (this.config.schedule[session.eventDay]) {
-        this.config.schedule[session.eventDay].sessions[
-          session.startTime
-        ].showLabel = true;
+        this.config.schedule[session.eventDay].sessions[session.startTime].showLabel =
+          true;
         this.config.schedule[session.eventDay].sessions[session.startTime].rooms[
           session.room_scoped_name
         ].talk = session;
diff --git a/tests/playwright/tests/create-profile.spec.js b/tests/playwright/tests/create-profile.spec.js
index 5bc14126c..fc1f84227 100644
--- a/tests/playwright/tests/create-profile.spec.js
+++ b/tests/playwright/tests/create-profile.spec.js
@@ -54,9 +54,7 @@ test('To create profile, edit, add crew and update banner', async ({ page }) =>
   await page.getByTestId('admin-dropdown').locator('visible=true').click();
   await page.getByTestId('edit-details').locator('visible=true').waitFor(5000);
   await page.getByTestId('edit-details').locator('visible=true').click();
-  await page
-    .locator('input#tagline')
-    .fill('Lorem Ipsum is simply dummy');
+  await page.locator('input#tagline').fill('Lorem Ipsum is simply dummy');
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('add-banner').isVisible();
 

From eda1e8585d4cfd7d3b28f8079fb1415fa8c1c261 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 17 Jun 2024 00:05:15 +0530
Subject: [PATCH 13/14] Fix  test cases

---
 funnel/templates/js/schedule.js.jinja2             |  2 +-
 funnel/templates/js/update.js.jinja2               | 10 +++++-----
 funnel/templates/session_view_popup.html.jinja2    |  2 +-
 tests/playwright/tests/add-sponsor-project.spec.js |  8 ++++----
 tests/playwright/tests/add-submission.spec.js      |  2 +-
 tests/playwright/tests/open-cfp.spec.js            |  5 +++--
 tests/playwright/tests/post-update.spec.js         |  7 ++++---
 tests/playwright/tests/rsvp-checkin.spec.js        | 14 +++++++-------
 8 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/funnel/templates/js/schedule.js.jinja2 b/funnel/templates/js/schedule.js.jinja2
index d4b512935..b8ec8e204 100644
--- a/funnel/templates/js/schedule.js.jinja2
+++ b/funnel/templates/js/schedule.js.jinja2
@@ -10,7 +10,7 @@
         </div>
         <div class="schedule" v-for="schedule in schedules">
           <h3 class="schedule__date collapsible__header mui--clearfix" :class="[schedule.upcoming ? 'schedule__date--upcoming' : '']" role="button" aria-expanded="false" :aria-controls="[schedule.dateStr]">
-            <span class="mui--pull-left">{{ schedule.dateStr }}</span>
+            <span class="mui--pull-left" data-testid="schedule-date">{{ schedule.dateStr }}</span>
             <span class="mui--pull-right">
               <faicon :icon="'angle-right'" :icon_size="'subhead'" :css_class="[schedule.upcoming ? 'collapsible__icon mui--hide' : 'collapsible__icon']"></faicon>
               <faicon :icon="'angle-down'" :icon_size="'subhead'" :css_class="[schedule.upcoming ? 'collapsible__icon' : 'collapsible__icon mui--hide']" ></faicon>
diff --git a/funnel/templates/js/update.js.jinja2 b/funnel/templates/js/update.js.jinja2
index 5ca1c6aad..876aa0213 100644
--- a/funnel/templates/js/update.js.jinja2
+++ b/funnel/templates/js/update.js.jinja2
@@ -23,7 +23,7 @@
                 <input type="hidden" v-if="!update.is_pinned" name="is_pinned" value="true">
                 <input type="hidden" v-if="update.is_pinned" name="is_pinned" value="">
               </form>
-              <ul class="bullet-separated-list--flex mui--text-light mui--text-body2" v-if="update.number">
+              <ul class="bullet-separated-list--flex mui--text-light mui--text-body2" v-if="update.number" data-testid="update-heading-list">
                 <li><a class="text-uppercase mui--text-light nounderline" :href="update.urls.view">{{ gettext('Update #%d', update.number) }}</a></li>
                 <li v-if="age"><a class="mui--text-light nounderline" :href="update.urls.view">{{ age }}</a></li>
                 <li v-if="update.visibility == 'participants'">
@@ -33,13 +33,13 @@
                   <faicon :icon="'lock-alt'"></faicon>
                 </li>
                 <li v-if="update.is_pinned">
-                  <a v-if="iseditor" href="#" @click="handlePinEvent($event, `pin-form-${update.uuid_b58}`, update.urls.edit);">
+                  <a v-if="iseditor" href="#" @click="handlePinEvent($event, `pin-form-${update.uuid_b58}`, update.urls.edit);" data-testid="unpin-update">
                     <faicon :icon="'thumbtack-solid'" :baseline=false :css_class="'mui--align-middle'"></faicon>
                   </a>
                   <faicon v-else :icon="'thumbtack-solid'" :baseline=false :css_class="'mui--align-middle'"></faicon>
                 </li>
-                <li v-if="!update.is_pinned && iseditor">
-                  <a href="#" @click="handlePinEvent($event, `pin-form-${update.uuid_b58}`, update.urls.edit);" class="update__heading__unpin">
+                <li v-if="!update.is_pinned && iseditor" data-testid="pin">
+                  <a href="#" @click="handlePinEvent($event, `pin-form-${update.uuid_b58}`, update.urls.edit);" class="update__heading__unpin" data-testid="pin-update">
                     <faicon :icon="'thumbtack'" :baseline=false :css_class="'mui--align-middle'"></faicon>
                   </a>
                 </li>
@@ -81,7 +81,7 @@
             <div class="update__content markdown" v-else v-html="update.body.html"></div>
           </div>
           <div v-else>
-            <p class="mui--text-body2 mui--text-light mui--text-center"><faicon :icon="'lock-alt'" :icon_size="'caption'"></faicon> <em>{{ gettext('This update is for participants only') }}</em></p>
+            <p class="mui--text-body2 mui--text-light mui--text-center"><faicon :icon="'lock-alt'" :icon_size="'caption'"></faicon> <em data-testid="member-update">{{ gettext('This update is for participants only') }}</em></p>
           </div>
         </div>
       </li>
diff --git a/funnel/templates/session_view_popup.html.jinja2 b/funnel/templates/session_view_popup.html.jinja2
index 6a5dfe0af..b0bb0b1f3 100644
--- a/funnel/templates/session_view_popup.html.jinja2
+++ b/funnel/templates/session_view_popup.html.jinja2
@@ -62,7 +62,7 @@
             <p class="mui--text-light">{% trans %}The session has no attached video{% endtrans %}</p>
             {% if not project_session.views.video and project_session.project.current_roles.editor %}
               <div>
-                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ project_session.url_for('edit') }}" data-testid-admin="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
+                <a class="mui-btn mui-btn--raised mui-btn--dark" href="{{ project_session.url_for('edit') }}" data-testid="edit-session" aria-label="{% trans %}Add session video{% endtrans %}">{% trans %}Edit session{% endtrans %}</a>
               </div>
             {%- endif %}
           </div>
diff --git a/tests/playwright/tests/add-sponsor-project.spec.js b/tests/playwright/tests/add-sponsor-project.spec.js
index 5ef9a95a3..f3473d2c0 100644
--- a/tests/playwright/tests/add-sponsor-project.spec.js
+++ b/tests/playwright/tests/add-sponsor-project.spec.js
@@ -14,7 +14,7 @@ test('Add sponsor to project', async ({ page }) => {
   await page.getByTestId('site-editor-menu').locator('visible=true').click();
   await page.locator('.mui-dropdown__menu').locator('visible=true').waitFor(1000);
   await Promise.all([
-    page.waitForRequest((request) => request.url().includes('/sponsor'), {
+    page.waitForRequest((request) => request.url().includes('/sponsors/add'), {
       timeout: 60000,
     }),
     await page.getByTestId('add-sponsor').click(),
@@ -39,7 +39,7 @@ test('Add sponsor to project', async ({ page }) => {
     page.waitForRequest((request) => request.url().includes('/edit'), {
       timeout: 60000,
     }),
-    await page.getByTestId('edit-sponsor').locator('nth=1').click(),
+    await page.getByTestId('edit-sponsor').click(),
   ]);
   await page.locator('#is_promoted').click();
   await Promise.all([
@@ -50,13 +50,13 @@ test('Add sponsor to project', async ({ page }) => {
     page.getByTestId('form-submit-btn').click(),
   ]);
   await page.reload();
-  await page.getByTestId('promoted').locator('nth=1').isVisible();
+  await page.getByTestId('promoted').isVisible();
 
   await Promise.all([
     page.waitForRequest((request) => request.url().includes('/remove'), {
       timeout: 60000,
     }),
-    await page.getByTestId('remove-sponsor').locator('nth=1').click(),
+    await page.getByTestId('remove-sponsor').click(),
   ]);
   await Promise.all([
     page.waitForResponse(
diff --git a/tests/playwright/tests/add-submission.spec.js b/tests/playwright/tests/add-submission.spec.js
index b881a282c..60b2a0cde 100644
--- a/tests/playwright/tests/add-submission.spec.js
+++ b/tests/playwright/tests/add-submission.spec.js
@@ -17,7 +17,7 @@ test('Submitting a proposal to a project and commenting on proposal', async ({
     usher.password
   );
   let projectPage = new ProjectPage(page);
-  // await projectPage.addLabels();
+  await projectPage.addLabels();
   await loginPage.logout();
 
   await loginPage.login(
diff --git a/tests/playwright/tests/open-cfp.spec.js b/tests/playwright/tests/open-cfp.spec.js
index eaf741259..e3f341518 100644
--- a/tests/playwright/tests/open-cfp.spec.js
+++ b/tests/playwright/tests/open-cfp.spec.js
@@ -49,6 +49,7 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
       .locator('.label-box__inner__heading')
   ).toContainText(project.labels[1].title);
   await page.getByTestId('project-page').click();
+  await page.getByTestId('submissions').click();
 
   await page.getByTestId('propose-a-session').locator('visible=true').click();
   await page.getByTestId('close-consent-modal').click();
@@ -172,8 +173,8 @@ test('Add schedule to a  project (open cfp, add labels, sort labels, add session
   await page.getByTestId('schedule-subscribe').isVisible();
   await page.getByTestId('close-modal').click();
 
-  let tomorrowDate = dayjs().add(2, 'days').format('dddd, D MMMM YYYY');
-  await expect(page.locator('.schedule__date')).toContainText(tomorrowDate);
+  let tomorrowDate = dayjs().add(2, 'days').format('D MMMM YYYY');
+  await expect(page.getByText(tomorrowDate)).toBeVisible();
   for (let venue of project.venues) {
     await page
       .locator('.schedule__row__column--header', {
diff --git a/tests/playwright/tests/post-update.spec.js b/tests/playwright/tests/post-update.spec.js
index 38481748d..2bcf67fe6 100644
--- a/tests/playwright/tests/post-update.spec.js
+++ b/tests/playwright/tests/post-update.spec.js
@@ -16,15 +16,16 @@ test('Add update to project', async ({ page }) => {
   await page.getByTestId('add-update').click();
   await page.locator('#title').fill(project.update_title);
   await page.locator('#field-body .cm-editor .cm-line').fill(project.update_body);
-  await page.locator('#is_pinned').click();
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('form-submit-btn').click();
+  await page.getByTestId('update-heading-list').hover();
+  await page.getByTestId('pin-update').click();
   await page.getByTestId('add-update').click();
   await page.locator('#title').fill(project.restricted_update_title);
   await page
     .locator('#field-body .cm-editor .cm-line')
     .fill(project.restricted_update_body);
-  await page.locator('#is_restricted').click();
+  await page.locator("[value='members']").click();
   await page.getByTestId('form-submit-btn').click();
   await page.getByTestId('form-submit-btn').click();
   await loginPage.logout();
@@ -53,6 +54,6 @@ test('Add update to project', async ({ page }) => {
     page.locator('.pinned__update__heading').locator('visible=true')
   ).toContainText(project.update_title);
   await page.getByTestId('updates').click();
-  await expect(page.locator('.update').locator('nth=1')).toBeHidden();
+  await page.locator('.update').locator('nth=1').getByTestId('member-update').isVisible();
   await loginPage.logout();
 });
diff --git a/tests/playwright/tests/rsvp-checkin.spec.js b/tests/playwright/tests/rsvp-checkin.spec.js
index 13756c8d2..a290b8409 100644
--- a/tests/playwright/tests/rsvp-checkin.spec.js
+++ b/tests/playwright/tests/rsvp-checkin.spec.js
@@ -18,13 +18,13 @@ test('Open rsvp, for all and members only', async ({ page }) => {
   await page.getByTestId('settings').locator('visible=true').click();
   await page.getByTestId('setup-ticket-events').click();
 
-  await page.getByTestId('new-ticket-client').click();
-  await page.locator('#name').fill(process.env.BOXOFFICE_CLIENT_ID);
-  await page.locator('#clientid').fill(process.env.BOXOFFICE_CLIENT_ID);
-  await page.locator('#client_eventid').fill(process.env.BOXOFFICE_IC_ID);
-  await page.locator('#client_secret').fill(process.env.BOXOFFICE_SECRET_KEY);
-  await page.locator('#client_access_token').fill(process.env.BOXOFFICE_ACCESS_KEY);
-  await page.getByTestId('form-submit-btn').click();
+  // await page.getByTestId('new-ticket-client').click();
+  // await page.locator('#name').fill(process.env.FLASK_BOXOFFICE_CLIENT_ID);
+  // await page.locator('#clientid').fill(process.env.FLASK_BOXOFFICE_CLIENT_ID);
+  // await page.locator('#client_eventid').fill(process.env.FLASK_BOXOFFICE_IC_ID);
+  // await page.locator('#client_secret').fill(process.env.FLASK_BOXOFFICE_SECRET_KEY);
+  // await page.locator('#client_access_token').fill(process.env.FLASK_BOXOFFICE_ACCESS_KEY);
+  // await page.getByTestId('form-submit-btn').click();
 
   await page.getByTestId('sync-tickets').click();
 

From ad3a3648e851af21e9981b2d34a67c4a31013c7f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 05:18:13 +0000
Subject: [PATCH 14/14] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/playwright/tests/post-update.spec.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/playwright/tests/post-update.spec.js b/tests/playwright/tests/post-update.spec.js
index 2bcf67fe6..ebd094b4d 100644
--- a/tests/playwright/tests/post-update.spec.js
+++ b/tests/playwright/tests/post-update.spec.js
@@ -54,6 +54,10 @@ test('Add update to project', async ({ page }) => {
     page.locator('.pinned__update__heading').locator('visible=true')
   ).toContainText(project.update_title);
   await page.getByTestId('updates').click();
-  await page.locator('.update').locator('nth=1').getByTestId('member-update').isVisible();
+  await page
+    .locator('.update')
+    .locator('nth=1')
+    .getByTestId('member-update')
+    .isVisible();
   await loginPage.logout();
 });